Added SmartSwitch support in chassisd and enabling chassisd #467

rameshraghupathy · 2024-04-15T03:38:50Z

Added SmartSwitch support in chassisd and enabling chassisd for fixed SmartSwitches

Description

chassisd is enabled only for modular chassis. Smartswitch is a fixed chassis. However it has been treated like a modular chassis to manage the DPU cards just like the line-cards of a modular chassis. chassisd will be enabled only on the smartswitch NPU and hence the scope of these changes are limited only to NPU and not applicable to DPU.

Motivation and Context

chassisd is enabled only for modular chassis. Smartswitch is a fixed chassis. However it has been treated like a modular chassis to manage the DPU cards just like the line-cards of a modular chassis. Hence, chassid is needed for SmartSwitch and enabled here. Also, some of the table updates and clean up are not required for SmartSwitch platform and hence using the is_smartswitch API to selectively enable it. the text "fixes #xxxx", "closes #xxxx" or "resolves #xxxx" here

How Has This Been Tested?

Enabled and built and image and checked if the chassisd is running all the time without crashing
Verify if the config change handler is working as expected by issuing config CLIs to startup and shutdown DPUs

Additional Information (Optional)

sonic-chassisd/scripts/chassisd

SmartSwitches

platform identifier.

temp fix to get the build passing.

sonic-chassisd/scripts/chassisd

oleksandrivantsiv · 2024-06-11T01:57:45Z

What are the states supported by the DPUs in the Smart Switch?

rameshraghupathy · 2024-06-11T02:22:09Z

What are the states supported by the DPUs in the Smart Switch?

”dpu_midplane_link_state”
”dpu_control_plane_state"
"dpu_data_plane_state"

sonic-chassisd/scripts/chassisd

accidental removal of a few lines from the original chassisd file

sonic-chassisd/tests/test_chassisd.py

oleksandrivantsiv · 2024-07-16T21:08:27Z

sonic-chassisd/scripts/chassisd

@@ -184,7 +188,7 @@ class ModuleUpdater(logger.Logger):
        self.chassis = chassis


I think that instead of modifying the existing ModuleUpdater class, we should implement SmartSwitchModuleUpdater(ModuleUpdater). SmartSwitchModuleUpdater should be derived from ModuleUpdater and overwrite the methods that should behave differently for the Smart Switch. This approach allows us to keep the original implementation untouched and guarantees full backward compatibility with the chassisd.

Will consider this.

Implemented this change.

@oleksandrivantsiv

sonic-chassisd/tests/test_chassisd.py

oleksandrivantsiv

as commented

rameshraghupathy · 2024-10-02T21:22:43Z

@rameshraghupathy can we add monitoring of the DPU midplane in Chassisd?

This is already part of chassisd -> check_midplane_reachability
@prgeor

rameshraghupathy · 2024-10-02T21:24:03Z

@rameshraghupathy can you point to the Yang model change for admin_status for DPU in config DB table? https://github.com/sonic-net/sonic-buildimage/blob/master/src/sonic-yang-models/yang-models/sonic-chassis-module.yang#L23 needs update for DPU

I have created a PR sonic-net/sonic-buildimage#20445 for this and working on it.
@prgeor

rameshraghupathy · 2024-10-02T21:28:51Z

@rameshraghupathy Please specify in the PR description if this chassisd changes is limited to NPU or DPU or both

Done
@prgeor

prgeor · 2024-10-08T14:14:40Z

sonic-chassisd/scripts/chassisd


        # Start configuration manager task on supervisor module
-        if self.module_updater.supervisor_slot == self.module_updater.my_slot:
+        if self.smartswitch:


@rameshraghupathy comment above is incorrect

@prgeor Fixed

prgeor · 2024-10-08T14:20:17Z

sonic-chassisd/scripts/chassisd

+
+            (key, op, fvp) = sst.pop()
+
+            if op == 'SET':


@rameshraghupathy SET operation can set ADMIN down or UP. please parse the key to know if the user is setting admin UP/DOWN

@rameshraghupathy SET operation can set ADMIN down or UP. please parse the key to know if the user is setting admin UP/DOWN

@prgeor Good question. The original behavior is: The default is no config - meaning admin up when the user wants to shutdown a module adds a config "admins_status: down". So, the SET operation has been used for "admins_status: down" and DEL has been used for setting the module up. If you want we can change this for Smartswitch. Please let me know.

prgeor · 2024-10-08T14:21:27Z

sonic-chassisd/scripts/chassisd

+
+            if op == 'SET':
+                admin_state = MODULE_ADMIN_DOWN
+            elif op == 'DEL':


@rameshraghupathy on DEL of the admin state why do module ADMIN UP?

@rameshraghupathy on DEL of the admin state why do module ADMIN UP?

@prgeor The original behavior is: The default is no config - meaning admin up when the user wants to shutdown a module adds a config "admins_status: down". So, the SET operation has been used for "admins_status: down" and DEL has been used for setting the module up. If you want we can change this for Smartswitch. Please let me know.

vvolam · 2024-10-09T20:31:39Z

sonic-chassisd/scripts/chassisd

@@ -73,6 +73,7 @@ CHASSIS_MODULE_REBOOT_INFO_TABLE = 'CHASSIS_MODULE_REBOOT_INFO_TABLE'
 CHASSIS_MODULE_REBOOT_TIMESTAMP_FIELD = 'timestamp'
 CHASSIS_MODULE_REBOOT_REBOOT_FIELD = 'reboot'
 DEFAULT_LINECARD_REBOOT_TIMEOUT = 180
+DEFAULT_DPU_REBOOT_TIMEOUT = 180


Is 180 secs sufficient for entire DPU reboot time?

Also, should we add this to platform.json as vendor configurable timeout?

vvolam · 2024-10-09T20:46:15Z

sonic-chassisd/scripts/chassisd

+        :return:
+        """
+
+    def module_config_update(self, key, admin_state):


@rameshraghupathy could you please add a quick summary of function here and also remaining functions for future clarity?

oleksandrivantsiv suggested changes Apr 25, 2024

View reviewed changes

sonic-chassisd/scripts/chassisd Show resolved Hide resolved

oleksandrivantsiv reviewed Apr 26, 2024

View reviewed changes

sonic-chassisd/scripts/chassisd Outdated Show resolved Hide resolved

Added SmartSwitch support in chassisd and enabling chassisd for fixed

0785bb1

SmartSwitches

rameshraghupathy force-pushed the master branch from d5ed9fc to 0785bb1 Compare April 26, 2024 22:03

rameshraghupathy added 2 commits April 28, 2024 13:28

Made temp fix to avoid chassisd tests passing. Need to handle it using

c4725c4

platform identifier.

The test_chassisd needs to updated for smartswitch. The change is a

d1a6b2a

temp fix to get the build passing.

rameshraghupathy mentioned this pull request Apr 29, 2024

PMON High Level Design for SmartSwitch (Replaces the PR #1538) sonic-net/SONiC#1584

Merged

rameshraghupathy added 4 commits May 31, 2024 12:09

Addressing review comments

af4ff55

Merge remote-tracking branch 'upstream/master'

356fa8b

Fixed the merge conflict breakage in "asic_table"

97b6518

checking test_chassisd.py is ok

60cb8ed

rameshraghupathy force-pushed the master branch from 4f9d602 to 60cb8ed Compare June 5, 2024 20:00

rameshraghupathy added 3 commits June 5, 2024 13:13

Trying to resolve test failure

cd6db9b

Using is_smartswitch in MockChassis

8e958ba

Disabling the test until the dependency is committed

fb7b4ac

oleksandrivantsiv reviewed Jun 11, 2024

View reviewed changes

sonic-chassisd/scripts/chassisd Outdated Show resolved Hide resolved

oleksandrivantsiv reviewed Jun 11, 2024

View reviewed changes

sonic-chassisd/scripts/chassisd Outdated Show resolved Hide resolved

oleksandrivantsiv reviewed Jun 11, 2024

View reviewed changes

sonic-chassisd/scripts/chassisd Outdated Show resolved Hide resolved

Addressing review comments

312129f

vvolam reviewed Jun 19, 2024

View reviewed changes

sonic-chassisd/scripts/chassisd Outdated Show resolved Hide resolved

sonic-chassisd/scripts/chassisd Outdated Show resolved Hide resolved

Addressed review comments: 1. removed SWITCH module 2. Restored

ce3bc30

accidental removal of a few lines from the original chassisd file

oleksandrivantsiv reviewed Jul 16, 2024

View reviewed changes

sonic-chassisd/tests/test_chassisd.py Outdated Show resolved Hide resolved

oleksandrivantsiv reviewed Jul 16, 2024

View reviewed changes

sonic-chassisd/tests/test_chassisd.py Outdated Show resolved Hide resolved

oleksandrivantsiv reviewed Jul 16, 2024

View reviewed changes

sonic-chassisd/tests/test_chassisd.py Outdated Show resolved Hide resolved

oleksandrivantsiv suggested changes Jul 16, 2024

View reviewed changes

rameshraghupathy added 2 commits August 5, 2024 15:58

As per one of the review comments created derived class for SmartSwitch

ca1fe7c

Uncommented the previously commented blocks in test_chassisd

b2ac82c

rameshraghupathy added 21 commits October 1, 2024 15:54

Fixed a typo

f62d54c

Fixing sytax issues

001a985

Adding a test to improve coverage

fa7fa71

Assigned localy module_updater to daemon.module_updater

c92d234

Fixed a syntax error

9554bb3

Resolving syntax errors

6ef579e

Fixing test issues

482d9c8

Fixing test failure

84c6812

Debugging

b31be6f

Debugging

dd91702

Debugging

c7d02f6

Debugging

52a5007

trying 2 tests

598220b

Debugging

6e90f3b

Debugging

2fbcd37

Trying to improve coverage

007d1a8

Debugging test

cb90f02

Fixed a typo

9a74992

fixed a test failure

1342d19

debugging test

9eeda1d

mocking get_module

9e25701

Removed CHASSIS_MODULE_INFO_ASICS for smartswitch

6e29e88

prgeor reviewed Oct 8, 2024

View reviewed changes

vvolam reviewed Oct 9, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added SmartSwitch support in chassisd and enabling chassisd #467

Added SmartSwitch support in chassisd and enabling chassisd #467

rameshraghupathy commented Apr 15, 2024 •

edited

Loading

oleksandrivantsiv commented Jun 11, 2024

rameshraghupathy commented Jun 11, 2024

oleksandrivantsiv Jul 16, 2024

rameshraghupathy Jul 19, 2024 •

edited

Loading

rameshraghupathy Aug 5, 2024

rameshraghupathy Sep 3, 2024

oleksandrivantsiv left a comment

rameshraghupathy commented Oct 2, 2024 •

edited

Loading

rameshraghupathy commented Oct 2, 2024 •

edited

Loading

rameshraghupathy commented Oct 2, 2024

prgeor Oct 8, 2024

rameshraghupathy Oct 8, 2024

prgeor Oct 8, 2024

rameshraghupathy Oct 9, 2024

prgeor Oct 8, 2024

rameshraghupathy Oct 9, 2024

vvolam Oct 9, 2024

vvolam Oct 9, 2024

vvolam Oct 9, 2024

		@@ -184,7 +188,7 @@ class ModuleUpdater(logger.Logger):
		self.chassis = chassis

Added SmartSwitch support in chassisd and enabling chassisd #467

Are you sure you want to change the base?

Added SmartSwitch support in chassisd and enabling chassisd #467

Conversation

rameshraghupathy commented Apr 15, 2024 • edited Loading

Description

Motivation and Context

How Has This Been Tested?

Additional Information (Optional)

oleksandrivantsiv commented Jun 11, 2024

rameshraghupathy commented Jun 11, 2024

Choose a reason for hiding this comment

rameshraghupathy Jul 19, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oleksandrivantsiv left a comment

Choose a reason for hiding this comment

rameshraghupathy commented Oct 2, 2024 • edited Loading

rameshraghupathy commented Oct 2, 2024 • edited Loading

rameshraghupathy commented Oct 2, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rameshraghupathy commented Apr 15, 2024 •

edited

Loading

rameshraghupathy Jul 19, 2024 •

edited

Loading

rameshraghupathy commented Oct 2, 2024 •

edited

Loading

rameshraghupathy commented Oct 2, 2024 •

edited

Loading