[CLI][PFCWD][Multi-ASIC] Added multi ASIC support to 'pfcwd' CLI command #1080

smaheshm · 2020-08-27T18:45:34Z

- What I did

Added multi ASIC support to the following CLI command:

show pfcwd config
show pfcwd stats.

Added multi ASIC support to following script:

pfcwd

Commands:
big_red_switch Enable/disable BIG_RED_SWITCH mode
counter_poll Enable/disable counter polling
interval Set PFC watchdog counter polling interval
show Show PFC Watchdog information
start Start PFC watchdog on port(s).
start_default Start PFC WD by default configurations
stop Stop PFC watchdog on port(s)

- How I did it

Multi ASIC decorator is used to run on multi ASIC and single ASIC. Multi ASIC requires the CLI to be a class instance.

Converted CLIs to classes to that multi ASIC decorator can be used.

Main logic change in 'show' command is:

collect the stats from all ASICs.
display the output

'show' commands have the option of passing asic instance and display filter, applicable to multi ASIC platforms.

For config changes,

run the config change on each asic instance on multi ASIC platforms, or the only ASIC on single ASIC platforms.

Config commands don't have the option to pass the asic instance or the display filter. By default its all instances and all ports.

- How to verify it

Ran the commands CLI commands on both multi ASIC and single ASIC platforms, and unit tests.

admin@str-n3164-acs-2:~$ pfcwd show stats --help
Usage: pfcwd show stats [OPTIONS] [QUEUES]...

  Show PFC Watchdog stats per queue

Options:
  -d, --display [all|frontend]    Show internal interfaces  [default:
                                  frontend]
  -n, --namespace [asic0|asic1|asic2|asic3|asic4|asic5]
                                  Namespace name or all
  -e, --empty
  --help                          Show this message and exit.
admin@str-n3164-acs-2:~$ pfcwd show config --help
Usage: pfcwd show config [OPTIONS] [PORTS]...

  Show PFC Watchdog configuration

Options:
  -d, --display [all|frontend]    Show internal interfaces  [default:
                                  frontend]
  -n, --namespace [asic0|asic1|asic2|asic3|asic4|asic5]
                                  Namespace name or all
  --help                          Show this message and exit.
admin@str-n3164-acs-2:~$ 

admin@str-n3164-acs-2:~$ pfcwd show config -n asic1 
Changed polling interval to 200 ms on asic1
BIG_RED_SWITCH status is disable on asic1
      PORT    ACTION    DETECTION TIME    RESTORATION TIME
----------  --------  ----------------  ------------------
Ethernet64      drop               200                 200
Ethernet68      drop               200                 200
Ethernet80      drop               200                 200
Ethernet84      drop               200                 200

admin@str-n3164-acs-2:~$ pfcwd show config -n asic1 -d all
Changed polling interval to 200 ms on asic1
BIG_RED_SWITCH status is disable on asic1
          PORT    ACTION    DETECTION TIME    RESTORATION TIME
--------------  --------  ----------------  ------------------
    Ethernet64      drop               200                 200
    Ethernet68      drop               200                 200
    .
    .
    .
Ethernet-BP112      drop               200                 200
Ethernet-BP116      drop               200                 200
Ethernet-BP120      drop               200                 200
Ethernet-BP124      drop               200                 200

admin@str-n3164-acs-2:~$ pfcwd show config 
Changed polling interval to 200 ms on asic0
BIG_RED_SWITCH status is disable on asic0
Changed polling interval to 200 ms on asic1
BIG_RED_SWITCH status is disable on asic1
Changed polling interval to 200 ms on asic2
BIG_RED_SWITCH status is disable on asic2
Changed polling interval to 200 ms on asic3
BIG_RED_SWITCH status is disable on asic3
       PORT    ACTION    DETECTION TIME    RESTORATION TIME
-----------  --------  ----------------  ------------------
Ethernet0      drop               200                 200
Ethernet4      drop               200                 200
Ethernet20      drop               200                 200
 .
 .
Ethernet64      drop               200                 200
Ethernet84      drop               200                 200
.
.
Ethernet136      drop               200                 200
Ethernet168      drop               200                 200
.
.
Ethernet180      drop               200                 200
Ethernet220      drop               200                 200
.
.
Ethernet244      drop               200                 200
Ethernet248      drop               200                 200
Ethernet252      drop               200                 200

pfcstat command


admin@str-n3164-acs-2:~$ sudo pfcwd interval 197
admin@str-n3164-acs-2:~$ sudo pfcwd start --action drop ports all detection-time 199 --restoration-time 199
admin@str-n3164-acs-2:~$ pfcwd show 
config  stats   
admin@str-n3164-acs-2:~$ pfcwd show config
Changed polling interval to 197 ms on asic0
BIG_RED_SWITCH status is enable on asic0
Changed polling interval to 197 ms on asic1
BIG_RED_SWITCH status is enable on asic1
Changed polling interval to 197 ms on asic2
BIG_RED_SWITCH status is enable on asic2
Changed polling interval to 197 ms on asic3
BIG_RED_SWITCH status is enable on asic3
       PORT    ACTION    DETECTION TIME    RESTORATION TIME
-----------  --------  ----------------  ------------------
  Ethernet0      drop               199                 199
  Ethernet4      drop               199                 199
  Ethernet8      drop               199                 199
 Ethernet12      drop               199                 199
 Ethernet16      drop               199                 199
 Ethernet20      drop               199                 199
 Ethernet24      drop               199                 199
 Ethernet28      drop               199                 199
 Ethernet32      drop               199                 199
 .
 .
 .
 .
Ethernet228      drop               199                 199
Ethernet232      drop               199                 199
Ethernet236      drop               199                 199
Ethernet240      drop               199                 199
Ethernet244      drop               199                 199
Ethernet248      drop               199                 199
Ethernet252      drop               199                 199
admin@str-n3164-acs-2:~$

smaheshm · 2020-08-27T18:47:19Z

Working on unit test code, raised the PR so review can start.

jleveque

Please add more detail to the PR title

show/main.py

smaheshm · 2020-08-28T01:08:17Z

show/main.py

 @click.option('--verbose', is_flag=True, help="Enable verbose output")
 def config(verbose):
    """Show pfc watchdog config"""

-    cmd = "pfcwd show config"
+    cmd = "pfcwd show config -n {} -d {}".format(namespace, display)


will add check for namespace 'None'

smaheshm · 2020-08-28T01:08:23Z

show/main.py

    """Show pfc watchdog stats"""

-    cmd = "pfcwd show stats"
+    cmd = "pfcwd show stats -n {} -d {}".format(namespace, display)


will add check for namespace 'None'

smaheshm · 2020-08-28T23:15:57Z

Unit tests are written only for 'show' commands. Unit tests for config commands is pending on mock config set implementation for multi ASIC environment.

…e in counters DB

pfcwd/main.py

smaheshm · 2020-08-31T18:51:50Z

will wait for reviews from @arlakshm and @neethajohn and make suggested changes.

tests/pfcstat_test.py

pfcwd/main.py

tests/pfcwd_masic_test.py

lgtm-com · 2020-09-01T17:47:39Z

This pull request introduces 1 alert when merging 22bfe46 into 8d6d871 - view on LGTM.com

new alerts:

1 for Unused import

smaheshm · 2020-09-01T17:50:42Z

retest this please

smaheshm · 2020-09-01T21:28:32Z

Just realized pytest needs file names to start or end with “test”. Will rename file.

pfcwd/main.py

…sues with mock DB connection when running separatly

smaheshm · 2020-09-03T17:09:32Z

This passes @neethajohn recently added unit tests on single ASIC platform.

jleveque

Looks good from my perspective. Please wait for other reviewers.

abdosi · 2020-09-03T23:23:17Z

@smaheshm Create PR for 201911

smaheshm · 2020-09-08T21:53:29Z

@smaheshm Create PR for 201911

#1102

smaheshm added 4 commits August 27, 2020 09:32

added multi ASIC support of pfcwd CLI command

031d0a3

added masic support for pfcwd config show

abd34d4

added masic support for pfcwd config show

87aacda

added support for more pfcwd command options

e10618d

smaheshm requested review from neethajohn and arlakshm August 27, 2020 18:47

smaheshm added 2 commits August 27, 2020 11:50

added masic options for show config

8514afc

merge

10e60e1

jleveque suggested changes Aug 28, 2020

View reviewed changes

smaheshm changed the title ~~Pfcwd~~ [CLI][PFCWD][Multi-ASIC] Added multi ASIC support to 'pfcwd' CLI command Aug 28, 2020

smaheshm commented Aug 28, 2020

View reviewed changes

show/main.py Show resolved Hide resolved

smaheshm commented Aug 28, 2020

View reviewed changes

jleveque added Enhancement Multi-ASIC 🔢 pfcwd show labels Aug 28, 2020

added unit tests (only for) show commands

ee65783

remove cached stats in setup and teardown, account for counters updat…

de937cd

…e in counters DB

smaheshm commented Aug 31, 2020

View reviewed changes

pfcwd/main.py Outdated Show resolved Hide resolved

smaheshm commented Aug 31, 2020

View reviewed changes

pfcwd/main.py Outdated Show resolved Hide resolved

smaheshm requested a review from jleveque August 31, 2020 18:16

jleveque suggested changes Aug 31, 2020

View reviewed changes

pfcwd/main.py Outdated Show resolved Hide resolved

pfcwd/main.py Outdated Show resolved Hide resolved

pfcwd/main.py Show resolved Hide resolved

smaheshm commented Aug 31, 2020

View reviewed changes

pfcwd/main.py Outdated Show resolved Hide resolved

neethajohn suggested changes Aug 31, 2020

View reviewed changes

smaheshm added 2 commits September 1, 2020 16:43

Merge remote-tracking branch 'upstream/master' into pfcwd

ee378f2

Made changes as per suggestions, added more unit test cases

22bfe46

smaheshm added 2 commits September 1, 2020 20:56

reload pfcwd module

e03ad89

file rename

ed36c01

neethajohn reviewed Sep 1, 2020

View reviewed changes

pfcwd/main.py Show resolved Hide resolved

merged tests for pcwd single and multi ASIC into one file as there is…

d5f6349

…sues with mock DB connection when running separatly

smaheshm requested review from neethajohn and jleveque September 2, 2020 00:13

jleveque approved these changes Sep 3, 2020

View reviewed changes

smaheshm mentioned this pull request Sep 3, 2020

Add unit tests for show commands on multi ASIC platform for per namespace output. #1093

Closed

neethajohn approved these changes Sep 3, 2020

View reviewed changes

smaheshm merged commit 8152cec into sonic-net:master Sep 3, 2020

smaheshm added the Request for 201911 Branch label Sep 3, 2020

stephenxs mentioned this pull request Sep 4, 2020

[submodule] Advance submodule head for sonic-utilities sonic-net/sonic-buildimage#5318

Closed

3 tasks

This was referenced Sep 8, 2020

[pfcwd] Add single asic unit tests for show commands #1085

Merged

[CLI][PFCWD][Multi-ASIC] Added multi ASIC support to 'pfcwd' CLI #1102

Merged

abdosi added the Included in 201911 Branch label Sep 19, 2020

smaheshm deleted the pfcwd branch February 26, 2021 22:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CLI][PFCWD][Multi-ASIC] Added multi ASIC support to 'pfcwd' CLI command #1080

[CLI][PFCWD][Multi-ASIC] Added multi ASIC support to 'pfcwd' CLI command #1080

smaheshm commented Aug 27, 2020

smaheshm commented Aug 27, 2020

jleveque left a comment

smaheshm Aug 28, 2020

smaheshm Aug 28, 2020

smaheshm commented Aug 28, 2020

smaheshm commented Aug 31, 2020

lgtm-com bot commented Sep 1, 2020

smaheshm commented Sep 1, 2020

smaheshm commented Sep 1, 2020

smaheshm commented Sep 3, 2020

jleveque left a comment

abdosi commented Sep 3, 2020

smaheshm commented Sep 8, 2020

[CLI][PFCWD][Multi-ASIC] Added multi ASIC support to 'pfcwd' CLI command #1080

[CLI][PFCWD][Multi-ASIC] Added multi ASIC support to 'pfcwd' CLI command #1080

Conversation

smaheshm commented Aug 27, 2020

smaheshm commented Aug 27, 2020

jleveque left a comment

Choose a reason for hiding this comment

smaheshm Aug 28, 2020

Choose a reason for hiding this comment

smaheshm Aug 28, 2020

Choose a reason for hiding this comment

smaheshm commented Aug 28, 2020

smaheshm commented Aug 31, 2020

lgtm-com bot commented Sep 1, 2020

smaheshm commented Sep 1, 2020

smaheshm commented Sep 1, 2020

smaheshm commented Sep 3, 2020

jleveque left a comment

Choose a reason for hiding this comment

abdosi commented Sep 3, 2020

smaheshm commented Sep 8, 2020