Vnet_route_check Vxlan tunnel route update. #2281

siqbal1986 · 2022-07-31T22:05:31Z

Modified Vnet_route_check to ignore the Vxlan tunnel routes which uses default VRF.

What I did

Updated the vnet_route_check script to handle the vxlan tunnel routes.

How I did it

By checking the scope of the tunnel route, if it is default then it is treated in a different way. Tunnel routes coming from App_db are compared with ASIC_db default_VRF routes and their presence is verified.
For routes coming from ASIC_db with default_VRF, the comparison is not done with the routes form App_db as ASIC_DB carries all other the routes.
For normal vnet routes, the functionality of the script is unaffected.

How to verify it

run the script after adding a vxlan tunnel.

Previous command output (if the output of a command-line utility has changed)

New command output (if the output of a command-line utility has changed)

prsunny · 2022-08-01T18:42:47Z

We should not ignore vnet routes in the script. Scrip must handle the vnet routes in default scope and proceed with the check

prsunny · 2022-08-04T01:16:03Z

can you please add some tests and also fix the test failure?

linux-foundation-easycla · 2022-08-09T19:12:47Z

The committers listed above are authorized under a signed CLA.

✅ login: siqbal1986 (363bdf5)

prsunny · 2022-08-09T21:37:42Z

scripts/vnet_route_check.py

+            if vnet_name not in vnet_intfs:
+                # this route has no vnet_intf and may be part of default VRF.
+                vnet_table = swsscommon.Table(db, 'VNET_TABLE')
+                scope = vnet_table.get(vnet_name)[1][1][1]


what is this index [1][1][1] ? Can you provide an example?

this looking up the scope=default but i think I can improve it.

prsunny · 2022-08-09T21:39:16Z

scripts/vnet_route_check.py


    vnet_intfs = get_vnet_intfs()

    vrf_oid_to_vnet_map = {}
+    vrf_oid_to_vnet_map[default_vrf_oid] = 'default_VRF'


I don't see this being used. Can you confirm?

This is used as a placeholder, as the data structure keeps track of the routes by means of the vnet interface.

prsunny · 2022-08-09T21:40:36Z

scripts/vnet_route_check.py

+    virtual_router = swsscommon.Table(asic_db, 'ASIC_STATE:SAI_OBJECT_TYPE_VIRTUAL_ROUTER')
+    default_vrf_oid = ""
+    if virtual_router.getKeys() != []:
+        default_vrf_oid = virtual_router.getKeys()[0]


please make it as a global variable so you don't have to pass it in multiple places and use as "self.xxx"

commit 78e4fe7 Author: siqbal1486 <shahzad.iqbal@microsoft.com> Date: Wed Aug 10 12:17:56 2022 -0700 Fixes suggested in review. Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com> commit 757a6b0 Author: Shahzad Iqbal (SHAHZADIQBAL) <SHAHZADIQBAL@ame.gbl> Date: Tue Aug 9 12:12:33 2022 -0700 added 2 tests and fixed a bug. commit fb4d138 Author: Shahzad Iqbal (SHAHZADIQBAL) <SHAHZADIQBAL@ame.gbl> Date: Mon Aug 1 18:59:55 2022 -0700 changed script to account for tunnel routes. commit c2db718 Author: Shahzad Iqbal (SHAHZADIQBAL) <SHAHZADIQBAL@ame.gbl> Date: Sun Jul 31 15:09:12 2022 -0700 removed accidently added spaces. commit 2b5658d Author: Shahzad Iqbal (SHAHZADIQBAL) <SHAHZADIQBAL@ame.gbl> Date: Sun Jul 31 14:52:49 2022 -0700 Modified Vnet_route_check to ignore the Vxlan tunnel routes which use default VRF.

Fixed a bug found while testing for IpV6.

*Vnet_route_check for overlay Vxlan tunnel routes.

Update sonic-utilities submodule pointer to include the following: * 0a7557b [minigraph] add option to specify golden path in load_minigraph ([sonic-net#2350](sonic-net/sonic-utilities#2350)) * 322aefc [GCU]Remove GCU unique lane check for duplicate lanes platforms ([sonic-net#2343](sonic-net/sonic-utilities#2343)) * 7099fff [fastboot] fastboot enhancement: Use warm-boot infrastructure for fast-boot ([sonic-net#2286](sonic-net/sonic-utilities#2286)) * 09026ed [warm-reboot] fix warm-reboot when /tmp/cache is missing ([sonic-net#2367](sonic-net/sonic-utilities#2367)) * a3c404c Fix typo in platform_sfputil_helper.is_rj45_port ([sonic-net#2374](sonic-net/sonic-utilities#2374)) * 637d834 Vnet_route_check Vxlan tunnel route update. ([sonic-net#2281](sonic-net/sonic-utilities#2281)) * 29a3e51 Added support for tunnel route status in show vnet routes all. ([sonic-net#2341](sonic-net/sonic-utilities#2341)) * 1ac584b Use 'default' VRF when VRF name is not provided ([sonic-net#2368](sonic-net/sonic-utilities#2368)) * 4d377a6 [subinterface]Added additional checks in portchannel and subinterface commands ([sonic-net#2345](sonic-net/sonic-utilities#2345)) * bbcdf2e disk_check: Publish event for RO state ([sonic-net#2320](sonic-net/sonic-utilities#2320)) * 3fd537b Support the bandit check by GitHub Action ([sonic-net#2358](sonic-net/sonic-utilities#2358)) * 491d3d3 [generate dump]Added error message when saisdkdump fails ([sonic-net#2356](sonic-net/sonic-utilities#2356)) * 6830e01 [counterpoll]Fixing counterpoll show for tunnel and acl stats ([sonic-net#2355](sonic-net/sonic-utilities#2355)) * 3be2ad7 [fast-reboot]Avoid stopping masked services during fast-reboot ([sonic-net#2335](sonic-net/sonic-utilities#2335)) * 0e1b0cf [GCU] Fix missing backend in dry run ([sonic-net#2347](sonic-net/sonic-utilities#2347)) * 676c31b Add verification for override ([sonic-net#2305](sonic-net/sonic-utilities#2305)) * 48997c2 Add Password Hardening CLI support ([sonic-net#2338](sonic-net/sonic-utilities#2338)) * 414e239 update unit tests for swap ([#locato](https://github.com/sonic-net/sonic-utilities/pull/locato)) * a91a492 consider swap checking memory in ([#stalle](https://github.com/sonic-net/sonic-utilities/pull/stalle)) * f0ce586 [route_check]: Ignore standalone tunnel routes ([sonic-net#2325](sonic-net/sonic-utilities#2325)) Signed-off-by: dprital <drorp@nvidia.com>

* Squashed commit of the following: commit 78e4fe7 Author: siqbal1486 <shahzad.iqbal@microsoft.com> Date: Wed Aug 10 12:17:56 2022 -0700 Fixes suggested in review. Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com> commit 757a6b0 Author: Shahzad Iqbal (SHAHZADIQBAL) <SHAHZADIQBAL@ame.gbl> Date: Tue Aug 9 12:12:33 2022 -0700 added 2 tests and fixed a bug. commit fb4d138 Author: Shahzad Iqbal (SHAHZADIQBAL) <SHAHZADIQBAL@ame.gbl> Date: Mon Aug 1 18:59:55 2022 -0700 changed script to account for tunnel routes. commit c2db718 Author: Shahzad Iqbal (SHAHZADIQBAL) <SHAHZADIQBAL@ame.gbl> Date: Sun Jul 31 15:09:12 2022 -0700 removed accidently added spaces. commit 2b5658d Author: Shahzad Iqbal (SHAHZADIQBAL) <SHAHZADIQBAL@ame.gbl> Date: Sun Jul 31 14:52:49 2022 -0700 Modified Vnet_route_check to ignore the Vxlan tunnel routes which use default VRF. * changes suggested in review. Fixed a bug found while testing for IpV6. * Updated a testcse to cover IPV6. Fixed a bug causing build failures.

siqbal1986 requested review from sumukhatv and prsunny July 31, 2022 22:05

prsunny requested a review from volodymyrsamotiy August 4, 2022 01:15

prsunny reviewed Aug 9, 2022

View reviewed changes

siqbal1986 added 2 commits August 12, 2022 10:16

changes suggested in review.

ba70482

Fixed a bug found while testing for IpV6.

prsunny previously approved these changes Sep 13, 2022

View reviewed changes

Updated a testcse to cover IPV6. Fixed a bug causing build failures.

af8f19b

siqbal1986 dismissed prsunny’s stale review via af8f19b September 15, 2022 18:11

prsunny approved these changes Sep 15, 2022

View reviewed changes

prsunny added the Request for 202205 Branch label Sep 15, 2022

siqbal1986 merged commit 637d834 into sonic-net:master Sep 15, 2022

siqbal1986 mentioned this pull request Sep 15, 2022

Vnet_route_check Vxlan tunnel route update. (#2281) #2376

Merged

prsunny pushed a commit that referenced this pull request Sep 16, 2022

Vnet_route_check Vxlan tunnel route update. (#2281) (#2376)

7b8a62f

*Vnet_route_check for overlay Vxlan tunnel routes.

dprital mentioned this pull request Sep 21, 2022

[submodule] Advance sonic-utilities pointer sonic-net/sonic-buildimage#12146

Closed

7 tasks

yxieca added the Included in 202205 Branch label Sep 21, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Vnet_route_check Vxlan tunnel route update. #2281

Vnet_route_check Vxlan tunnel route update. #2281

siqbal1986 commented Jul 31, 2022 •

edited

Loading

prsunny commented Aug 1, 2022

prsunny commented Aug 4, 2022

linux-foundation-easycla bot commented Aug 9, 2022 •

edited

Loading

prsunny Aug 9, 2022

siqbal1986 Aug 10, 2022

prsunny Aug 9, 2022

siqbal1986 Aug 10, 2022

prsunny Aug 9, 2022

siqbal1986 Aug 10, 2022

siqbal1986 Aug 12, 2022

Vnet_route_check Vxlan tunnel route update. #2281

Vnet_route_check Vxlan tunnel route update. #2281

Conversation

siqbal1986 commented Jul 31, 2022 • edited Loading

What I did

How I did it

How to verify it

Previous command output (if the output of a command-line utility has changed)

New command output (if the output of a command-line utility has changed)

prsunny commented Aug 1, 2022

prsunny commented Aug 4, 2022

linux-foundation-easycla bot commented Aug 9, 2022 • edited Loading

prsunny Aug 9, 2022

Choose a reason for hiding this comment

siqbal1986 Aug 10, 2022

Choose a reason for hiding this comment

prsunny Aug 9, 2022

Choose a reason for hiding this comment

siqbal1986 Aug 10, 2022

Choose a reason for hiding this comment

prsunny Aug 9, 2022

Choose a reason for hiding this comment

siqbal1986 Aug 10, 2022

Choose a reason for hiding this comment

siqbal1986 Aug 12, 2022

Choose a reason for hiding this comment

siqbal1986 commented Jul 31, 2022 •

edited

Loading

linux-foundation-easycla bot commented Aug 9, 2022 •

edited

Loading