Shut down interface after config validation of port\dependencies deletion and port addition #1303

praveen-li · 2020-12-11T23:59:37Z

Changes:
-- Shutdown the interfaces after config validation while Dy Port Breakout.
-- Validate del ports before calling breakOutPorts API.

Signed-off-by: Praveen Chaudhary pchaudhary@linkedin.com

Fixes sonic-net/sonic-buildimage#6646, sonic-net/sonic-buildimage#6631,

- What I did
Changes:
-- Shutdown the interfaces after config validation while Dy Port Breakout.

- How I did it
-- move shutdown part to config_mgmt.py, because we need to shutdown only when DPB is initiated.

- How to verify it

svc-lnos-user@server10:/home/svc-lnos-user/praveen/sonic-buildimage/src/sonic-swss/tests$ cat test_port_dpb_system.py | grep -A 4 -B 4 Uncomment

        # Verify port is removed from ACL table
        self.dvs_acl.verify_acl_table_count(1)

        #TBD: Uncomment this, or explain why Ethernet0 is being added back to ACL table
        # Also, string "None" is being added as port to ACL port list after the breakout
        self.dvs_acl.verify_acl_group_num(0)

        # Verify child ports are created.

svc-lnos-user@server10:/home/svc-lnos-user/praveen/sonic-buildimage/src/sonic-swss/tests$ sudo pytest --dvsname=vs-jk test_port_dpb_system.py -k test_port_breakout_with_acl --junitxml=report.xml | tee out
============================= test session starts ==============================
platform linux2 -- Python 2.7.12, pytest-3.3.0, py-1.6.0, pluggy-0.6.0
rootdir: /home/svc-lnos-user/praveen/sonic-buildimage/src/sonic-swss/tests, inifile:
collected 2 items

test_port_dpb_system.py .                                                [100%]

 generated xml file: /home/svc-lnos-user/praveen/sonic-buildimage/src/sonic-swss/tests/report.xml
============================== 1 tests deselected ==============================
=================== 1 passed, 1 deselected in 92.36 seconds ====================

Jun  5 06:16:37.007136 fec26aa9f1be INFO #sonic_yang: Try to load Data in the tree
Jun  5 06:16:37.007722 fec26aa9f1be INFO #configMgmt: Data Validation successful
Jun  5 06:16:37.031857 fec26aa9f1be INFO #configMgmt: shutdown Interfaces: {'PORT': {'Ethernet2': {'admin_status': 'down'}, 'Ethernet3': {'admin_status': 'down'}, 'Ethernet0': {'admin_status': 'down'}, 'Ethernet1': {'admin_status': 'down'}}}
Jun  5 06:16:37.032485 fec26aa9f1be INFO #configMgmt: Write in DB: {'PORT': OrderedDict([('Ethernet0', {'admin_status': 'down'}), ('Ethernet1', {'admin_status': 'down'}), ('Ethernet2', {'admin_status': 'down'}), ('Ethernet3', {'admin_status': 'down'})])}
Jun  5 06:16:37.033823 fec26aa9f1be NOTICE #orchagent: :- doPortTask: Set port Ethernet0 admin status to down
Jun  5 06:16:37.034270 fec26aa9f1be INFO #configMgmt: Write in DB: {u'PORT': OrderedDict([(u'Ethernet0', None), (u'Ethernet1', None), (u'Ethernet2', None), (u'Ethernet3', None)])}
Jun  5 06:16:37.034383 fec26aa9f1be NOTICE #orchagent: :- doPortTask: Set port Ethernet1 admin status to down
Jun  5 06:16:37.034486 fec26aa9f1be NOTICE #orchagent: :- doPortTask: Set port Ethernet2 admin status to down
Jun  5 06:16:37.034872 fec26aa9f1be NOTICE #portsyncd: :- onMsg: nlmsg type:16 key:Ethernet0 admin:0 oper:0 addr:02:42:ac:11:00:0c ifindex:1199 master:0 type:tun
Jun  5 06:16:37.035004 fec26aa9f1be NOTICE #orchagent: :- doPortTask: Set port Ethernet3 admin status to down
Jun  5 06:16:37.035166 fec26aa9f1be NOTICE #portsyncd: :- onMsg: Publish Ethernet0(ok) to state db
Jun  5 06:16:37.035317 fec26aa9f1be INFO #configMgmt: Verify Port Deletion from Asic DB, Wait...

——Test 06/09/2020

Jun  9 23:58:26.590188 fec26aa9f1be INFO #configMgmt: shutdown Interfaces: {'PORT': {'Ethernet2': {'admin_status': 'down'}, 'Ethernet0': {'admin_status': 'down'}}}
Jun  9 23:58:26.590828 fec26aa9f1be INFO #configMgmt: Write in DB: {'PORT': OrderedDict([('Ethernet0', {'admin_status': 'down'}), ('Ethernet2', {'admin_status': 'down'})])}
Jun  9 23:58:26.591800 fec26aa9f1be INFO #configMgmt: Write in DB: {u'PORT': OrderedDict([(u'Ethernet0', None), (u'Ethernet2', None)])}
Jun  9 23:58:26.592121 fec26aa9f1be INFO #configMgmt: Verify Port Deletion from Asic DB, Wait...

svc-lnos-user@server10:/home/svc-lnos-user/praveen/sonic-buildimage/src/sonic-swss/tests$ cat test_port_dpb_system.py | grep -A 4 -B 4 Uncomment

        # Verify port is removed from ACL table
        self.dvs_acl.verify_acl_table_count(1)

        #TBD: Uncomment this, or explain why Ethernet0 is being added back to ACL table
        # Also, string "None" is being added as port to ACL port list after the breakout
        self.dvs_acl.verify_acl_group_num(0)

        # Verify child ports are created.
svc-lnos-user@server10:/home/svc-lnos-user/praveen/sonic-buildimage/src/sonic-swss/tests$ sudo pytest --dvsname=vs-jk test_port_dpb_system.py -k test_port_breakout_with_acl --junitxml=report.xml | tee out
============================= test session starts ==============================
platform linux2 -- Python 2.7.12, pytest-3.3.0, py-1.6.0, pluggy-0.6.0
rootdir: /home/svc-lnos-user/praveen/sonic-buildimage/src/sonic-swss/tests, inifile:
collected 2 items

test_port_dpb_system.py .                                                [100%]

 generated xml file: /home/svc-lnos-user/praveen/sonic-buildimage/src/sonic-swss/tests/report.xml
============================== 1 tests deselected ==============================
=================== 1 passed, 1 deselected in 93.69 seconds ====================

- 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)

praveen-li · 2021-01-07T22:13:57Z

Gentle Reminder for review.

praveen-li · 2021-02-03T18:07:21Z

Solves: sonic-net/sonic-buildimage#6631
@qiluo-msft @jleveque kindly review.

config/main.py

jleveque · 2021-02-03T23:49:58Z

Retest this please

praveen-li · 2021-02-04T02:12:25Z

Let me check why tests are failing.

praveen-li · 2021-02-04T07:45:27Z

Retest this please

praveen-li · 2021-02-04T17:54:19Z

@jleveque : I think we can safely merge it now. As mentioned, Nvidia has raised a couple of issues that are solved by this PR.

jleveque · 2021-02-04T18:39:24Z

@jleveque : I think we can safely merge it now. As mentioned, Nvidia has raised a couple of issues that are solved by this PR.

@praveen-li: Can you add either "Fixes <link to issue>" or "Resolves <link to issue>" to the PR description for each issue this fixes? This way the issues will be automatically closed when the PR merges.

…onic-net#28) * [config_mgmt.py]: Shutdown the interfaces after config validation. Changes: -- Shutdown the interfaces after config validation while Dy Port Breakout. -- Validate del ports before calling breakOutPorts API. Signed-off-by: Praveen Chaudhary pchaudhary@linkedin.com

Signed-off-by: Praveen Chaudhary<pchaudhary@linkedin.com>

Signed-off-by: Praveen Chaudhary <pchaudhary@linkedin.com>

praveen-li · 2021-02-17T06:24:04Z

Forced pushed "praveen-li force-pushed the praveen-li:shut_down_intf_dpb branch from 210aeea to 2c500e6 now"

For rebase. No other changes.

praveen-li · 2021-02-17T19:06:24Z

retest default please

praveen-li · 2021-02-17T19:06:53Z

Retest this please

zhenggen-xu · 2021-03-03T04:20:34Z

Retest this please

praveen-li · 2021-03-03T09:10:39Z

@jleveque : gentle reminder for review.

samaity · 2021-03-09T22:15:48Z

@lguohan Kindly merge this PR to fix a few of the DPB issues mentioned in the description.

allas-nvidia · 2021-03-31T13:41:18Z

Kindly merge this PR to fix a few of the DPB issues mentioned in the description.

praveen-li · 2021-03-31T16:47:27Z

@jleveque
Kindly label it with Port Breakout 🔱. thx

@lguohan :
Kindly merge. thx.

praveen-li · 2021-04-01T19:51:48Z

retest this please

allas-nvidia · 2021-04-04T14:50:04Z

Kindly reminder to retest it.
Can be labeled with 202012?
Thanks

praveen-li · 2021-04-13T23:29:19Z

@lguohan : Kindly merge, thx.

@jleveque : how can I run the tests again, seems a few are stuck.? thx.

jleveque · 2021-04-13T23:58:08Z

/azp run

azure-pipelines · 2021-04-13T23:58:18Z

Azure Pipelines successfully started running 1 pipeline(s).

liat-grozovik · 2021-04-22T10:20:29Z

/azp run

azure-pipelines · 2021-04-22T10:20:40Z

Azure Pipelines successfully started running 1 pipeline(s).

praveen-li · 2021-05-03T16:12:30Z

@lguohan , @jleveque : gentle reminder for Merge.

Changes: -- Shutdown the interfaces after config validation while Dy Port Breakout. -- Validate del ports before calling breakOutPorts API. Signed-off-by: Praveen Chaudhary pchaudhary@linkedin.com Fixes sonic-net/sonic-buildimage#6646, sonic-net/sonic-buildimage#6631, Signed-off-by: Praveen Chaudhary pchaudhary@linkedin.com

praveen-li mentioned this pull request Dec 16, 2020

Verify port status in APPL_DB after shutting down interfaces. #1310

Open

praveen-li mentioned this pull request Feb 3, 2021

[DPB] After breakout mode apply failed, interface switch to admin state down sonic-net/sonic-buildimage#6631

Closed

qiluo-msft reviewed Feb 3, 2021

View reviewed changes

config/main.py Outdated Show resolved Hide resolved

qiluo-msft requested a review from jleveque February 3, 2021 18:38

praveen-li force-pushed the shut_down_intf_dpb branch from 4d8a309 to 20b1105 Compare February 3, 2021 21:06

qiluo-msft previously approved these changes Feb 3, 2021

View reviewed changes

praveen-li dismissed qiluo-msft’s stale review via 210aeea February 4, 2021 02:19

Praveen Chaudhary added 6 commits February 16, 2021 22:21

Tests for shutdown intf

d99f253

[tests/config_mgmt_test.py]: Minor changes to fix tests.

19f7ea7

Signed-off-by: Praveen Chaudhary<pchaudhary@linkedin.com>

Fix _shutdownIntf to check correct call

2ff364e

[config/main.py]: Use click.abort() and fix test case by deepcopy().

ae40d19

Signed-off-by: Praveen Chaudhary <pchaudhary@linkedin.com>

interface_name_is_valid add arg config_db

2c500e6

praveen-li force-pushed the shut_down_intf_dpb branch from 210aeea to 2c500e6 Compare February 17, 2021 06:23

Replace call with mock.call

f6ac50f

jleveque approved these changes Mar 3, 2021

View reviewed changes

jleveque added Enhancement Port Breakout 🔱 labels Mar 31, 2021

qiluo-msft added the Request for 202012 Branch label Apr 5, 2021

qiluo-msft approved these changes Apr 5, 2021

View reviewed changes

zhenggen-xu removed the Request for 202012 Branch label May 12, 2021

praveen-li changed the title ~~Shut down intf dpb~~ Shut down interface before dynamic port breakout May 12, 2021

lguohan merged commit a089e53 into sonic-net:master May 12, 2021

praveen-li changed the title ~~Shut down interface before dynamic port breakout~~ Shut down interface after config validation of port\dependencies deletion and port addition May 12, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Shut down interface after config validation of port\dependencies deletion and port addition #1303

Shut down interface after config validation of port\dependencies deletion and port addition #1303

praveen-li commented Dec 11, 2020 •

edited

Loading

praveen-li commented Jan 7, 2021

praveen-li commented Feb 3, 2021

jleveque commented Feb 3, 2021

praveen-li commented Feb 4, 2021

praveen-li commented Feb 4, 2021

praveen-li commented Feb 4, 2021

jleveque commented Feb 4, 2021 •

edited

Loading

praveen-li commented Feb 17, 2021

praveen-li commented Feb 17, 2021

praveen-li commented Feb 17, 2021

zhenggen-xu commented Mar 3, 2021

praveen-li commented Mar 3, 2021

samaity commented Mar 9, 2021

allas-nvidia commented Mar 31, 2021

praveen-li commented Mar 31, 2021

praveen-li commented Apr 1, 2021

allas-nvidia commented Apr 4, 2021

praveen-li commented Apr 13, 2021

jleveque commented Apr 13, 2021

azure-pipelines bot commented Apr 13, 2021

liat-grozovik commented Apr 22, 2021

azure-pipelines bot commented Apr 22, 2021

praveen-li commented May 3, 2021

Shut down interface after config validation of port\dependencies deletion and port addition #1303

Shut down interface after config validation of port\dependencies deletion and port addition #1303

Conversation

praveen-li commented Dec 11, 2020 • edited Loading

praveen-li commented Jan 7, 2021

praveen-li commented Feb 3, 2021

jleveque commented Feb 3, 2021

praveen-li commented Feb 4, 2021

praveen-li commented Feb 4, 2021

praveen-li commented Feb 4, 2021

jleveque commented Feb 4, 2021 • edited Loading

praveen-li commented Feb 17, 2021

praveen-li commented Feb 17, 2021

praveen-li commented Feb 17, 2021

zhenggen-xu commented Mar 3, 2021

praveen-li commented Mar 3, 2021

samaity commented Mar 9, 2021

allas-nvidia commented Mar 31, 2021

praveen-li commented Mar 31, 2021

praveen-li commented Apr 1, 2021

allas-nvidia commented Apr 4, 2021

praveen-li commented Apr 13, 2021

jleveque commented Apr 13, 2021

azure-pipelines bot commented Apr 13, 2021

liat-grozovik commented Apr 22, 2021

azure-pipelines bot commented Apr 22, 2021

praveen-li commented May 3, 2021

praveen-li commented Dec 11, 2020 •

edited

Loading

jleveque commented Feb 4, 2021 •

edited

Loading