New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SmartSwitch] Extend reboot script for rebooting SmartSwitch #3566

Open

vvolam wants to merge 30 commits into sonic-net:master from vvolam:ss-reboot

+628 −2

vvolam commented Oct 3, 2024 •

edited

Loading

What I did

Extended reboot script for SmartSwitch cases to reboot entire SmartSwitch or a specific DPU

How I did it

Implemented changes according to https://github.com/sonic-net/SONiC/blob/605c3a56ac2717dbbb638433e7bb13054fc05a31/doc/smart-switch/reboot/reboot-hld.md

How to verify it

Verified the script on non-smart switch and didn't find any regressions. Also, script throws errors if any new smart switch related parameters are given by user.
Partially verified on smart switch. Waiting for image with gnmi container running to complete testing.

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)

vvolam mentioned this pull request

Smart Switch reboot high level design sonic-net/SONiC#1699

Merged

vvolam force-pushed the ss-reboot branch 2 times, most recently from 460146c to c72fbc0 Compare

October 3, 2024 19:36

vvolam force-pushed the ss-reboot branch 3 times, most recently from 8746356 to d6fc624 Compare

October 23, 2024 20:33

gpunathilell reviewed

View reviewed changes

scripts/reboot Outdated Show resolved Hide resolved

gpunathilell reviewed

View reviewed changes

scripts/reboot Outdated Show resolved Hide resolved

gpunathilell reviewed

View reviewed changes

scripts/reboot Outdated Show resolved Hide resolved

gpunathilell reviewed

View reviewed changes

scripts/reboot Outdated Show resolved Hide resolved

qiluo-msft mentioned this pull request

Add execute_reboot dbus_interface sonic-net/sonic-host-services#164

Merged

gpunathilell reviewed

View reviewed changes

scripts/reboot Outdated Show resolved Hide resolved

gpunathilell reviewed

View reviewed changes

scripts/reboot_helper.py Outdated Show resolved Hide resolved

gpunathilell reviewed

View reviewed changes

scripts/reboot Outdated Show resolved Hide resolved

gpunathilell reviewed

View reviewed changes

scripts/reboot_helper.py Outdated Show resolved Hide resolved

gpunathilell reviewed

View reviewed changes

scripts/reboot Outdated Show resolved Hide resolved

gpunathilell reviewed

View reviewed changes

scripts/reboot Outdated Show resolved Hide resolved

gpunathilell reviewed

View reviewed changes

scripts/reboot Outdated Show resolved Hide resolved

vvolam force-pushed the ss-reboot branch from b2dcd63 to 8392f10 Compare

November 1, 2024 21:18


          Extend reboot script for rebooting SmartSwitch

1686dbe

vvolam force-pushed the ss-reboot branch from 8392f10 to 1686dbe Compare

November 4, 2024 14:20

vvolam added 3 commits

November 4, 2024 16:50


          Add more coverage

23461b2


          Add more unittests and optimize tests file

cef5de7


          Fix minor indentation

d41bf43

vvolam changed the title ~~Extend reboot script for rebooting SmartSwitch~~ [SmartSwitch] Extend reboot script for rebooting SmartSwitch

vvolam marked this pull request as ready for review

November 4, 2024 19:39

vvolam requested review from oleksandrivantsiv, rameshraghupathy and prgeor

November 5, 2024 13:37

prgeor reviewed

View reviewed changes

scripts/reboot_helper.py Outdated Show resolved Hide resolved


          Increase code coverage

98406c7

gpunathilell reviewed

View reviewed changes

scripts/reboot_smartswitch_helper Outdated Show resolved Hide resolved

gpunathilell reviewed

View reviewed changes

scripts/reboot_smartswitch_helper Outdated Show resolved Hide resolved

gpunathilell reviewed

View reviewed changes

utilities_common/module_base.py Outdated Show resolved Hide resolved

gpunathilell reviewed

View reviewed changes

scripts/reboot_smartswitch_helper Outdated Show resolved Hide resolved

prgeor reviewed

View reviewed changes

scripts/reboot Show resolved Hide resolved

prgeor reviewed

View reviewed changes

scripts/reboot_smartswitch_helper Show resolved Hide resolved

Contributor

gpunathilell commented Nov 27, 2024

For reboot, is it also possible to check the CONFIG_DB entry for the admin state for the DPUs? if the CONFIG_DB entry is missing or set to down, then we do not need to reboot the DPUs at all

vvolam and others added 5 commits

November 27, 2024 17:26


          Update scripts/reboot_smartswitch_helper

a6f771e

Co-authored-by: Gagan Punathil Ellath <[email protected]>


          Update scripts/reboot_smartswitch_helper

a3f8af7

Co-authored-by: Gagan Punathil Ellath <[email protected]>


          Rename module_base.py to module.py

36ecf1b

Instantiate ModuleHelper() before calling its functions


          Committing missed files in previous commit

67e7817


          Define a new try_get_args() which takes arguments as inputs

88af21d

gpunathilell reviewed

View reviewed changes

scripts/reboot_smartswitch_helper Outdated Show resolved Hide resolved

gpunathilell reviewed

View reviewed changes

utilities_common/module.py Outdated Show resolved Hide resolved

gpunathilell reviewed

View reviewed changes

scripts/reboot_smartswitch_helper Outdated Show resolved Hide resolved

Contributor

gpunathilell commented Dec 2, 2024

General question, When we perform reboot -d DPU0 - request reboot for DPU0, do we need to exit after this call in reboot script? handle_smart_switch "$REBOOT_DPU" "$PRE_SHUTDOWN" "$DPU_MODULE_NAME" as we are requesting the reboot of a specific DPU and not requesting the reboot of NPU as well?

vvolam added 3 commits

December 3, 2024 17:38


          Merge remote-tracking branch 'origin/master' into ss-reboot

3551a5a


          Fix some arguments

e4bcc95

Increase code coverage as well.


          Exit the reboot script after completing DPU reboot

edaa0de

Author

vvolam commented Dec 3, 2024

General question, When we perform reboot -d DPU0 - request reboot for DPU0, do we need to exit after this call in reboot script? handle_smart_switch "$REBOOT_DPU" "$PRE_SHUTDOWN" "$DPU_MODULE_NAME" as we are requesting the reboot of a specific DPU and not requesting the reboot of NPU as well?

@gpunathilell, Yes, this is a good catch. we should not proceed with other steps, if only a single DPU reboot is requested. Modified the code. Thank you!

prgeor reviewed

View reviewed changes

utilities_common/module.py Outdated Show resolved Hide resolved

prgeor reviewed

View reviewed changes

utilities_common/chassis.py Outdated Show resolved Hide resolved

prgeor reviewed

View reviewed changes

utilities_common/chassis.py Outdated Show resolved Hide resolved


          Fix long lines

119d83b

- Use SysLogger instead of Logger
- Fix the return type of get_num_dpus() and get_dpu_list()

rameshraghupathy reviewed

View reviewed changes

utilities_common/chassis.py Show resolved Hide resolved


          Merge remote-tracking branch 'origin/master' into ss-reboot

03fd56f

vvolam mentioned this pull request

CLI support for SmartSwitch PMON #3271

Open


          Update unit tests for update function code

75f4c26

Author

vvolam commented Dec 12, 2024

@prgeor please help review and merge, if no other changes needed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

gpunathilell gpunathilell left review comments

prgeor prgeor left review comments

rameshraghupathy rameshraghupathy left review comments

oleksandrivantsiv oleksandrivantsiv left review comments

At least 1 approving review is required to merge this pull request.

Labels

None yet