Skip to content

Commit

Permalink
[EVPN]Handling error scenarios during route programming and IMR add (#…
Browse files Browse the repository at this point in the history 
…2670)

*[EVPN]Handling error scenarios during route programming and IMR add (#2670)
  • Loading branch information
@dgsudharsan @StormLiangMS
dgsudharsan authored and StormLiangMS committed Mar 19, 2023
1 parent 9d38fbc commit 868db24
Show file tree
Hide file tree
Showing 7 changed files with 278 additions and 100 deletions.
19 changes: 19 additions & 0 deletions orchagent/routeorch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,8 @@ void RouteOrch::doTask(Consumer& consumer)
NextHopGroupKey& nhg = ctx.nhg;
vector<string> srv6_segv;
vector<string> srv6_src;
bool l3Vni = true;
uint32_t vni = 0;

/* Check if the next hop group is owned by the NhgOrch. */
if (nhg_index.empty())
Expand Down Expand Up @@ -689,6 +691,23 @@ void RouteOrch::doTask(Consumer& consumer)
ipv.resize(alsv.size());
}

for (auto &vni_str: vni_labelv)
{
vni = static_cast<uint32_t>(std::stoul(vni_str));
if (!m_vrfOrch->isL3VniVlan(vni))
{
SWSS_LOG_WARN("Route %s is received on non L3 VNI %s", key.c_str(), vni_str.c_str());
l3Vni = false;
break;
}
}

if (!l3Vni)
{
it++;
continue;
}

/* Set the empty ip(s) to zero
* as IpAddress("") will construct a incorrect ip. */
for (auto &ip : ipv)
Expand Down
14 changes: 14 additions & 0 deletions orchagent/vxlanorch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2376,6 +2376,13 @@ bool EvpnRemoteVnip2pOrch::addOperation(const Request& request)
return false;
}

VRFOrch* vrf_orch = gDirectory.get<VRFOrch*>();
if (vrf_orch->isL3VniVlan(vni_id))
{
SWSS_LOG_WARN("Ignoring remote VNI add for L3 VNI:%d, remote:%s", vni_id, remote_vtep.c_str());
return false;
}

if (tunnel_orch->getTunnelPort(remote_vtep,tunnelPort))
{
SWSS_LOG_INFO("Vxlan tunnelPort exists: %s", remote_vtep.c_str());
Expand Down Expand Up @@ -2531,6 +2538,13 @@ bool EvpnRemoteVnip2mpOrch::addOperation(const Request& request)
return false;
}

VRFOrch* vrf_orch = gDirectory.get<VRFOrch*>();
if (vrf_orch->isL3VniVlan(vni_id))
{
SWSS_LOG_WARN("Ignoring remote VNI add for L3 VNI:%d, remote:%s", vni_id, end_point_ip.c_str());
return false;
}

auto src_vtep = vtep_ptr->getSrcIP().to_string();
if (tunnel_orch->getTunnelPort(src_vtep,tunnelPort, true))
{
Expand Down
51 changes: 51 additions & 0 deletions tests/evpn_tunnel.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,17 @@ def check_vlan_extension_delete_p2mp(self, dvs, vlan_name, sip, dip):
status, fvs = tbl.get(self.l2mcgroup_member_map[dip+vlan_name])
assert status == False, "L2MC Group Member entry not deleted"

def check_vlan_obj(self, dvs, vlan_name):
asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
expected_vlan_attributes = {
'SAI_VLAN_ATTR_VLAN_ID': vlan_name,
}
ret = self.helper.get_key_with_attr(asic_db, 'ASIC_STATE:SAI_OBJECT_TYPE_VLAN', expected_vlan_attributes)
assert len(ret) > 0, "VLAN entry not created"
assert len(ret) == 1, "More than 1 VLAN entry created"

self.vlan_id_map[vlan_name] = ret[0]

def check_vlan_extension(self, dvs, vlan_name, dip):
asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
expected_vlan_attributes = {
Expand All @@ -743,6 +754,25 @@ def check_vlan_extension(self, dvs, vlan_name, dip):
assert len(ret) == 1, "More than 1 VLAN member created"
self.vlan_member_map[dip+vlan_name] = ret[0]

def check_vlan_extension_not_created(self, dvs, vlan_name, dip):
asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
expected_vlan_attributes = {
'SAI_VLAN_ATTR_VLAN_ID': vlan_name,
}
ret = self.helper.get_key_with_attr(asic_db, 'ASIC_STATE:SAI_OBJECT_TYPE_VLAN', expected_vlan_attributes)
assert len(ret) > 0, "VLAN entry not created"
assert len(ret) == 1, "More than 1 VLAN entry created"

self.vlan_id_map[vlan_name] = ret[0]

if dip in self.bridgeport_map:
expected_vlan_member_attributes = {
'SAI_VLAN_MEMBER_ATTR_VLAN_ID': self.vlan_id_map[vlan_name],
'SAI_VLAN_MEMBER_ATTR_BRIDGE_PORT_ID': self.bridgeport_map[dip],
}
ret = self.helper.get_key_with_attr(asic_db, 'ASIC_STATE:SAI_OBJECT_TYPE_VLAN_MEMBER', expected_vlan_member_attributes)
assert len(ret) == 0, "VLAN member created"

def check_vlan_extension_p2mp(self, dvs, vlan_name, sip, dip):
asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)
tbl = swsscommon.Table(asic_db, 'ASIC_STATE:SAI_OBJECT_TYPE_VLAN')
Expand Down Expand Up @@ -986,6 +1016,27 @@ def check_vrf_routes(self, dvs, prefix, vrf_name, endpoint, tunnel, mac="", vni=

return True

def check_vrf_routes_absence(self, dvs, prefix, vrf_name, endpoint, tunnel, mac="", vni=0, no_update=0):
asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)

vr_ids = self.vrf_route_ids(dvs, vrf_name)
count = len(vr_ids)

# Check routes in ingress VRF
expected_attr = {
"SAI_NEXT_HOP_ATTR_TYPE": "SAI_NEXT_HOP_TYPE_TUNNEL_ENCAP",
"SAI_NEXT_HOP_ATTR_IP": endpoint,
"SAI_NEXT_HOP_ATTR_TUNNEL_ID": self.tunnel[tunnel],
}

if vni:
expected_attr.update({'SAI_NEXT_HOP_ATTR_TUNNEL_VNI': vni})

if mac:
expected_attr.update({'SAI_NEXT_HOP_ATTR_TUNNEL_MAC': mac})

self.helper.get_created_entries(asic_db, self.ASIC_NEXT_HOP, self.nhops, 0)

def check_vrf_routes_ecmp(self, dvs, prefix, vrf_name, tunnel, nh_count, no_update=0):
asic_db = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0)

Expand Down
64 changes: 6 additions & 58 deletions tests/test_evpn_l3_vxlan.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ def test_sip_tunnel_vrf_vni_map(self, dvs, testlog):
print ("\n\nTesting Create and Delete SIP Tunnel and VRF VNI Map entries")
print ("\tCreate SIP Tunnel")
vxlan_obj.create_vlan1(dvs,"Vlan100")
vxlan_obj.check_vlan_obj(dvs, "100")
vxlan_obj.create_vxlan_tunnel(dvs, tunnel_name, '6.6.6.6')
vxlan_obj.create_evpn_nvo(dvs, 'nvo1', tunnel_name)

Expand Down Expand Up @@ -97,7 +98,7 @@ def test_sip_tunnel_vrf_vni_map(self, dvs, testlog):
# Test 2 - Create and Delete DIP Tunnel on adding and removing prefix route
# @pytest.mark.skip(reason="Starting Route Orch, VRF Orch to be merged")
# @pytest.mark.dev_sanity
def test_prefix_route_create_dip_tunnel(self, dvs, testlog):
def test_prefix_route_create_tunnel(self, dvs, testlog):
vxlan_obj = self.get_vxlan_obj()
helper = self.get_vxlan_helper()

Expand Down Expand Up @@ -161,17 +162,11 @@ def test_prefix_route_create_dip_tunnel(self, dvs, testlog):
vxlan_obj.create_vrf_route(dvs, "80.80.1.0/24", 'Vrf-RED', '7.7.7.7', "Vlan100", "00:11:11:11:11:11", '1000')
vxlan_obj.check_vrf_routes(dvs, "80.80.1.0/24", 'Vrf-RED', '7.7.7.7', tunnel_name, "00:11:11:11:11:11", '1000')

print ("\tTesting DIP tunnel 7.7.7.7 creation")
vxlan_obj.check_vxlan_dip_tunnel(dvs, tunnel_name, '6.6.6.6', '7.7.7.7')

print ("\tTest VRF IPv4 Route with Tunnel Nexthop Delete")
vxlan_obj.delete_vrf_route(dvs, "80.80.1.0/24", 'Vrf-RED')
vxlan_obj.check_del_tunnel_nexthop(dvs, 'Vrf-RED', '7.7.7.7', tunnel_name, "00:11:11:11:11:11", '1000')
vxlan_obj.check_del_vrf_routes(dvs, "80.80.1.0/24", 'Vrf-RED')

print ("\tTesting DIP tunnel 7.7.7.7 deletion")
vxlan_obj.check_vxlan_dip_tunnel_delete(dvs, '7.7.7.7')

print ("\tTesting Tunnel Vrf Map Entry removal")
vxlan_obj.remove_vxlan_vrf_tunnel_map(dvs, 'Vrf-RED')
vxlan_obj.check_vxlan_tunnel_vrf_map_entry_remove(dvs, tunnel_name, 'Vrf-RED', '1000')
Expand All @@ -198,7 +193,7 @@ def test_prefix_route_create_dip_tunnel(self, dvs, testlog):
# Test 3 - Create and Delete DIP Tunnel and Test IPv4 route and overlay nexthop add and delete
# @pytest.mark.skip(reason="Starting Route Orch, VRF Orch to be merged")
# @pytest.mark.dev_sanity
def test_dip_tunnel_ipv4_routes(self, dvs, testlog):
def test_tunnel_ipv4_routes(self, dvs, testlog):
vxlan_obj = self.get_vxlan_obj()
helper = self.get_vxlan_helper()

Expand All @@ -211,6 +206,7 @@ def test_dip_tunnel_ipv4_routes(self, dvs, testlog):
print ("\n\nTesting IPv4 Route and Overlay Nexthop Add and Delete")
print ("\tCreate SIP Tunnel")
vxlan_obj.create_vlan1(dvs,"Vlan100")
vxlan_obj.check_vlan_obj(dvs, "100")
vxlan_obj.create_vxlan_tunnel(dvs, tunnel_name, '6.6.6.6')
vxlan_obj.create_evpn_nvo(dvs, 'nvo1', tunnel_name)

Expand Down Expand Up @@ -252,21 +248,6 @@ def test_dip_tunnel_ipv4_routes(self, dvs, testlog):
print ("\tTesting Tunnel Vrf Map Entry")
vxlan_obj.check_vxlan_tunnel_vrf_map_entry(dvs, tunnel_name, 'Vrf-RED', '1000')

print ("\tTesting First DIP tunnel creation to 7.7.7.7")
vxlan_obj.create_evpn_remote_vni(dvs, 'Vlan100', '7.7.7.7', '1000')
vxlan_obj.check_vxlan_dip_tunnel(dvs, tunnel_name, '6.6.6.6', '7.7.7.7')

print ("\tTesting VLAN 100 extension")
vxlan_obj.check_vlan_extension(dvs, '100', '7.7.7.7')

print ("\tTesting Second DIP tunnel creation to 8.8.8.8")
vxlan_obj.create_evpn_remote_vni(dvs, 'Vlan100', '8.8.8.8', '1000')
vxlan_obj.check_vxlan_dip_tunnel(dvs, tunnel_name, '6.6.6.6', '8.8.8.8')

print ("\tTesting VLAN 100 extension to 8.8.8.8 and 7.7.7.7")
vxlan_obj.check_vlan_extension(dvs, '100', '8.8.8.8')
vxlan_obj.check_vlan_extension(dvs, '100', '7.7.7.7')

print ("\tTesting VLAN 100 interface creation")
vxlan_obj.create_vlan_interface(dvs, "Vlan100", "Ethernet24", "Vrf-RED", "100.100.3.1/24")
vxlan_obj.check_router_interface(dvs, 'Vrf-RED', vxlan_obj.vlan_id_map['100'], 2)
Expand Down Expand Up @@ -373,16 +354,6 @@ def test_dip_tunnel_ipv4_routes(self, dvs, testlog):
vxlan_obj.remove_vxlan_vrf_tunnel_map(dvs, 'Vrf-RED')
vxlan_obj.check_vxlan_tunnel_vrf_map_entry_remove(dvs, tunnel_name, 'Vrf-RED', '1000')

print ("\tTesting LastVlan removal and DIP tunnel delete for 7.7.7.7")
vxlan_obj.remove_evpn_remote_vni(dvs, 'Vlan100', '7.7.7.7')
vxlan_obj.check_vlan_extension_delete(dvs, '100', '7.7.7.7')
vxlan_obj.check_vxlan_dip_tunnel_delete(dvs, '7.7.7.7')

print ("\tTesting LastVlan removal and DIP tunnel delete for 8.8.8.8")
vxlan_obj.remove_evpn_remote_vni(dvs, 'Vlan100', '8.8.8.8')
vxlan_obj.check_vlan_extension_delete(dvs, '100', '8.8.8.8')
vxlan_obj.check_vxlan_dip_tunnel_delete(dvs, '8.8.8.8')

print ("\tTesting Vlan 100 interface delete")
vxlan_obj.delete_vlan_interface(dvs, "Vlan100", "100.100.3.1/24")
vxlan_obj.check_del_router_interface(dvs, "Vlan100")
Expand All @@ -405,7 +376,7 @@ def test_dip_tunnel_ipv4_routes(self, dvs, testlog):
# Test 4 - Create and Delete DIP Tunnel and Test IPv6 route and overlay nexthop add and delete
# @pytest.mark.skip(reason="Starting Route Orch, VRF Orch to be merged")
# @pytest.mark.dev_sanity
def test_dip_tunnel_ipv6_routes(self, dvs, testlog):
def test_tunnel_ipv6_routes(self, dvs, testlog):
vxlan_obj = self.get_vxlan_obj()
helper = self.get_vxlan_helper()

Expand All @@ -418,6 +389,7 @@ def test_dip_tunnel_ipv6_routes(self, dvs, testlog):
print ("\n\nTesting IPv6 Route and Overlay Nexthop Add and Delete")
print ("\tCreate SIP Tunnel")
vxlan_obj.create_vlan1(dvs,"Vlan100")
vxlan_obj.check_vlan_obj(dvs, "100")
vxlan_obj.create_vxlan_tunnel(dvs, tunnel_name, '6.6.6.6')
vxlan_obj.create_evpn_nvo(dvs, 'nvo1', tunnel_name)

Expand Down Expand Up @@ -460,20 +432,6 @@ def test_dip_tunnel_ipv6_routes(self, dvs, testlog):
print ("\tTesting Tunnel Vrf Map Entry")
vxlan_obj.check_vxlan_tunnel_vrf_map_entry(dvs, tunnel_name, 'Vrf-RED', '1000')

print ("\tTesting First DIP tunnel creation to 7.7.7.7")
vxlan_obj.create_evpn_remote_vni(dvs, 'Vlan100', '7.7.7.7', '1000')
vxlan_obj.check_vxlan_dip_tunnel(dvs, tunnel_name, '6.6.6.6', '7.7.7.7')

print ("\tTesting VLAN 100 extension")
vxlan_obj.check_vlan_extension(dvs, '100', '7.7.7.7')

print ("\tTesting Second DIP tunnel creation to 8.8.8.8")
vxlan_obj.create_evpn_remote_vni(dvs, 'Vlan100', '8.8.8.8', '1000')
vxlan_obj.check_vxlan_dip_tunnel(dvs, tunnel_name, '6.6.6.6', '8.8.8.8')

print ("\tTesting VLAN 100 extension to 8.8.8.8 and 7.7.7.7")
vxlan_obj.check_vlan_extension(dvs, '100', '8.8.8.8')
vxlan_obj.check_vlan_extension(dvs, '100', '7.7.7.7')

vxlan_obj.fetch_exist_entries(dvs)
print ("\tTesting VLAN 100 interface creation")
Expand Down Expand Up @@ -582,16 +540,6 @@ def test_dip_tunnel_ipv6_routes(self, dvs, testlog):
vxlan_obj.remove_vxlan_vrf_tunnel_map(dvs, 'Vrf-RED')
vxlan_obj.check_vxlan_tunnel_vrf_map_entry_remove(dvs, tunnel_name, 'Vrf-RED', '1000')

print ("\tTesting LastVlan removal and DIP tunnel delete for 7.7.7.7")
vxlan_obj.remove_evpn_remote_vni(dvs, 'Vlan100', '7.7.7.7')
vxlan_obj.check_vlan_extension_delete(dvs, '100', '7.7.7.7')
vxlan_obj.check_vxlan_dip_tunnel_delete(dvs, '7.7.7.7')

print ("\tTesting LastVlan removal and DIP tunnel delete for 8.8.8.8")
vxlan_obj.remove_evpn_remote_vni(dvs, 'Vlan100', '8.8.8.8')
vxlan_obj.check_vlan_extension_delete(dvs, '100', '8.8.8.8')
vxlan_obj.check_vxlan_dip_tunnel_delete(dvs, '8.8.8.8')

print ("\tTesting Vlan 100 interface delete")
vxlan_obj.delete_vlan_interface(dvs, "Vlan100", "2001::8/64")
vxlan_obj.check_del_router_interface(dvs, "Vlan100")
Expand Down
Loading

0 comments on commit 868db24

Please sign in to comment.