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

Jump to bottom

FOGL-8748 Type change handling in configuration manager and only case conversio… #1436

Draft
wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

FOGL-8748 Type change handling in configuration manager and only case conversio… #1436

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cad76ae
Type change handling in configuration manager and only case conversio…
ashish-jabble Aug 2, 2024
c252ec1
Merge branch 'develop' into FOGL-8748
ashish-jabble Sep 5, 2024
799abe2
Merge branch 'develop' into FOGL-8748
ashish-jabble Sep 10, 2024
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
33 changes: 31 additions & 2 deletions python/fledge/common/configuration_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,33 @@ async def _run_callbacks_child(self, parent_category_name, child_category, opera

async def _merge_category_vals(self, category_val_new, category_val_storage, keep_original_items,
category_name=None):

def convert_json_type_to_list(list_name: str, old_config: dict, new_config: dict):
# Load the 'value' strings as JSON objects
old_config_value = json.loads(old_config['value'])
new_config_value = json.loads(new_config['value'])
# Extract the 'listName' key from old_config
item_name_list = old_config_value.get(list_name, [])
# Update the 'value' field in new_config with values from listName key of old_config['value']
if item_name_list:
# Iterate through the listName key and update the new_config_value
updated_list = []
for item_name in new_config_value:
if isinstance(item_name, dict):
updated_list_copy = item_name.copy()
# Find a matching listName in item_name_list
for _item in item_name_list:
# Update values for common keys
common_keys = set(_item.keys()) & set(item_name.keys())
for key in common_keys:
updated_list_copy[key] = _item[key]
updated_list.append(updated_list_copy)
else:
updated_list = item_name_list
# Update the new_config value with the updated list
new_config['value'] = json.dumps(updated_list)
return new_config['value']

# preserve all value_vals from category_val_storage
# use items in category_val_new not in category_val_storage
# keep_original_items = FALSE ignore items in category_val_storage not in category_val_new
Expand All @@ -235,6 +262,10 @@ async def _merge_category_vals(self, category_val_new, category_val_storage, kee
else:
if 'value' not in item_val_new:
item_val_new['value'] = item_val_new['default']
# Case JSON to list/kvlist
if item_val_new['type'] in ('list', 'kvlist') and item_val_storage['type'] == 'JSON':
if 'listName' in item_val_new:
convert_json_type_to_list(item_val_new['listName'], item_val_storage, item_val_new)
category_val_storage_copy.pop(item_name_new)
if "deprecated" in item_val_new and item_val_new['deprecated'] == 'true':
audit = AuditLogger(self._storage)
Expand All @@ -245,11 +276,9 @@ async def _merge_category_vals(self, category_val_new, category_val_storage, kee

for item in deprecated_items:
category_val_new_copy.pop(item)

if keep_original_items:
for item_name_storage, item_val_storage in category_val_storage_copy.items():
category_val_new_copy[item_name_storage] = item_val_storage

return category_val_new_copy

async def _validate_category_val(self, category_name, category_val, set_value_val_from_default_val=True):
Expand Down