gNOI Warm Reboot - Added tests #20801

rkavitha-hcl · 2024-11-14T11:16:46Z

Why I did it

Work item tracking

Microsoft ADO (number only):

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Tested branch (Please provide the tested image version)

Description for the changelog

Added test cases for warm reboot.

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

src/sonic-framework/tests/reboot_thread_test.cpp

src/sonic-framework/tests/rebootbe_test.cpp

src/sonic-framework/tests/test_utils_common.cpp

kishanps · 2024-12-06T01:53:54Z

@github76543 Joh, can you PTAL and signoff.

mssonicbld · 2024-12-13T11:26:41Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2024-12-13T11:26:48Z

Pull request contains merge conflicts.

mssonicbld · 2024-12-13T11:43:52Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2024-12-13T11:43:59Z

Pull request contains merge conflicts.

mssonicbld · 2024-12-13T12:23:38Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-01-06T12:26:19Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-01-27T10:37:03Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-01-27T10:37:09Z

Pull request contains merge conflicts.

mssonicbld · 2025-01-27T12:35:18Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-01-27T12:35:24Z

Pull request contains merge conflicts.

rkavitha-hcl · 2025-01-30T16:24:56Z

Test results:

~/reboot_feature/sonic-buildimage/src/sonic-framework/tests$ ./tests
[==========] Running 41 tests from 4 test suites.
[----------] Global test environment set-up.
[----------] 2 tests from RebootBETest
[ RUN      ] RebootBETest.WarmbootInProgressBlocksNewWarmboot
NOTICE:- Start: --- Starting rebootbackend ---
.
.
.
[       OK ] TestWithStartupWarmbootEnabledState/RebootBEAutoStartTest.TestWarmFailureFollowedByColdBoot/1 (5103 ms)
[----------] 26 tests from TestWithStartupWarmbootEnabledState/RebootBEAutoStartTest (63060 ms total)

[----------] Global test environment tear-down
[==========] 41 tests from 4 test suites ran. (68474 ms total)
[  PASSED  ] 41 tests.

~/reboot_feature/sonic-buildimage/src/sonic-framework/tests$ ./tests_asan 
[==========] Running 41 tests from 4 test suites.
[----------] Global test environment set-up.
[----------] 2 tests from RebootBETest
[ RUN      ] RebootBETest.WarmbootInProgressBlocksNewWarmboot
.
.
.
[       OK ] TestWithStartupWarmbootEnabledState/RebootBEAutoStartTest.TestWarmFailureFollowedByColdBoot/1 (5105 ms)
[----------] 26 tests from TestWithStartupWarmbootEnabledState/RebootBEAutoStartTest (63103 ms total)

[----------] Global test environment tear-down
[==========] 41 tests from 4 test suites ran. (68527 ms total)
[  PASSED  ] 41 tests.

~/reboot_feature/sonic-buildimage/src/sonic-framework/tests$ ./tests_tsan 
[==========] Running 41 tests from 4 test suites.
[----------] Global test environment set-up.
[----------] 2 tests from RebootBETest
[ RUN      ] RebootBETest.WarmbootInProgressBlocksNewWarmboot
NOTICE:- Start: --- Starting rebootbackend ---
.
.
.
[       OK ] TestWithStartupWarmbootEnabledState/RebootBEAutoStartTest.TestWarmFailureFollowedByColdBoot/1 (5105 ms)
[----------] 26 tests from TestWithStartupWarmbootEnabledState/RebootBEAutoStartTest (63119 ms total)

[----------] Global test environment tear-down
[==========] 41 tests from 4 test suites ran. (68746 ms total)
[  PASSED  ] 41 tests.

~/reboot_feature/sonic-buildimage/src/sonic-framework/tests$ ./tests_usan 
[==========] Running 41 tests from 4 test suites.
[----------] Global test environment set-up.
[----------] 2 tests from RebootBETest
[ RUN      ] RebootBETest.WarmbootInProgressBlocksNewWarmboot
.
.
.
[       OK ] TestWithStartupWarmbootEnabledState/RebootBEAutoStartTest.TestWarmFailureFollowedByColdBoot/1 (5103 ms)
[----------] 26 tests from TestWithStartupWarmbootEnabledState/RebootBEAutoStartTest (63062 ms total)

[----------] Global test environment tear-down
[==========] 41 tests from 4 test suites ran. (68473 ms total)
[  PASSED  ] 41 tests.

mssonicbld · 2025-02-12T13:54:43Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2025-02-12T13:54:55Z

Azure Pipelines successfully started running 1 pipeline(s).

qiluo-msft · 2025-02-18T21:23:08Z

dockers/docker-framework/start.sh

+#!/usr/bin/env bash
+
+
+mkdir -p /var/sonic


mkdir

The directory and file is static. Do you want to create them during build Dockerfile?

qiluo-msft · 2025-02-18T21:23:53Z

files/build/versions/dockers/docker-framework/versions-deb-bookworm

+libperl5.32==5.32.1-4+deb11u3
+libpgm-5.3-0==5.3.128~dfsg-2
+libprocps8==2:3.3.17-5
+libprotobuf-dev==3.21.12-3


libprotobuf-dev

Do you really need a -dev package inside this container?

qiluo-msft · 2025-02-18T21:30:19Z

files/build_templates/init_cfg.json.j2

@@ -63,6 +63,7 @@
    },
 {%- set features = [("bgp", "{% if not DEVICE_RUNTIME_METADATA['ETHERNET_PORTS_PRESENT'] or ('CHASSIS_METADATA' in DEVICE_RUNTIME_METADATA and DEVICE_RUNTIME_METADATA['CHASSIS_METADATA']['module_type'] in ['supervisor']) %}disabled{% else %}enabled{% endif %}", false, "enabled"),
                   ("database", "always_enabled", false, "always_enabled"),
+                   ("framework", "enabled", false, "enabled"),


false

We now rely on /etc/sonic/config_db.json to provide golden config, and minimize hard-coded config inside /etc/sonic/init_cfg.json. Is it possible not to change this file?

@wen587 to review.

qiluo-msft · 2025-02-18T23:28:36Z

platform/vs/docker-sonic-vs/start.sh

@@ -180,6 +180,8 @@ supervisorctl start tunnelmgrd

 supervisorctl start fabricmgrd

+supervisorctl start rebootbackend


rebootbackend

I could not find any code relating this program. And the name is weird.

qiluo-msft · 2025-02-18T23:32:38Z

.gitmodules

+[submodule "src/sonic-framework/gnoi"]
+	path = src/sonic-framework/gnoi
+	url = https://github.com/openconfig/gnoi


url = https://github.com/openconfig/gnoi

@hdwhdw to review this new dependency

I don't have an issue with this for now. But this creates a potential issue of the gnoi used by sonic-framework go out of sync with the gnoi used by sonic-gnmi. There isn't a good short-term solution, but we should have some issue tracking it and eventually use the same gnoi across sonic, especially given it is not so easy to update this dependency in sonic-gnmi.

hdwhdw · 2025-02-18T23:47:11Z

.gitmodules

+[submodule "src/sonic-framework/gnoi"]
+	path = src/sonic-framework/gnoi
+	url = https://github.com/openconfig/gnoi


I don't have an issue with this for now. But this creates a potential issue of the gnoi used by sonic-framework go out of sync with the gnoi used by sonic-gnmi. There isn't a good short-term solution, but we should have some issue tracking it and eventually use the same gnoi across sonic, especially given it is not so easy to update this dependency in sonic-gnmi.

src/sonic-framework/rebootbackend/interfaces.cpp

hdwhdw · 2025-02-18T23:53:11Z

src/sonic-framework/rebootbackend/interfaces.h

+/* Reboot is a request to the reboot sonic host service to request a reboot
+from the platform. This takes as an argument a string based json formatted
+Reboot request from
+system.proto.’https://github.com/openconfig/gnoi/blob/73a1e7675c5f963e7810bd3828203f2758eb47e8/system/system.proto#L107


The link can easily go stale, suggest simply using https://github.com/openconfig/gnoi/blob/main/system/system.proto

src/sonic-framework/rebootbackend/interfaces.h

src/sonic-framework/rebootbackend/reboot_thread.cpp

qiluo-msft · 2025-02-18T23:56:20Z

rules/framework.mk

@@ -0,0 +1,19 @@
+# framework package
+
+FRAMEWORK = framework_1.0.0_$(CONFIGURED_ARCH).deb


framework

framework is a confusing name, according to HLD, you want to name it as 'WarmbootManager' ?

qiluo-msft · 2025-02-18T23:58:15Z

src/sonic-framework/tests/Makefile.am

+                test_main.cpp
+
+tests_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_COVERAGE) $(CFLAGS_SAI)
+tests_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_COVERAGE) $(CFLAGS_SAI)


COVERAGE

Could you share the coverage data? even better, you can refine build pipeline to expose the coverage data.

rkavitha-hcl requested review from qiluo-msft, xumia and lguohan as code owners November 14, 2024 11:16

rkavitha-hcl force-pushed the gnoi_wr_PR2 branch 2 times, most recently from b5f6845 to 9dd208a Compare November 15, 2024 12:49

rkavitha-hcl force-pushed the gnoi_wr_PR2 branch 3 times, most recently from 165ac73 to 2bfdab7 Compare November 26, 2024 11:22

kishanps reviewed Nov 27, 2024

View reviewed changes

rkavitha-hcl force-pushed the gnoi_wr_PR2 branch 6 times, most recently from 4194e72 to c3b6888 Compare December 4, 2024 07:39

rkavitha-hcl force-pushed the gnoi_wr_PR2 branch 2 times, most recently from c11590c to ad96646 Compare December 5, 2024 10:44

rkavitha-hcl force-pushed the gnoi_wr_PR2 branch 3 times, most recently from 26e2ea9 to 4b6bfbb Compare December 12, 2024 07:04

rkavitha-hcl mentioned this pull request Dec 13, 2024

Warmboot Manager HLD for warm reboot improvement sonic-net/SONiC#1485

Merged

rkavitha-hcl force-pushed the gnoi_wr_PR2 branch from 4b6bfbb to 2c1d1b3 Compare December 13, 2024 11:26

rkavitha-hcl force-pushed the gnoi_wr_PR2 branch from 2c1d1b3 to b304ab0 Compare December 13, 2024 11:43

rkavitha-hcl force-pushed the gnoi_wr_PR2 branch from b304ab0 to ff82c8b Compare December 13, 2024 12:03

GNOI Cold Reboot

9179ab0

rkavitha-hcl force-pushed the gnoi_wr_PR2 branch 2 times, most recently from 0918d69 to b7f84ed Compare January 27, 2025 10:37

rkavitha-hcl added 6 commits January 27, 2025 11:54

Integrated Rebootbackend changes

7c5edad

gNOI Cold Reboot - Integrated tests

50996eb

gNOI Cold Reboot - Integrated gNOI repository

326aae1

gNOI Cold Reboot - Integrated Docker and Makefile changes

1a2db82

gNOI Warm Reboot - rebootbackend changes

3580ea1

gNOI Warm Reboot - Added tests

b5294f6

rkavitha-hcl force-pushed the gnoi_wr_PR2 branch from b7f84ed to b5294f6 Compare January 27, 2025 12:26

hdwhdw mentioned this pull request Jan 31, 2025

Add testcases for Reboot sonic-net/sonic-mgmt#16576

Draft

11 tasks

Merge branch 'master' into gnoi_wr_PR2

52fe2c8

qiluo-msft reviewed Feb 18, 2025

View reviewed changes

qiluo-msft requested a review from wen587 February 18, 2025 21:26

qiluo-msft reviewed Feb 18, 2025

View reviewed changes

qiluo-msft requested a review from hdwhdw February 18, 2025 23:32

qiluo-msft reviewed Feb 18, 2025

View reviewed changes

hdwhdw reviewed Feb 18, 2025

View reviewed changes

qiluo-msft reviewed Feb 18, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gNOI Warm Reboot - Added tests #20801

gNOI Warm Reboot - Added tests #20801

rkavitha-hcl commented Nov 14, 2024 •

edited

Loading

kishanps commented Dec 6, 2024

mssonicbld commented Dec 13, 2024

azure-pipelines bot commented Dec 13, 2024

mssonicbld commented Dec 13, 2024

azure-pipelines bot commented Dec 13, 2024

mssonicbld commented Dec 13, 2024

azure-pipelines bot commented Jan 6, 2025

mssonicbld commented Jan 27, 2025

azure-pipelines bot commented Jan 27, 2025

mssonicbld commented Jan 27, 2025

azure-pipelines bot commented Jan 27, 2025

rkavitha-hcl commented Jan 30, 2025

mssonicbld commented Feb 12, 2025

azure-pipelines bot commented Feb 12, 2025

qiluo-msft Feb 18, 2025

qiluo-msft Feb 18, 2025

qiluo-msft Feb 18, 2025

qiluo-msft Feb 18, 2025

qiluo-msft Feb 18, 2025

hdwhdw Feb 18, 2025

hdwhdw Feb 18, 2025

hdwhdw Feb 18, 2025

qiluo-msft Feb 18, 2025

qiluo-msft Feb 18, 2025

		@@ -180,6 +180,8 @@ supervisorctl start tunnelmgrd

		supervisorctl start fabricmgrd

		supervisorctl start rebootbackend

		@@ -0,0 +1,19 @@
		# framework package

		FRAMEWORK = framework_1.0.0_$(CONFIGURED_ARCH).deb

gNOI Warm Reboot - Added tests #20801

Are you sure you want to change the base?

gNOI Warm Reboot - Added tests #20801

Conversation

rkavitha-hcl commented Nov 14, 2024 • edited Loading

Why I did it

Work item tracking

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

kishanps commented Dec 6, 2024

mssonicbld commented Dec 13, 2024

azure-pipelines bot commented Dec 13, 2024

mssonicbld commented Dec 13, 2024

azure-pipelines bot commented Dec 13, 2024

mssonicbld commented Dec 13, 2024

azure-pipelines bot commented Jan 6, 2025

mssonicbld commented Jan 27, 2025

azure-pipelines bot commented Jan 27, 2025

mssonicbld commented Jan 27, 2025

azure-pipelines bot commented Jan 27, 2025

rkavitha-hcl commented Jan 30, 2025

mssonicbld commented Feb 12, 2025

azure-pipelines bot commented Feb 12, 2025

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

Choose a reason for hiding this comment

rkavitha-hcl commented Nov 14, 2024 •

edited

Loading