Skip to content

[201911][db_migrator] fix old 1911 feature config migration to a new schema #1655

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

Merged
abdosi merged 7 commits into from
Jun 18, 2021
Merged

[201911][db_migrator] fix old 1911 feature config migration to a new schema #1655

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1b47877
[db_migrator] fix syntax error due to usage of python >=3.5 feature
stepanblyschak Jun 4, 2021
24d9278
if status was not there do not override
stepanblyschak Jun 7, 2021
e89560a
add tests
stepanblyschak Jun 7, 2021
3d8f416
add tests
stepanblyschak Jun 7, 2021
8e324d8
Merge branch '201911' of https://github.com/Azure/sonic-utilities into z
stepanblyschak Jun 7, 2021
328129e
add init_cfg.json to setup.py
stepanblyschak Jun 8, 2021
27294ba
align with #1655
stepanblyschak Jun 15, 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
9 changes: 6 additions & 3 deletions scripts/db_migrator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,10 @@ def migrate_feature_table(self):
'''
feature_table = self.configDB.get_table('FEATURE')
for feature, config in feature_table.items():
state = config.pop('status', 'disabled')
config['state'] = state
state = config.get('status')
if state is not None:
config['state'] = state
config.pop('status')
Comment thread
yxieca marked this conversation as resolved.
Outdated
self.configDB.set_entry('FEATURE', feature, config)

container_feature_table = self.configDB.get_table('CONTAINER_FEATURE')
Expand Down Expand Up @@ -286,7 +288,8 @@ def common_migration_ops(self):
# Override init config with current config.
# This will leave new fields from init_config
# in new_config, but not override existing configuration.
new_cfg = {**init_cfg, **curr_cfg}
new_cfg = init_cfg.copy()
new_cfg.update(curr_cfg)
self.configDB.set_entry(init_cfg_table, key, new_cfg)

def migrate(self):
Expand Down