ETSI SOL001 v2.5.1 model types not deployed in upgrade

Issue-ID: SDC-3707

Signed-off-by: davsad <david.sadlier@est.tech>
Change-Id: If1bda517a9295ad380bf4e5e2fc35f15a1ff708e

1 files changed, 9 insertions, 1 deletions

diff --git a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/model_client.py b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/model_client.py
index fd1cecd429..88128ea71d 100644
--- a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/model_client.py
+++ b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/model_client.py
@@ -77,7 +77,7 @@ class ModelClient:
             raise Exception(error_msg)
         logger.log("Updated model", model_name)
 
-    def import_model_elements(self, model_payload_dict, tosca_elements_import_path, with_metadata=False):
+    def import_model_elements(self, model_payload_dict, tosca_elements_import_path, with_metadata):
         model_name = model_payload_dict['name']
         logger.debug("Starting import of normative elements for model '{}'".format(model_name))
         if with_metadata:
@@ -92,6 +92,14 @@ class ModelClient:
         process_type_list(types_list, self.__sdc_be_proxy, upgrade)
         logger.log("Finished importing normative types for model", model_name)
 
+    def get_model_list(self):
+        response = self.__sdc_be_proxy.get_model_list()
+        if response == 200:
+            models = self.__sdc_be_proxy.get_response_from_buffer()
+            return json.loads(models)
+        else:
+            return []
+
     @staticmethod
     def __parse_to_json_str(model_payload_dict):
         return json.dumps(model_payload_dict)