diff options
Diffstat (limited to 'conductor/conductor/data/plugins/inventory_provider/utils')
-rw-r--r-- | conductor/conductor/data/plugins/inventory_provider/utils/aai_utils.py | 10 | ||||
-rw-r--r-- | conductor/conductor/data/plugins/inventory_provider/utils/csar.py | 24 |
2 files changed, 30 insertions, 4 deletions
diff --git a/conductor/conductor/data/plugins/inventory_provider/utils/aai_utils.py b/conductor/conductor/data/plugins/inventory_provider/utils/aai_utils.py index c88b459..5191c91 100644 --- a/conductor/conductor/data/plugins/inventory_provider/utils/aai_utils.py +++ b/conductor/conductor/data/plugins/inventory_provider/utils/aai_utils.py @@ -20,7 +20,7 @@ QUERY_PARAMS = {'service_instance': ["service-instance-id", "service-instance-name", "environment-context", "workload-context", "model-invariant-id", "model-version-id", "widget-model-id", "widget-model-version", "service-instance-location-id", "orchestration-status"], - 'nst': ["model-role"] + 'nst': ["model-role"], 'Nsst': ["model-role"] } @@ -90,6 +90,14 @@ def get_nst_info(nst_instance): return nst_dict +def get_nsst_info(nsst_instance): + nsst_dict = {} + nsst_dict['model_invariant_id'] = nsst_instance.get('model-invariant-id') + nsst_dict['model_type'] = nsst_instance.get('model-type') + nsst_dict['model_role'] = nsst_instance.get('model-role') + return nsst_dict + + def get_model_ver_info(model_version): for key in list(model_version): if "model-elements" in key: diff --git a/conductor/conductor/data/plugins/inventory_provider/utils/csar.py b/conductor/conductor/data/plugins/inventory_provider/utils/csar.py index 0caccac..dc0977c 100644 --- a/conductor/conductor/data/plugins/inventory_provider/utils/csar.py +++ b/conductor/conductor/data/plugins/inventory_provider/utils/csar.py @@ -1,5 +1,3 @@ - - # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at @@ -22,7 +20,6 @@ from toscaparser.utils.urlutils import UrlUtils from toscaparser.utils import yamlparser import zipfile - try: # Python 2.x from BytesIO import BytesIO except ImportError: # Python 3.x @@ -82,6 +79,12 @@ class SDCCSAR(CSAR): print("nst properties", nst_properies_res) return nst_properies_res + if is_validated: + main_tpl = self._read_template_yaml(self.main_template_file_name) + nsst_properies_res = self.get_nsst_properties(main_tpl) + print("nsst properties", nsst_properies_res) + return nsst_properies_res + def get_nst_properties(self, main_tpl): importsarr = main_tpl.get('imports') for imports in importsarr: @@ -96,3 +99,18 @@ class SDCCSAR(CSAR): nodedata = node_types[key] nst_properties = nodedata.get("properties") return nst_properties + + def get_nsst_properties(self, main_tpl): + importsarr = main_tpl.get('imports') + for imports in importsarr: + for key in imports: + if "service-{}-interface".format(self.model_name) in key: + val = imports[key] + filename = val.get("file") + datanew = self._read_template_yaml("Definitions/" + filename) + node_types = datanew.get("node_types") + for key in list(node_types): + if "org.openecomp" in key: + nodedata = node_types[key] + nsst_properties = nodedata.get("properties") + return nsst_properties |