Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

generic_updater: Fix service validator related issues #1901

Merged
merged 16 commits into from
Nov 5, 2021
Merged

generic_updater: Fix service validator related issues #1901

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7863b59
ChangeApplier and unit test code.
renukamanavalan Oct 1, 2021
84f493b
minor update
renukamanavalan Oct 4, 2021
dd337eb
fix unused import
renukamanavalan Oct 4, 2021
6e0bba0
Added service validation
renukamanavalan Oct 11, 2021
cabcf23
Take off added code for logging
renukamanavalan Oct 19, 2021
a075606
Merge remote-tracking branch 'upstream/master' into updater
renukamanavalan Oct 19, 2021
bd7781c
fix merge
renukamanavalan Oct 19, 2021
f839e53
change applier & test updated for service validation
renukamanavalan Oct 20, 2021
beb1ea7
removed unused import
renukamanavalan Oct 20, 2021
fe25d2e
Added two service validators
renukamanavalan Oct 20, 2021
fec8f8f
move global to class; No logical code changes
renukamanavalan Oct 24, 2021
7d90266
A fix in file path
renukamanavalan Oct 27, 2021
91f8f7e
Merge remote-tracking branch 'upstream/master' into updater
renukamanavalan Oct 27, 2021
6cd9dd8
1) Copy generic_updater_config.conf.json as part of install
renukamanavalan Nov 2, 2021
5a9434b
Merge remote-tracking branch 'upstream/master' into updater
renukamanavalan Nov 2, 2021
30feec2
Prune only empty tables
renukamanavalan Nov 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion generic_config_updater/change_applier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from .gu_common import genericUpdaterLogging


UPDATER_CONF_FILE = "/etc/sonic/generic_config_updater.conf"
Copy link
Contributor

@qiluo-msft qiluo-msft Nov 9, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

generic_config_updater.conf

Regarding the filename, generic_config_updater.conf.json seems make more sense. It is confusing to see ..config.conf..

UPDATER_CONF_FILE = "/etc/sonic/generic_updater_config.conf.json"
logger = genericUpdaterLogging.get_logger(title="Change Applier")

print_to_console = False
Expand Down
34 changes: 17 additions & 17 deletions generic_config_updater/generic_updater_config.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,4 @@
{
"tables": {
"": {
"services_to_validate": [ "system_health" ]
},
"PORT": {
"services_to_validate": [ "port_service" ]
},
"SYSLOG_SERVER":{
"services_to_validate": [ "rsyslog" ]
},
"DHCP_RELAY": {
"services_to_validate": [ "dhcp-relay" ]
},
"DHCP_SERVER": {
"services_to_validate": [ "dhcp-relay" ]
}
},
"README": [
"Validate_commands provides, module & method name as ",
" <module name>.<method name>",
Expand All @@ -41,6 +24,23 @@
"Note: The commands may be called in any order",
""
],
"tables": {
"": {
"services_to_validate": [ "system_health" ]
},
"PORT": {
"services_to_validate": [ "port_service" ]
},
"SYSLOG_SERVER":{
"services_to_validate": [ "rsyslog" ]
},
"DHCP_RELAY": {
"services_to_validate": [ "dhcp-relay" ]
},
"DHCP_SERVER": {
"services_to_validate": [ "dhcp-relay" ]
}
},
"services": {
"system_health": {
"validate_commands": [ ]
Expand Down