Configure and show for platform chassis_modules #1145

mprabhu-nokia · 2020-10-01T07:10:08Z

sonic-utilities: Changes to support show and config command for chassis_modules

- What I did
Introduced a show and config commands for modular chassis

$show chassis_modules
$config chassis_modules shutdown <chassis_module_name>

- How I did it
For the show command added a chassismodulesshow script
For the config command added a chassis_modules command to @platform.group

- How to verify it
Vendor will have to implement card.py for both commands to take effect.

- New command output (if the output of a command-line utility has changed)
An example vendor specific output

Out of Configuration command

sudo config chassis-modules shutdown LINE-CARD1
sudo config chassis-modules startup LINE-CARD1

Output of CONFIG_DB

admin@sonic:~$ redis-dump -d 4 -y -k "*CHASSI*"
{
  "CHASSIS_MODULE|LINE-CARD1": {
    "expireat": 1602657677.581144,
    "ttl": -0.001,
    "type": "hash",
    "value": {
      "admin_status": "down"
    }
  }
}

Output of show command

admin@sonic:~$ show chassis-modules status
         Name        Description    Slot    Oper-Status    Admin-Status
-------------  -----------------  ------  -------------  --------------
CONTROL-CARD1           cpm2-ixr      16         Online              up
 FABRIC-CARD1               SFM1      17          Empty              up
 FABRIC-CARD2               SFM2      18          Empty              up
 FABRIC-CARD3               SFM3      19          Empty              up
 FABRIC-CARD4               SFM4      20          Empty              up
 FABRIC-CARD5               SFM5      21         Online              up
 FABRIC-CARD6               SFM6      22          Empty              up
   LINE-CARD1  imm36-400g-qsfpdd       1         Online            down
   LINE-CARD2  imm36-400g-qsfpdd       2         Online              up
   LINE-CARD3          line-card       3          Empty              up
   LINE-CARD4          line-card       4          Empty              up

admin@sonic:~$ show chassis-modules status LINE-CARD1 
         Name        Description    Slot    Oper-Status    Admin-Status
-------------  -----------------  ------  -------------  --------------
  LINE-CARD1  imm36-400g-qsfpdd       1         Online            down

Output of STATE_DB

admin@sonic:~$ redis-dump -d 6 -y -k "*CHASSI*"
{
  "CHASSIS_MODULE_TABLE|CONTROL-CARD1": {
    "expireat": 1602658950.3278022,
    "ttl": -0.001,
    "type": "hash",
    "value": {
      "desc": "cpm2-ixr",
      "oper_status": "Online",
      "slot": "16"
    }
  },
  "CHASSIS_MODULE_TABLE|FABRIC-CARD1": {
    "expireat": 1602658950.32782,
    "ttl": -0.001,
    "type": "hash",
    "value": {
      "desc": "SFM1",
      "oper_status": "Empty",
      "slot": "17"
    }
  },
  "CHASSIS_MODULE_TABLE|LINE-CARD4": {
    "expireat": 1602658950.327953,
    "ttl": -0.001,
    "type": "hash",
    "value": {
      "desc": "line-card",
      "oper_status": "Empty",
      "slot": "4"
    }
  },
  "CHASSIS_TABLE|CHASSIS 1": {
    "expireat": 1602658950.3278341,
    "ttl": -0.001,
    "type": "hash",
    "value": {
      "module_num": "11"
    }
  }
}

lgtm-com · 2020-10-01T07:15:39Z

This pull request introduces 2 alerts when merging 7c6d23bc95d83e6b5e2a934a43984eed068ecf63 into c15cdf6 - view on LGTM.com

new alerts:

1 for Unnecessary pass
1 for Unused import

lguohan · 2020-10-07T16:54:18Z

can you add unit test for the show and config commands?

config/main.py

scripts/chassismodulesshow

lguohan

as comments

config/main.py

scripts/chassismodulesshow

lgtm-com · 2020-10-14T06:42:42Z

This pull request introduces 2 alerts when merging c9b1143853a9838ca967c38b26a4646787be7a00 into 3a7457c - view on LGTM.com

new alerts:

1 for Unnecessary pass
1 for Unused import

lgtm-com · 2020-10-14T07:07:41Z

This pull request introduces 2 alerts when merging 18b692acd70ebc6cc55246acd6aa82ba93d287f7 into 3a7457c - view on LGTM.com

new alerts:

1 for Unnecessary pass
1 for Unused import

scripts/chassismodulesshow

mprabhu-nokia · 2020-10-21T07:06:26Z

How about Fan Tray (FT) and Power Supply Units (PSU)?
They too are planned to be treated as modules - right? and planned to be part of show platform chassismodules

No plans to add FT and PSU as part of 'show chassis-modules'. Existing 'show platform fan' and 'show platform psustatus' can be used.

mprabhu-nokia · 2020-10-21T07:09:01Z

can you add unit test for the show and config commands?

Done. UT is part of tests/chassis_modules_test.py

lgtm-com · 2020-10-21T07:14:56Z

This pull request introduces 1 alert when merging efe7873b3e9fac40a50cbf7caa10a30e2acb1db4 into 13bd06b - view on LGTM.com

new alerts:

1 for Syntax error

mprabhu-nokia · 2020-10-22T08:23:09Z

UT coverage as requested

Name                                       Stmts   Miss  Cover
--------------------------------------------------------------
config/chassis_modules.py                     18      1    94%
show/chassis_modules.py                       45      4    91%

mprabhu-nokia · 2020-10-27T01:01:55Z

This pull request introduces 2 alerts when merging c9b1143 into 3a7457c - view on LGTM.com

new alerts:
* 1 for Unnecessary pass

* 1 for Unused import

This pull request introduces 1 alert when merging efe7873 into 13bd06b - view on LGTM.com

new alerts:
* 1 for Syntax error

Fixed

show/chassis_modules.py

mprabhu-nokia · 2020-11-04T00:35:42Z

retest please

mprabhu-nokia · 2020-11-04T00:37:30Z

retest default please

mprabhu-nokia · 2020-11-04T01:00:16Z

retest this please

mprabhu-nokia · 2020-11-04T17:09:29Z

retest this please

lguohan · 2020-11-04T18:03:21Z

@shyam77git, can you approve?

Adding support for below CLI commands $config plaform chassis_modules admin_down <chassis_module_name> <instance> <module_type> $show platform chassis_modules

Check if tests failed to run due to invalid input in state_db.json

jleveque · 2020-11-10T19:01:44Z

Please fix conflicts

mprabhu-nokia · 2020-11-10T22:05:32Z

Please fix conflicts

Fixed.

mprabhu-nokia · 2020-11-11T18:07:45Z

@lguohan could you please approve and merge? Thanks. You already had approved this, I just resolved conflicts and updated.

-adding new json file to support fixture in platform tests to skip checks for modules not present in DUT new file: tests/platform_tests/cli/test_show_chassis_module.py -adding new two new test cases for verifying show chassis-module status and show chassis-module midplane status introduced as part of PRs sonic-net/sonic-utilities#1145 and sonic-net/sonic-utilities#1267 tests/platform_tests/conftest.py -adding a fixture that skips checking for modules for DUT

…sonic modular chassis (#2794) Description of PR Summary: What is the motivation for this PR? Add test cases to verify show chassis-module status and show chassis-module midplane-status for VOQ chassis. The cli commands were introduced in following PRs: sonic-net/sonic-utilities#1145 sonic-net/sonic-utilities#1267 How did you do it? Added new script tests/platform_tests/cli/test_show_chassis_module.py for verifying show chassis-module status and show chassis-module midplane status. Introduced test cases: test_show_chassis_module_status: verify the output of command show chassis-module status test_show_chassis_module_midplane_status: verify the output of command show chassis-module midplane-status Added new script test_power_budget_info.py for verifying the redis output for power budget policy in supervisor card of chassis Added a fixture that skips checking for modules for DUT. This new fixture is introduced to skips modules for DUT not present based on entries in inventory file, by default the test it is assumed the chassis is fully equipped and all modules are up. Example to skip certain modules add to skip modules in inventory for DUT: DUT1 skip_modules: 'line-cards': - LINE-CARD0 - LINE-CARD2 'fabric-cards': - FABRIC-CARD3 'psus': - PSU4 - PSU5 Based on inventory file the tests will skip above modules for DUT1. For example, show chassis module will allow empty as status for LINE-CARD0 and LINE-CARD2 while all other will be expected to be ONLINE. How did you verify/test it? Ran sample tests against Nokia chassis with t2 topology using the skip fixture Any platform specific information? Supported testbed topology if it's a new test case? t2

lguohan reviewed Oct 7, 2020

View reviewed changes

config/main.py Outdated Show resolved Hide resolved

lguohan reviewed Oct 7, 2020

View reviewed changes

scripts/chassismodulesshow Outdated Show resolved Hide resolved

lguohan requested changes Oct 7, 2020

View reviewed changes

mprabhu-nokia commented Oct 7, 2020

View reviewed changes

config/main.py Outdated Show resolved Hide resolved

shyam77git reviewed Oct 7, 2020

View reviewed changes

scripts/chassismodulesshow Outdated Show resolved Hide resolved

shyam77git reviewed Oct 14, 2020

View reviewed changes

scripts/chassismodulesshow Outdated Show resolved Hide resolved

mprabhu-nokia requested a review from lguohan October 27, 2020 00:59

shyam77git reviewed Nov 3, 2020

View reviewed changes

show/chassis_modules.py Outdated Show resolved Hide resolved

mprabhu-nokia force-pushed the nokia-chassisd-pmon branch from 08889ca to 02d2038 Compare November 4, 2020 04:27

lguohan previously approved these changes Nov 4, 2020

View reviewed changes

shyam77git previously approved these changes Nov 4, 2020

View reviewed changes

mprabhu-nokia added 5 commits November 4, 2020 20:28

Configure and show for platform chassis_modules

5b469ee

Adding support for below CLI commands $config plaform chassis_modules admin_down <chassis_module_name> <instance> <module_type> $show platform chassis_modules

Update show and config of platform chassis-modules

0486e95

Changing key value for DB update

150c74a

Add chassis-modules separate show/config feature

196bae4

Fix typo in if condition check

621cf71

mprabhu-nokia added 4 commits November 4, 2020 20:28

Add more UTs to improve coverage

f7a97d7

Changes to state_db.json

dcb04a6

Fixing additional UT for negative tests

f7834c0

Check if tests failed to run due to invalid input in state_db.json

Changing Slot to Physical-Slot in the header

a91b63e

mprabhu-nokia dismissed stale reviews from shyam77git and lguohan via a91b63e November 5, 2020 04:28

mprabhu-nokia force-pushed the nokia-chassisd-pmon branch from 02d2038 to a91b63e Compare November 5, 2020 04:28

lguohan previously approved these changes Nov 5, 2020

View reviewed changes

shyam77git previously approved these changes Nov 5, 2020

View reviewed changes

Merge branch 'master' into nokia-chassisd-pmon

d04338d

mprabhu-nokia dismissed stale reviews from shyam77git and lguohan via d04338d November 10, 2020 19:10

mprabhu-nokia requested a review from lguohan November 11, 2020 03:10

lguohan approved these changes Nov 11, 2020

View reviewed changes

shyam77git approved these changes Nov 11, 2020

View reviewed changes

lguohan merged commit 40377d3 into sonic-net:master Nov 11, 2020

rawal01 mentioned this pull request Jan 13, 2021

Introduce framework for filtering/selecting pluggable components for sonic modular chassis sonic-net/sonic-mgmt#2794

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Configure and show for platform chassis_modules #1145

Configure and show for platform chassis_modules #1145

mprabhu-nokia commented Oct 1, 2020 •

edited

Loading

lgtm-com bot commented Oct 1, 2020

lguohan commented Oct 7, 2020

lguohan left a comment

lgtm-com bot commented Oct 14, 2020

lgtm-com bot commented Oct 14, 2020

mprabhu-nokia commented Oct 21, 2020

mprabhu-nokia commented Oct 21, 2020

lgtm-com bot commented Oct 21, 2020

mprabhu-nokia commented Oct 22, 2020 •

edited

Loading

mprabhu-nokia commented Oct 27, 2020

mprabhu-nokia commented Nov 4, 2020

mprabhu-nokia commented Nov 4, 2020

mprabhu-nokia commented Nov 4, 2020

mprabhu-nokia commented Nov 4, 2020

lguohan commented Nov 4, 2020

jleveque commented Nov 10, 2020

mprabhu-nokia commented Nov 10, 2020

mprabhu-nokia commented Nov 11, 2020

Configure and show for platform chassis_modules #1145

Configure and show for platform chassis_modules #1145

Conversation

mprabhu-nokia commented Oct 1, 2020 • edited Loading

lgtm-com bot commented Oct 1, 2020

lguohan commented Oct 7, 2020

lguohan left a comment

Choose a reason for hiding this comment

lgtm-com bot commented Oct 14, 2020

lgtm-com bot commented Oct 14, 2020

mprabhu-nokia commented Oct 21, 2020

mprabhu-nokia commented Oct 21, 2020

lgtm-com bot commented Oct 21, 2020

mprabhu-nokia commented Oct 22, 2020 • edited Loading

mprabhu-nokia commented Oct 27, 2020

mprabhu-nokia commented Nov 4, 2020

mprabhu-nokia commented Nov 4, 2020

mprabhu-nokia commented Nov 4, 2020

mprabhu-nokia commented Nov 4, 2020

lguohan commented Nov 4, 2020

jleveque commented Nov 10, 2020

mprabhu-nokia commented Nov 10, 2020

mprabhu-nokia commented Nov 11, 2020

mprabhu-nokia commented Oct 1, 2020 •

edited

Loading

mprabhu-nokia commented Oct 22, 2020 •

edited

Loading