Skip to content

[vxlan]Fixing L2MC vlan member caching issue #2378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prsunny merged 2 commits into from
Jul 15, 2022
Merged

[vxlan]Fixing L2MC vlan member caching issue #2378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a672bd
[vxlan]Fixing L2MC vlan member caching issue
dgsudharsan Jul 9, 2022
085dca2
Adding UT
dgsudharsan Jul 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 71 additions & 12 deletions orchagent/portsorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4779,7 +4779,11 @@ bool PortsOrch::addVlanFloodGroups(Port &vlan, Port &port, string end_point_ip)
{
SWSS_LOG_ERROR("Failed to set l2mc flood type combined "
" to vlan %hu for unknown unicast flooding", vlan.m_vlan_info.vlan_id);
return false;
task_process_status handle_status = handleSaiSetStatus(SAI_API_VLAN, status);
if (handle_status != task_success)
{
return parseHandleSaiStatusFailure(handle_status);
}
}
vlan.m_vlan_info.uuc_flood_type = SAI_VLAN_FLOOD_CONTROL_TYPE_COMBINED;
}
Expand All @@ -4794,7 +4798,12 @@ bool PortsOrch::addVlanFloodGroups(Port &vlan, Port &port, string end_point_ip)
{
SWSS_LOG_ERROR("Failed to set l2mc flood type combined "
" to vlan %hu for broadcast flooding", vlan.m_vlan_info.vlan_id);
return false;
task_process_status handle_status = handleSaiSetStatus(SAI_API_VLAN, status);
if (handle_status != task_success)
{
m_portList[vlan.m_alias] = vlan;
return parseHandleSaiStatusFailure(handle_status);
}
}
vlan.m_vlan_info.bc_flood_type = SAI_VLAN_FLOOD_CONTROL_TYPE_COMBINED;
}
Expand All @@ -4805,7 +4814,12 @@ bool PortsOrch::addVlanFloodGroups(Port &vlan, Port &port, string end_point_ip)
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to create l2mc flood group");
return false;
task_process_status handle_status = handleSaiCreateStatus(SAI_API_L2MC_GROUP, status);
if (handle_status != task_success)
{
m_portList[vlan.m_alias] = vlan;
return parseHandleSaiStatusFailure(handle_status);
}
}

if (vlan.m_vlan_info.uuc_flood_type == SAI_VLAN_FLOOD_CONTROL_TYPE_COMBINED)
Expand All @@ -4819,7 +4833,12 @@ bool PortsOrch::addVlanFloodGroups(Port &vlan, Port &port, string end_point_ip)
SWSS_LOG_ERROR("Failed to set l2mc group %" PRIx64
" to vlan %hu for unknown unicast flooding",
l2mc_group_id, vlan.m_vlan_info.vlan_id);
return false;
task_process_status handle_status = handleSaiSetStatus(SAI_API_VLAN, status);
if (handle_status != task_success)
{
m_portList[vlan.m_alias] = vlan;
return parseHandleSaiStatusFailure(handle_status);
}
}
}
if (vlan.m_vlan_info.bc_flood_type == SAI_VLAN_FLOOD_CONTROL_TYPE_COMBINED)
Expand All @@ -4833,7 +4852,12 @@ bool PortsOrch::addVlanFloodGroups(Port &vlan, Port &port, string end_point_ip)
SWSS_LOG_ERROR("Failed to set l2mc group %" PRIx64
" to vlan %hu for broadcast flooding",
l2mc_group_id, vlan.m_vlan_info.vlan_id);
return false;
task_process_status handle_status = handleSaiSetStatus(SAI_API_VLAN, status);
if (handle_status != task_success)
{
m_portList[vlan.m_alias] = vlan;
return parseHandleSaiStatusFailure(handle_status);
}
}
}
vlan.m_vlan_info.l2mc_group_id = l2mc_group_id;
Expand Down Expand Up @@ -4873,7 +4897,12 @@ bool PortsOrch::addVlanFloodGroups(Port &vlan, Port &port, string end_point_ip)
{
SWSS_LOG_ERROR("Failed to create l2mc group member for adding tunnel %s to vlan %hu",
end_point_ip.c_str(), vlan.m_vlan_info.vlan_id);
return false;
task_process_status handle_status = handleSaiCreateStatus(SAI_API_L2MC_GROUP, status);
if (handle_status != task_success)
{
m_portList[vlan.m_alias] = vlan;
return parseHandleSaiStatusFailure(handle_status);
}
}
vlan.m_vlan_info.l2mc_members[end_point_ip] = l2mc_group_member;
m_portList[vlan.m_alias] = vlan;
Expand All @@ -4900,7 +4929,11 @@ bool PortsOrch::removeVlanEndPointIp(Port &vlan, Port &port, string end_point_ip
{
SWSS_LOG_ERROR("Failed to remove end point ip %s from vlan %hu",
end_point_ip.c_str(), vlan.m_vlan_info.vlan_id);
return false;
task_process_status handle_status = handleSaiRemoveStatus(SAI_API_L2MC_GROUP, status);
if (handle_status != task_success)
{
return parseHandleSaiStatusFailure(handle_status);
}
}
decreaseBridgePortRefCount(port);
vlan.m_vlan_info.l2mc_members.erase(end_point_ip);
Expand All @@ -4920,7 +4953,12 @@ bool PortsOrch::removeVlanEndPointIp(Port &vlan, Port &port, string end_point_ip
SWSS_LOG_ERROR("Failed to set null l2mc group "
" to vlan %hu for unknown unicast flooding",
vlan.m_vlan_info.vlan_id);
return false;
task_process_status handle_status = handleSaiSetStatus(SAI_API_VLAN, status);
if (handle_status != task_success)
{
m_portList[vlan.m_alias] = vlan;
return parseHandleSaiStatusFailure(handle_status);
}
}
attr.id = SAI_VLAN_ATTR_UNKNOWN_UNICAST_FLOOD_CONTROL_TYPE;
attr.value.s32 = SAI_VLAN_FLOOD_CONTROL_TYPE_ALL;
Expand All @@ -4930,7 +4968,12 @@ bool PortsOrch::removeVlanEndPointIp(Port &vlan, Port &port, string end_point_ip
SWSS_LOG_ERROR("Failed to set flood control type all"
" to vlan %hu for unknown unicast flooding",
vlan.m_vlan_info.vlan_id);
return false;
task_process_status handle_status = handleSaiSetStatus(SAI_API_VLAN, status);
if (handle_status != task_success)
{
m_portList[vlan.m_alias] = vlan;
return parseHandleSaiStatusFailure(handle_status);
}
}
vlan.m_vlan_info.uuc_flood_type = SAI_VLAN_FLOOD_CONTROL_TYPE_ALL;
}
Expand All @@ -4945,7 +4988,12 @@ bool PortsOrch::removeVlanEndPointIp(Port &vlan, Port &port, string end_point_ip
SWSS_LOG_ERROR("Failed to set null l2mc group "
" to vlan %hu for broadcast flooding",
vlan.m_vlan_info.vlan_id);
return false;
task_process_status handle_status = handleSaiSetStatus(SAI_API_VLAN, status);
if (handle_status != task_success)
{
m_portList[vlan.m_alias] = vlan;
return parseHandleSaiStatusFailure(handle_status);
}
}
attr.id = SAI_VLAN_ATTR_BROADCAST_FLOOD_CONTROL_TYPE;
attr.value.s32 = SAI_VLAN_FLOOD_CONTROL_TYPE_ALL;
Expand All @@ -4955,18 +5003,29 @@ bool PortsOrch::removeVlanEndPointIp(Port &vlan, Port &port, string end_point_ip
SWSS_LOG_ERROR("Failed to set flood control type all"
" to vlan %hu for broadcast flooding",
vlan.m_vlan_info.vlan_id);
return false;
task_process_status handle_status = handleSaiSetStatus(SAI_API_VLAN, status);
if (handle_status != task_success)
{
m_portList[vlan.m_alias] = vlan;
return parseHandleSaiStatusFailure(handle_status);
}
}
vlan.m_vlan_info.bc_flood_type = SAI_VLAN_FLOOD_CONTROL_TYPE_ALL;
}
status = sai_l2mc_group_api->remove_l2mc_group(vlan.m_vlan_info.l2mc_group_id);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to remove l2mc group %" PRIx64, l2mc_group_id);
return false;
task_process_status handle_status = handleSaiRemoveStatus(SAI_API_L2MC_GROUP, status);
if (handle_status != task_success)
{
m_portList[vlan.m_alias] = vlan;
return parseHandleSaiStatusFailure(handle_status);
}
}
vlan.m_vlan_info.l2mc_group_id = SAI_NULL_OBJECT_ID;
}
m_portList[vlan.m_alias] = vlan;
return true;
}

Expand Down
11 changes: 11 additions & 0 deletions tests/test_evpn_tunnel_p2mp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,17 @@ def test_vlan_extension(self, dvs, testlog):
vxlan_obj.remove_evpn_remote_vni(dvs, 'Vlan100', '8.8.8.8')
vxlan_obj.check_vlan_extension_delete_p2mp(dvs, '100', '6.6.6.6', '8.8.8.8')

print("Testing remote endpoint again to 8.8.8.8")
vxlan_obj.create_evpn_remote_vni(dvs, 'Vlan100', '8.8.8.8', '1000')
print("Testing remote endpoint creation to 8.8.8.8")

print("Testing VLAN 100 extension to 8.8.8.8")
vxlan_obj.check_vlan_extension_p2mp(dvs, '100', '6.6.6.6', '8.8.8.8')

print("Testing Last Vlan removal and remote endpoint delete for 8.8.8.8")
vxlan_obj.remove_evpn_remote_vni(dvs, 'Vlan100', '8.8.8.8')
vxlan_obj.check_vlan_extension_delete_p2mp(dvs, '100', '6.6.6.6', '8.8.8.8')

vxlan_obj.remove_vxlan_tunnel_map(dvs, tunnel_name, map_name, '1000', 'Vlan100')
vxlan_obj.remove_vxlan_tunnel_map(dvs, tunnel_name, map_name_1, '1001', 'Vlan101')
vxlan_obj.remove_vxlan_tunnel_map(dvs, tunnel_name, map_name_2, '1002', 'Vlan102')
Expand Down