Updated handling of VRF_VNI mapping and VLAN_VNI mapping for same VNI ID#2538
Updated handling of VRF_VNI mapping and VLAN_VNI mapping for same VNI ID#2538prsunny merged 5 commits intosonic-net:masterfrom
Conversation
|
|
|
@srj102 @RajeshPukhrajJain Please review |
|
@dgsudharsan Please review |
|
@LaveenBrcm Please review |
|
@hasan-brcm Please review |
|
Please update the pytest as well. |
dgsudharsan
left a comment
dgsudharsan
left a comment
There was a problem hiding this comment.
Please add UT.
There is a flow where VRF - VNI gets mapped first and then VLAN - VNI map arrives later. This PR doesn't handle it. Please handle that flow.
…llowed by VLAN VNI mapping
|
Done |
Thanks. The existing UT fail due to new logic. Can you please update the UT? |
|
This pull request introduces 1 alert when merging 423395b into ec507a4 - view on LGTM.com new alerts:
Heads-up: LGTM.com's PR analysis will be disabled on the 5th of December, and LGTM.com will be shut down ⏻ completely on the 16th of December 2022. Please enable GitHub code scanning, which uses the same CodeQL engine ⚙️ that powers LGTM.com. For more information, please check out our post on the GitHub blog. |
|
@tapashdas Can you please address the failures in swss VS tests? |
|
Will do. Occupied with other work items. Updated VRF-VNI test case. They are passing now. |
Understood. Can you please provide an ETA for addressing them? |
|
/azpw run |
|
/AzurePipelines run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azpw run |
|
/AzurePipelines run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azpw run |
|
/AzurePipelines run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
Please merge the changes. |
| SWSS_LOG_DEBUG("add_tunnel_map_entry name %s, vlan %d, vni %d\n", entry.vniVlanMapName.c_str(), entry.vlan_id, entry.vni_id); | ||
| } | ||
| } | ||
| if(entry.isL2Vni) |
There was a problem hiding this comment.
please have space afterif.
|
@tapashdas Can you please raise submodule update? |
Update sonic-swss submodule pointer to include the following: * bdedf69 Modify coppmgr mergeConfig to support preserving copp tables through reboot. ([sonic-net#2548](sonic-net/sonic-swss#2548)) * 7891e78 Fixed set mtu for deleted subintf due to late notification ([sonic-net#2571](sonic-net/sonic-swss#2571)) * a443945 Updated handling of VRF_VNI mapping and VLAN_VNI mapping for same VNI ID ([sonic-net#2538](sonic-net/sonic-swss#2538)) Signed-off-by: dprital <drorp@nvidia.com>
Update sonic-swss submodule pointer to include the following: * bdedf69 Modify coppmgr mergeConfig to support preserving copp tables through reboot. ([#2548](sonic-net/sonic-swss#2548)) * 7891e78 Fixed set mtu for deleted subintf due to late notification ([#2571](sonic-net/sonic-swss#2571)) * a443945 Updated handling of VRF_VNI mapping and VLAN_VNI mapping for same VNI ID ([#2538](sonic-net/sonic-swss#2538)) Signed-off-by: dprital <drorp@nvidia.com>
|
@StormLiangMS would you please help to cherry-pick to the 202211 branch? |
… ID (#2538) * Updated handling of VRF_VNI mapping and VLAN_VNI mapping for same VNI ID
… ID (sonic-net#2538) * Updated handling of VRF_VNI mapping and VLAN_VNI mapping for same VNI ID
… ID (sonic-net#2538) * Updated handling of VRF_VNI mapping and VLAN_VNI mapping for same VNI ID
… ID (sonic-net#2538) * Updated handling of VRF_VNI mapping and VLAN_VNI mapping for same VNI ID
7 participants
What I did
Updated handling of VRF_VNI mapping and VLAN_VNI mapping for same VNI ID
Why I did it
When a VNI (L3 VNI) is mapped to VRF, corresponding VNI (L2 VNI) to Vlan mapping is not required.
Updated VxLAN Orchagent code to remove Vlan-VNI mapping entry when VRF is mapped to same VNI.
Also Re-add Vlan-VNI mapping entry when VRF-VNI mapping for same VNI is removed.
How I verified it
Details if related