[fast-reboot] Fix dump script to support PortChannels in a VLAN group by shlomibitton · Pull Request #1393 · sonic-net/sonic-utilities

shlomibitton · 2021-01-31T07:47:02Z

- What I did
Add PortChannels to the list of interfaces (port_id_2_iface) to support FDB dump for PortChannel in a VLAN group.
Fixes sonic-net/sonic-buildimage#4793

- How I did it

Get LAG ID from the DB.
Find the LAG name from APP DB.
Add it to the list of 'port_id_2_iface' to be used.

- How to verify it
Reproduce the issue mentioned on this PR and try to run fast-reboot with this fix.

- Previous command output (if the output of a command-line utility has changed)
Traceback:
src_ifs = {map_mac_ip_per_vlan[vlan_name][dst_mac] for vlan_name, dst_mac, _ in arp_entries}
KeyError: 'b8:59:9f:a8:e2:00'

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

Fix of IP parsing. Signed-off-by: Shlomi Bitton <shlomibi@nvidia.com>

lguohan

this is a new feature. please add unit test support.

scripts/fast-reboot-dump.py

shlomibitton · 2021-02-09T07:41:22Z

this is a new feature. please add unit test support.

@lguohan there is no unit-test for fast-reboot or the fast-reboot-dump, I will add a test for it

Adapt the fast-reboot-dump script for unit testing

shlomibitton · 2021-02-17T15:16:41Z

@lguohan added a unit-test, please review
thanks

tests/fast_reboot_dump_dbs/APPL_DB.json

tests/fast_reboot_dump_test.py

shlomibitton · 2021-02-28T11:36:03Z

retest this please

liat-grozovik · 2021-02-28T16:16:24Z

@tahmed-dev @stepanblyschak can you please review?

liat-grozovik · 2021-03-02T13:37:58Z

@tahmed-dev could u please review?
@lguohan any further comments or we can move forward and merge?

tahmed-dev · 2021-03-02T17:23:13Z

@tahmed-dev could u please review?
@lguohan any further comments or we can move forward and merge?

@lguohan , @liat-grozovik ACK.

scripts/fast-reboot-dump.py

tahmed-dev

Can you please add Why I did it to the PR description?

dprital · 2021-03-10T09:43:45Z

@tahmed-dev - It done in order to fix the following issue:
sonic-net/sonic-buildimage#4793
And it is mentioned on "Why I did it" above.
Can you please approve and merge (also to 202012) ?

liat-grozovik · 2021-03-16T14:50:26Z

@tahmed-dev comments were addressed, can you please review?

qiluo-msft · 2021-04-02T18:08:50Z

setup.py

        'swsssdk>=2.0.1',
        'tabulate==0.8.2',
        'xmltodict==0.12.0',
+        'deepdiff==5.2.3',


deepdiff [](start = 9, length = 8)

This is tests_require?

looks like it is

qiluo-msft · 2021-04-03T21:31:53Z

scripts/fast-reboot-dump.py


 def generate_fdb_entries(filename):
-    fdb_entries = []
+    asic_db = swsssdk.SonicV2Connector(host='127.0.0.1')


swsssdk [](start = 14, length = 7)

swsssdk is deprecated and the import change is alreay merged.

I tested the master latest image plus master latest sonic-utilities

admin@str-msn2700-20:~$ show platform summary Platform: x86_64-mlnx_msn2700-r0 HwSKU: Mellanox-SN2700-D40C8S8 ASIC: mellanox ASIC Count: 1 admin@str-msn2700-20:~$ sudo fast-reboot Failed to run fast-reboot-dump.py. Exit code: 2 admin@str-msn2700-20:~$ sudo fast-reboot-dump.py admin@str-msn2700-20:~$ echo $? 2 Apr 3 21:59:03.838231 str-msn2700-20 ERR fast-reboot-dump: Got an exception name 'swsssdk' is not defined: Traceback: Traceback (most recent call last):#012 File "/usr/local/bin/fast-reboot-dump.py", line 341, in <module>#012 res = main()#012 File "/usr/local/bin/fast-reboot-dump.py", line 331, in main#012 all_available_macs, map_mac_ip_per_vlan = generate_fdb_entries(root_dir + '/fdb.json')#012 File "/usr/local/bin/fast-reboot-dump.py", line 193, in generate_fdb_entries#012 asic_db = swsssdk.SonicV2Connector(host='127.0.0.1')#012NameError: name 'swsssdk' is not defined Apr 3 21:59:03.850487 str-msn2700-20 NOTICE admin: fast-reboot failure (12) cleanup ...

how can we avoid this in the future? for example, can we remove swsssdk as a build or test dependency so that the unit test will automatically fail?

The test case does not cover the problematic code, so the exception is not triggered.

bug introduced in #1393 Signed-off-by: Guohan Lu <lguohan@gmail.com>

#### What I did This PR #1393 merged after PR: #1392 This caused the first PR to be not aligned with SonicV2Connector change. This PR motivation is to fix it.

… [201911] (#1547) **- What I did** Add PortChannels to the list of interfaces (port_id_2_iface) to support FDB dump for PortChannel in a VLAN group. Fixes sonic-net/sonic-buildimage#4793 This PR is the 201911 version of the original PR: #1393 **- How I did it** * Get LAG ID from the DB. * Find the LAG name from APP DB. * Add it to the list of 'port_id_2_iface' to be used. **- How to verify it** Reproduce the issue mentioned on this PR and try to run fast-reboot with this fix. **- Previous command output (if the output of a command-line utility has changed)** Traceback: src_ifs = {map_mac_ip_per_vlan[vlan_name][dst_mac] for vlan_name, dst_mac, _ in arp_entries} KeyError: 'b8:59:9f:a8:e2:00' **- New command output (if the output of a command-line utility has changed)** Success .

bug introduced in #1393 Signed-off-by: Guohan Lu <lguohan@gmail.com>

…#1393) Add PortChannels to the list of interfaces (port_id_2_iface) to support FDB dump for PortChannel in a VLAN group. Fix sonic-net/sonic-buildimage#4793 - How I did it - Get LAG ID from the DB. - Find the LAG name from APP DB. - Add it to the list of 'port_id_2_iface' to be used. - How to verify it Reproduce the issue mentioned on this PR and try to run fast-reboot with this fix. - Previous command output (if the output of a command-line utility has changed) Traceback: src_ifs = {map_mac_ip_per_vlan[vlan_name][dst_mac] for vlan_name, dst_mac, _ in arp_entries} KeyError: 'b8:59:9f:a8:e2:00' Signed-off-by: Shlomi Bitton <shlomibi@nvidia.com>

#### What I did This PR #1393 merged after PR: #1392 This caused the first PR to be not aligned with SonicV2Connector change. This PR motivation is to fix it.

…1546) #### What I did This PR sonic-net#1393 merged after PR: sonic-net#1392 This caused the first PR to be not aligned with SonicV2Connector change. This PR motivation is to fix it.

[sonic-swsss] Fix the issue of field "next_hop_ip" not getting updated in state DB in ERSPAN Mirror (sonic-net#1375) [vlanmgr] Support Jumbo Frame By Default (sonic-net#1393) [fec] added logic that put port down before applying fec onfiguration (sonic-net#1399) [fec] Get FEC mode when port is already admin down (sonic-net#1403) Refine getDbId() calling to fix build after swss-common change (sonic-net#1245)

#### What I did This PR sonic-net/sonic-utilities#1393 merged after PR: sonic-net/sonic-utilities#1392 This caused the first PR to be not aligned with SonicV2Connector change. This PR motivation is to fix it.

Fix for PortChannel member of VLAN on fast-reboot

1134303

Fix of IP parsing. Signed-off-by: Shlomi Bitton <shlomibi@nvidia.com>

lguohan requested a review from tahmed-dev February 1, 2021 01:22

lguohan requested changes Feb 1, 2021

View reviewed changes

akokhan reviewed Feb 2, 2021

View reviewed changes

scripts/fast-reboot-dump.py Show resolved Hide resolved

shlomibitton and others added 2 commits February 3, 2021 09:30

Merge branch 'master' into fast_reboot_dump_portchannel_fix

2b0f105

remove redundant ip parsing

90742b1

Add unit-test for Vlan PortChannel member scenario

a8e4a29

Adapt the fast-reboot-dump script for unit testing

Add dependency to setup.py

efd8022

liat-grozovik requested changes Feb 21, 2021

View reviewed changes

tests/fast_reboot_dump_dbs/APPL_DB.json Show resolved Hide resolved

tests/fast_reboot_dump_dbs/APPL_DB.json Show resolved Hide resolved

tests/fast_reboot_dump_test.py Show resolved Hide resolved

Add test description

cab258a

shlomibitton requested a review from liat-grozovik February 28, 2021 15:57

liat-grozovik approved these changes Feb 28, 2021

View reviewed changes

liat-grozovik added the Request for 202012 Branch label Feb 28, 2021

shlomibitton requested a review from lguohan February 28, 2021 16:16

liat-grozovik previously approved these changes Mar 2, 2021

View reviewed changes

stepanblyschak previously approved these changes Mar 2, 2021

View reviewed changes

tahmed-dev reviewed Mar 2, 2021

View reviewed changes

scripts/fast-reboot-dump.py Show resolved Hide resolved

tahmed-dev reviewed Mar 2, 2021

View reviewed changes

refactor the code to be more readable

e6fd007

shlomibitton dismissed stale reviews from stepanblyschak and liat-grozovik via e6fd007 March 15, 2021 10:47

shlomibitton requested a review from liat-grozovik March 15, 2021 10:54

shlomibitton requested a review from tahmed-dev March 17, 2021 07:35

tahmed-dev approved these changes Mar 29, 2021

View reviewed changes

lguohan approved these changes Apr 2, 2021

View reviewed changes

qiluo-msft reviewed Apr 2, 2021

View reviewed changes

lguohan merged commit e9cfb32 into sonic-net:master Apr 2, 2021

lguohan mentioned this pull request Apr 2, 2021

[setup.py]: move the module to test requirement #1542

Merged

qiluo-msft reviewed Apr 3, 2021

View reviewed changes

lguohan added a commit that referenced this pull request Apr 4, 2021

[setup.py]: move the module to test requirement (#1542)

e0f678a

bug introduced in #1393 Signed-off-by: Guohan Lu <lguohan@gmail.com>

yozhao101 mentioned this pull request Apr 4, 2021

[sonic-utilities] Update submodule. sonic-net/sonic-buildimage#7227

Merged

This was referenced Apr 5, 2021

[fast-reboot] Fix fast-reboot-dump.py SonicV2Connector after late merge #1546

Merged

[fast-reboot] Fix dump script to support PortChannels in a VLAN group [201911] #1547

Merged

yxieca pushed a commit that referenced this pull request Apr 8, 2021

[setup.py]: move the module to test requirement (#1542)

a160519

bug introduced in #1393 Signed-off-by: Guohan Lu <lguohan@gmail.com>

yxieca added the Included in 202012 Branch label Apr 8, 2021

yozhao101 mentioned this pull request Aug 22, 2021

[sonic-utilities] Update the submodule of sonic-utilities. sonic-net/sonic-buildimage#8551

Closed

Conversation

shlomibitton commented Jan 31, 2021 • edited by lguohan Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lguohan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

shlomibitton commented Feb 9, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shlomibitton commented Feb 17, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shlomibitton commented Feb 28, 2021

Uh oh!

liat-grozovik commented Feb 28, 2021

Uh oh!

liat-grozovik commented Mar 2, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tahmed-dev commented Mar 2, 2021

Uh oh!

Uh oh!

tahmed-dev left a comment

Choose a reason for hiding this comment

Uh oh!

dprital commented Mar 10, 2021

Uh oh!

liat-grozovik commented Mar 16, 2021

Uh oh!

qiluo-msft Apr 2, 2021

Choose a reason for hiding this comment

Uh oh!

lguohan Apr 2, 2021

Choose a reason for hiding this comment

Uh oh!

qiluo-msft Apr 3, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lguohan Apr 4, 2021

Choose a reason for hiding this comment

Uh oh!

qiluo-msft Apr 4, 2021

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

shlomibitton commented Jan 31, 2021 •

edited by lguohan

Loading

shlomibitton commented Feb 9, 2021 •

edited

Loading

liat-grozovik commented Mar 2, 2021 •

edited

Loading

qiluo-msft Apr 3, 2021 •

edited

Loading