cisco platform-specific timeout update #16762

nnelluri-cisco · 2025-02-03T03:35:26Z

Description of PR

New cisco platform x86_64-8102_28fh_dpu_o-r0' reboot timeout fix.

Summary: New cisco platform x86_64-8102_28fh_dpu_o-r0' reboot timeout fix.
Fixes # (issue)

Type of change

Bug fix
Testbed and Framework(new/improvement)
New Test case
- Skipped for non-supported platforms
[ X] Test case improvement

Back port request

202012
202205
202305
202311
[X ] 202405
[ X] 202411

Approach

added new code under b/tests/common/reboot.py , the code only will execute for cisco platform x86_64-8102_28fh_dpu_o-r0.

What is the motivation for this PR?

Need reboot fix to execute sonic-mgmt runs on new cisco platform "x86_64-8102_28fh_dpu_o-r0"

How did you do it?

added new code under b/tests/common/reboot.py

How did you verify/test it?

verified using below reboot test case and sure new new code got executed.
test_pretest.py::test_features_state

Any platform specific information?

cisco platform "x86_64-8102_28fh_dpu_o-r0"

Supported testbed topology if it's a new test case?

t1-28-lag

Documentation

verification Logs:
========================================================================================= warnings summary ==========================================================================================
../../usr/local/lib/python3.8/dist-packages/paramiko/transport.py:236
/usr/local/lib/python3.8/dist-packages/paramiko/transport.py:236: CryptographyDeprecationWarning: Blowfish has been deprecated
"class": algorithms.Blowfish,

-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
------------------------------------------------- generated xml file: /run_logs/sample/test_pretest.py::test_features_state_2025-02-03-04-25-24.xml -------------------------------------------------
INFO:root:Can not get Allure report URL. Please check logs
-------------------------------------------------------------------------------------- live log sessionfinish ---------------------------------------------------------------------------------------
05:09:54 init.pytest_terminal_summary L0067 INFO | Can not get Allure report URL. Please check logs
============================================================================= 1 passed, 1 warning in 2668.22s (0:44:28) =============================================================================
root@sonic-ucs-m6-15:/data/tests#

mssonicbld · 2025-02-03T03:35:28Z

/azp run

azure-pipelines · 2025-02-03T03:35:39Z

Azure Pipelines successfully started running 1 pipeline(s).

nnelluri-cisco · 2025-02-03T05:18:38Z

Notify
@prabhataravind and @vvolam

vvolam · 2025-02-03T15:16:14Z

tests/common/reboot.py

@@ -245,6 +245,14 @@ def reboot(duthost, localhost, reboot_type='cold', delay=10,
    """
    pool = ThreadPool()
    hostname = duthost.hostname
+    # This is how you get platform info from the DUT


@nnelluri-cisco Could you move these new changes to a function? We could add all platform specific changes into that function and call here. Otherwise, looks good to me.

@vvolam
added platform specific changes to new function "smartswitch_update_reboot_timeout".

vvolam · 2025-02-03T15:16:45Z

Why not 202411?

mssonicbld · 2025-02-03T18:25:21Z

/azp run

azure-pipelines · 2025-02-03T18:25:35Z

Azure Pipelines successfully started running 1 pipeline(s).

nnelluri-cisco · 2025-02-03T18:31:00Z

Why not 202411?

added back port request to 202411.

vvolam

Small comments, otherwise, looks good to me.

@oleksandrivantsiv @gpunathilell for viz.

vvolam · 2025-02-03T18:56:03Z

tests/common/reboot.py

@@ -576,3 +574,13 @@ def collect_mgmt_config_by_console(duthost, localhost):
        logger.info('End: collect mgmt config by  console  ...')
    else:
        logger.warning("dut console is not ready, we can get mgmt config by console")
+
+def smartswitch_update_reboot_timeout(duthost):
+


Please add a summary to the function here.

added summary to the function

vvolam · 2025-02-03T18:56:23Z

tests/common/reboot.py

@@ -38,6 +38,9 @@
 REBOOT_TYPE_KERNEL_PANIC = "Kernel Panic"
 REBOOT_TYPE_SUPERVISOR = "Reboot from Supervisor"
 REBOOT_TYPE_SUPERVISOR_HEARTBEAT_LOSS = "Heartbeat with the Supervisor card lost"
+SMARTSWITCH_REBOOT_TIMEOUT = 700


Add a comment before these timeouts.

added comment for the timeouts.

It might not be a satisfactory solution to modify a generic function to handle the timeout for smartswitch. Can we do that in a more generic way, like updating the reboot_ctrl_dict?

Had an offline sync with Bing. There are some concerns in making this platform-specific change in reboot function. @nnelluri-cisco, @rameshraghupathy Let's instead try to do this via plt_reboot_dict which is processed by reboot function using get_plt_reboot_ctrl().

vvolam · 2025-02-03T18:57:03Z

tests/common/reboot.py

-        for reboot_type in reboot_ctrl_dict:
-            reboot_ctrl_dict[reboot_type]["timeout"] = 700
-            reboot_ctrl_dict[reboot_type]["wait"] = 300
+    #smartswicth specific reboot and waittime update 


small nit: "wait time" instead of "waittime"

also typo for smartswitch.

addressed type changes as per comment.

prabhataravind · 2025-02-03T19:01:06Z

tests/common/reboot.py

+    if platform == 'x86_64-8102_28fh_dpu_o-r0':
+        for reboot_type in reboot_ctrl_dict:
+            reboot_ctrl_dict[reboot_type]["timeout"] = SMARTSWITCH_REBOOT_TIMEOUT
+	    reboot_ctrl_dict[reboot_type]["wait"] = SMARTSWITCH_REBOT_WAIT


Fix nit SMARTSWITCH_REBOT_WAIT

changed SMARTSWITCH_REBOT_WAIT to SMARTSWITCH_REBO0T_WAIT

mssonicbld · 2025-02-03T19:18:34Z

/azp run

azure-pipelines · 2025-02-03T19:18:47Z

Azure Pipelines successfully started running 1 pipeline(s).

vvolam · 2025-02-03T19:59:03Z

tests/common/reboot.py

+    if platform == 'x86_64-8102_28fh_dpu_o-r0':
+        for reboot_type in reboot_ctrl_dict:
+            reboot_ctrl_dict[reboot_type]["timeout"] = SMARTSWITCH_REBOOT_TIMEOUT
+	    reboot_ctrl_dict[reboot_type]["wait"] = SMARTSWITCH_REBO0T_WAIT


SMARTSWITCH_REBOOT_WAIT is having one zero instead of "O"

corrected the REBOOT typo

vvolam · 2025-02-03T19:59:28Z

tests/common/reboot.py

@@ -38,6 +38,9 @@
 REBOOT_TYPE_KERNEL_PANIC = "Kernel Panic"
 REBOOT_TYPE_SUPERVISOR = "Reboot from Supervisor"
 REBOOT_TYPE_SUPERVISOR_HEARTBEAT_LOSS = "Heartbeat with the Supervisor card lost"
+SMARTSWITCH_REBOOT_TIMEOUT = 700
+SMARTSWITCH_REBO0T_WAIT = 300


SMARTSWITCH_REBOOT_WAIT is having one zero instead of "O"

corrected the REBOOT typo

mssonicbld · 2025-02-03T20:20:55Z

/azp run

azure-pipelines · 2025-02-03T20:21:07Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-02-03T20:26:34Z

/azp run

azure-pipelines · 2025-02-03T20:26:47Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-02-03T20:37:30Z

/azp run

azure-pipelines · 2025-02-03T20:37:42Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-02-03T21:02:55Z

/azp run

azure-pipelines · 2025-02-03T21:03:07Z

Azure Pipelines successfully started running 1 pipeline(s).

vvolam

LGTM.

prabhataravind

lgtm

nnelluri-cisco · 2025-03-06T01:54:48Z

@bingwang-ms
could you please review and merge this PR

prabhataravind · 2025-03-14T22:01:20Z

/azpw run Azure.sonic-mgmt

prabhataravind · 2025-03-14T22:16:29Z

@nnelluri-cisco please update your branch from master.

azure-pipelines · 2025-03-18T00:26:49Z

Commenter does not have sufficient privileges for PR 16762 in repo sonic-net/sonic-mgmt

mssonicbld · 2025-03-18T04:56:07Z

/azp run

azure-pipelines · 2025-03-18T04:56:18Z

Azure Pipelines successfully started running 1 pipeline(s).

nnelluri-cisco · 2025-03-18T15:40:02Z

@mssonicbld and @prabhataravind
I rebased with upstream , can you please merge this PR.

prabhataravind · 2025-03-18T21:21:11Z

@mssonicbld and @prabhataravind I rebased with upstream , can you please merge this PR.

@nnelluri-cisco there are still some PR checks failing...I just restarted the tests.

mssonicbld · 2025-03-19T21:50:19Z

/azp run

azure-pipelines · 2025-03-19T21:50:31Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-03-23T05:48:52Z

/azp run

azure-pipelines · 2025-03-23T05:49:03Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-03-26T16:28:47Z

/azp run

azure-pipelines · 2025-03-26T16:29:01Z

Azure Pipelines successfully started running 1 pipeline(s).

nnelluri-cisco · 2025-03-31T18:25:37Z

/azp run

azure-pipelines · 2025-03-31T18:25:43Z

Commenter does not have sufficient privileges for PR 16762 in repo sonic-net/sonic-mgmt

mssonicbld · 2025-03-31T20:17:03Z

/azp run

azure-pipelines · 2025-03-31T20:17:15Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-03-31T22:40:26Z

/azp run

azure-pipelines · 2025-03-31T22:40:37Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-03-31T22:46:54Z

/azp run

azure-pipelines · 2025-03-31T22:47:05Z

Azure Pipelines successfully started running 1 pipeline(s).

prabhataravind · 2025-04-01T02:07:57Z

@bingwang-ms could you please help merge this change?

vvolam reviewed Feb 3, 2025

View reviewed changes

prabhataravind reviewed Feb 3, 2025

View reviewed changes

vvolam reviewed Feb 3, 2025

View reviewed changes

vvolam approved these changes Feb 3, 2025

View reviewed changes

prabhataravind approved these changes Feb 24, 2025

View reviewed changes

prabhataravind added Request for 202405 branch Request for 202411 branch labels Mar 14, 2025

nnelluri-cisco requested a review from StormLiangMS as a code owner March 15, 2025 00:43

nnelluri-cisco force-pushed the reboot_timeout_fix branch from 5277526 to 979032a Compare March 31, 2025 22:40

nnelluri-cisco added 8 commits March 31, 2025 15:45

cisco platform-specific timeout update

bd3706c

added new changes to a function as per review comments

bb3bc7e

fixed type changes in newly added code

2360eeb

fixing the typo from REBO0T to REBOOT

a739e95

inconsistent use of tabs and spaces in indentation

28a055d

inconsistent use of tabs and spaces in indentation

c088409

Added a comment before timeouts and summary to the function

016ca9e

fixed pre-commit errors

3e74111

nnelluri-cisco force-pushed the reboot_timeout_fix branch from 979032a to 3e74111 Compare March 31, 2025 22:46

cisco platform-specific timeout update #16762

Are you sure you want to change the base?

cisco platform-specific timeout update #16762

Uh oh!

Conversation

nnelluri-cisco commented Feb 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of PR

Type of change

Back port request

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

Uh oh!

mssonicbld commented Feb 3, 2025

Uh oh!

azure-pipelines bot commented Feb 3, 2025

Uh oh!

nnelluri-cisco commented Feb 3, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vvolam commented Feb 3, 2025

Uh oh!

mssonicbld commented Feb 3, 2025

Uh oh!

azure-pipelines bot commented Feb 3, 2025

Uh oh!

nnelluri-cisco commented Feb 3, 2025

Uh oh!

vvolam left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mssonicbld commented Feb 3, 2025

Uh oh!

azure-pipelines bot commented Feb 3, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mssonicbld commented Feb 3, 2025

Uh oh!

azure-pipelines bot commented Feb 3, 2025

Uh oh!

mssonicbld commented Feb 3, 2025

Uh oh!

azure-pipelines bot commented Feb 3, 2025

nnelluri-cisco commented Feb 3, 2025 •

edited

Loading

prabhataravind commented Mar 14, 2025 •

edited

Loading

nnelluri-cisco commented Mar 18, 2025 •

edited

Loading