forked from sonic-net/sonic-buildimage
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '202205' of https://github.com/sonic-net/sonic-buildimage …
…into 202205
- Loading branch information
Showing
4 changed files
with
127 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -580,8 +580,14 @@ | |
"auto_restart": "enabled", | ||
"high_mem_alert": "disabled" | ||
}, | ||
|
||
|
||
"syncd": { | ||
"state": "enabled", | ||
"has_timer": "False", | ||
"has_global_scope": "True", | ||
"has_per_asic_scope": "True", | ||
"auto_restart": "enabled", | ||
"high_mem_alert": "disabled" | ||
}, | ||
}, | ||
}, | ||
"expected_config_db": { | ||
|
@@ -610,12 +616,23 @@ | |
"high_mem_alert": "disabled", | ||
"state": "enabled" | ||
}, | ||
"syncd": { | ||
"auto_restart": "enabled", | ||
"has_global_scope": "True", | ||
"has_per_asic_scope": "True", | ||
"has_timer": "False", | ||
"high_mem_alert": "disabled", | ||
"state": "enabled" | ||
}, | ||
}, | ||
}, | ||
"enable_feature_subprocess_calls": [ | ||
call("sudo systemctl stop bgp.service", shell=True), | ||
call("sudo systemctl disable bgp.service", shell=True), | ||
call("sudo systemctl mask bgp.service", shell=True), | ||
call("sudo systemctl start syncd.service", shell=True), | ||
call("sudo systemctl enable syncd.service", shell=True), | ||
call("sudo systemctl unmask syncd.service", shell=True), | ||
], | ||
"daemon_reload_subprocess_call": [ | ||
call("sudo systemctl daemon-reload", shell=True), | ||
|
@@ -675,8 +692,14 @@ | |
"auto_restart": "enabled", | ||
"high_mem_alert": "disabled" | ||
}, | ||
|
||
|
||
"syncd": { | ||
"state": "enabled", | ||
"has_timer": "False", | ||
"has_global_scope": "True", | ||
"has_per_asic_scope": "True", | ||
"auto_restart": "enabled", | ||
"high_mem_alert": "disabled" | ||
}, | ||
}, | ||
}, | ||
"expected_config_db": { | ||
|
@@ -705,12 +728,23 @@ | |
"high_mem_alert": "disabled", | ||
"state": "enabled" | ||
}, | ||
"syncd": { | ||
"auto_restart": "enabled", | ||
"has_global_scope": "True", | ||
"has_per_asic_scope": "True", | ||
"has_timer": "False", | ||
"high_mem_alert": "disabled", | ||
"state": "enabled" | ||
}, | ||
}, | ||
}, | ||
"enable_feature_subprocess_calls": [ | ||
call("sudo systemctl stop bgp.service", shell=True), | ||
call("sudo systemctl disable bgp.service", shell=True), | ||
call("sudo systemctl mask bgp.service", shell=True), | ||
call("sudo systemctl start syncd.service", shell=True), | ||
call("sudo systemctl enable syncd.service", shell=True), | ||
call("sudo systemctl unmask syncd.service", shell=True), | ||
], | ||
"daemon_reload_subprocess_call": [ | ||
call("sudo systemctl daemon-reload", shell=True), | ||
|
@@ -770,8 +804,14 @@ | |
"auto_restart": "enabled", | ||
"high_mem_alert": "disabled" | ||
}, | ||
|
||
|
||
"syncd": { | ||
"state": "enabled", | ||
"has_timer": "False", | ||
"has_global_scope": "True", | ||
"has_per_asic_scope": "True", | ||
"auto_restart": "enabled", | ||
"high_mem_alert": "disabled" | ||
}, | ||
}, | ||
}, | ||
"expected_config_db": { | ||
|
@@ -800,6 +840,14 @@ | |
"high_mem_alert": "disabled", | ||
"state": "enabled" | ||
}, | ||
"syncd": { | ||
"auto_restart": "enabled", | ||
"has_global_scope": "True", | ||
"has_per_asic_scope": "True", | ||
"has_timer": "False", | ||
"high_mem_alert": "disabled", | ||
"state": "enabled" | ||
}, | ||
}, | ||
}, | ||
"enable_feature_subprocess_calls": [ | ||
|
@@ -809,7 +857,9 @@ | |
call("sudo systemctl start teamd.service", shell=True), | ||
call("sudo systemctl enable teamd.service", shell=True), | ||
call("sudo systemctl unmask teamd.service", shell=True), | ||
|
||
call("sudo systemctl start syncd.service", shell=True), | ||
call("sudo systemctl enable syncd.service", shell=True), | ||
call("sudo systemctl unmask syncd.service", shell=True), | ||
], | ||
"daemon_reload_subprocess_call": [ | ||
call("sudo systemctl daemon-reload", shell=True), | ||
|
@@ -869,8 +919,14 @@ | |
"auto_restart": "enabled", | ||
"high_mem_alert": "disabled" | ||
}, | ||
|
||
|
||
"syncd": { | ||
"state": "enabled", | ||
"has_timer": "False", | ||
"has_global_scope": "True", | ||
"has_per_asic_scope": "True", | ||
"auto_restart": "enabled", | ||
"high_mem_alert": "disabled" | ||
}, | ||
}, | ||
}, | ||
"expected_config_db": { | ||
|
@@ -899,6 +955,14 @@ | |
"high_mem_alert": "disabled", | ||
"state": "enabled" | ||
}, | ||
"syncd": { | ||
"auto_restart": "enabled", | ||
"has_global_scope": "True", | ||
"has_per_asic_scope": "True", | ||
"has_timer": "False", | ||
"high_mem_alert": "disabled", | ||
"state": "enabled" | ||
}, | ||
}, | ||
}, | ||
"enable_feature_subprocess_calls": [ | ||
|
@@ -908,7 +972,9 @@ | |
call("sudo systemctl start teamd.service", shell=True), | ||
call("sudo systemctl enable teamd.service", shell=True), | ||
call("sudo systemctl unmask teamd.service", shell=True), | ||
|
||
call("sudo systemctl start syncd.service", shell=True), | ||
call("sudo systemctl enable syncd.service", shell=True), | ||
call("sudo systemctl unmask syncd.service", shell=True), | ||
], | ||
"daemon_reload_subprocess_call": [ | ||
call("sudo systemctl daemon-reload", shell=True), | ||
|
@@ -969,8 +1035,14 @@ | |
"auto_restart": "enabled", | ||
"high_mem_alert": "disabled" | ||
}, | ||
|
||
|
||
"syncd": { | ||
"state": "enabled", | ||
"has_timer": "False", | ||
"has_global_scope": "False", | ||
"has_per_asic_scope": "True", | ||
"auto_restart": "enabled", | ||
"high_mem_alert": "disabled" | ||
}, | ||
}, | ||
}, | ||
"expected_config_db": { | ||
|
@@ -999,6 +1071,14 @@ | |
"high_mem_alert": "disabled", | ||
"state": "enabled" | ||
}, | ||
"syncd": { | ||
"auto_restart": "enabled", | ||
"has_global_scope": "False", | ||
"has_per_asic_scope": "True", | ||
"has_timer": "False", | ||
"high_mem_alert": "disabled", | ||
"state": "enabled" | ||
}, | ||
}, | ||
}, | ||
"enable_feature_subprocess_calls": [ | ||
|
@@ -1020,7 +1100,12 @@ | |
call("sudo systemctl stop [email protected]", shell=True), | ||
call("sudo systemctl disable [email protected]", shell=True), | ||
call("sudo systemctl mask [email protected]", shell=True), | ||
|
||
call("sudo systemctl start [email protected]", shell=True), | ||
call("sudo systemctl enable [email protected]", shell=True), | ||
call("sudo systemctl unmask [email protected]", shell=True), | ||
call("sudo systemctl start [email protected]", shell=True), | ||
call("sudo systemctl enable [email protected]", shell=True), | ||
call("sudo systemctl unmask [email protected]", shell=True), | ||
], | ||
"daemon_reload_subprocess_call": [ | ||
call("sudo systemctl daemon-reload", shell=True), | ||
|