From c2a7dd1e19b121fa6d9571a16e16cabee7ab500e Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 11 Aug 2023 04:35:30 +0800 Subject: [PATCH] add service_mgmt (#15927) (#16070) Adding yang model for CONFIG_DB table MUX_LINKMGR|SERVICE_MGMT. sign-off: Jing Zhang zhangjing@microsoft.com Co-authored-by: Jing Zhang --- src/sonic-yang-models/doc/Configuration.md | 3 +++ .../tests/files/sample_config_db.json | 3 +++ .../tests/yang_model_tests/tests/mux-linkmgr.json | 3 +++ .../yang_model_tests/tests_config/mux-linkmgr.json | 10 ++++++++++ .../yang-models/sonic-mux-linkmgr.yang | 14 ++++++++++++++ 5 files changed, 33 insertions(+) diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md index 48bf4b543e..bd29c94fc5 100644 --- a/src/sonic-yang-models/doc/Configuration.md +++ b/src/sonic-yang-models/doc/Configuration.md @@ -1167,6 +1167,9 @@ The **MUX_LINKMGR** table is used for dualtor device configuration. }, "MUXLOGGER": { "log_verbosity": "debug" + }, + "SERVICE_MGMT": { + "kill_radv": "True" } } } diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json index b4a7735c56..25028b429c 100644 --- a/src/sonic-yang-models/tests/files/sample_config_db.json +++ b/src/sonic-yang-models/tests/files/sample_config_db.json @@ -1840,6 +1840,9 @@ }, "MUXLOGGER": { "log_verbosity": "debug" + }, + "SERVICE_MGMT": { + "kill_radv": "False" } }, diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/mux-linkmgr.json b/src/sonic-yang-models/tests/yang_model_tests/tests/mux-linkmgr.json index 6358ec5e6e..7c4aeadffd 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests/mux-linkmgr.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests/mux-linkmgr.json @@ -7,5 +7,8 @@ }, "MUX_LINKMGR_MUXLOGGER_CHANGE_VERBOSITY_LEVEL": { "desc": "Consume verbosity level config changes. " + }, + "MUX_LINKMGR_SERVICE_MGMT_KILL_RADV_DISABLED": { + "desc": "Disable feature to kill radv." } } \ No newline at end of file diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/mux-linkmgr.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/mux-linkmgr.json index c57a2c297b..1feff4f440 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/mux-linkmgr.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/mux-linkmgr.json @@ -32,5 +32,15 @@ } } } + }, + "MUX_LINKMGR_SERVICE_MGMT_KILL_RADV_DISABLED": { + "sonic-mux-linkmgr:sonic-mux-linkmgr": { + "sonic-mux-linkmgr:MUX_LINKMGR": { + "sonic-mux-linkmgr:SERVICE_MGMT": + { + "kill_radv": "False" + } + } + } } } \ No newline at end of file diff --git a/src/sonic-yang-models/yang-models/sonic-mux-linkmgr.yang b/src/sonic-yang-models/yang-models/sonic-mux-linkmgr.yang index a310cebf41..d7b07ed733 100644 --- a/src/sonic-yang-models/yang-models/sonic-mux-linkmgr.yang +++ b/src/sonic-yang-models/yang-models/sonic-mux-linkmgr.yang @@ -98,6 +98,20 @@ module sonic-mux-linkmgr { description "Linkmgrd log verbosity level. "; } } + + container SERVICE_MGMT { + + leaf kill_radv { + type enumeration { + enum True; + enum False; + } + + default True; + + description "Kill radv service instead of gracefully stopping it. "; + } + } } } } \ No newline at end of file