From bbde811bd440efa80d1f6f6710ea9707426ce1cc Mon Sep 17 00:00:00 2001 From: Jongmin Kim Date: Sun, 16 Jun 2024 17:21:13 +0900 Subject: [PATCH] refactor: refactor enum field in plugin metadata Signed-off-by: Jongmin Kim --- .../plugin/collector/lib/metadata_generator.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/spaceone/inventory/plugin/collector/lib/metadata_generator.py b/src/spaceone/inventory/plugin/collector/lib/metadata_generator.py index 8c377696..7b3f248c 100644 --- a/src/spaceone/inventory/plugin/collector/lib/metadata_generator.py +++ b/src/spaceone/inventory/plugin/collector/lib/metadata_generator.py @@ -91,9 +91,9 @@ def _generate_tabs(self, tabs_meta: list) -> dict: del inner_tab_meta["root_path"] if "sort" in inner_tab_meta: - inner_dynamic_view["options"]["default_sort"] = ( - self._generate_sort(inner_tab_meta["sort"]) - ) + inner_dynamic_view["options"][ + "default_sort" + ] = self._generate_sort(inner_tab_meta["sort"]) if "root_path" in inner_tab_meta: inner_dynamic_view["options"]["root_path"] = inner_tab_meta[ @@ -148,7 +148,6 @@ def _generate_sort(table: dict) -> dict: def _generate_fields(self, fields: list) -> list: gen_fields = [] for field in fields: - if "type" not in field: gen_fields.append(self._generate_text_field(field)) @@ -433,6 +432,10 @@ def _generate_enum_field(self, field: dict) -> dict: field=enum, is_enum=True ) + if "name" in enum: + enums[main_key]["name"] = enum["name"] + del enum["name"] + if "options" in field: field["options"].update(enums) else: