X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fosmclient.git;a=blobdiff_plain;f=osmclient%2Fcommon%2Fpackage_tool.py;h=7229565a43461928c47aa0d59b8fc6d856414461;hp=568880c0fd3defb3f36f746808098545850931a7;hb=0438395c63edebf5f34688906decc06935f037e6;hpb=208c6ca02219051ff0a4d525105c88b6b9c83645

diff --git a/osmclient/common/package_tool.py b/osmclient/common/package_tool.py
index 568880c..7229565 100644
--- a/osmclient/common/package_tool.py
+++ b/osmclient/common/package_tool.py
@@ -441,13 +441,17 @@ class PackageTool(object):
         return directory_name, package_name
 
     def charms_search(self, descriptor_file, desc_type):
-        self._logger.debug("")
+        self._logger.debug("descriptor_file: {}, desc_type: {}".format(descriptor_file,
+                                                                       desc_type))
         with open("{}".format(descriptor_file)) as yaml_desc:
             descriptor_dict = yaml.safe_load(yaml_desc)
-            if "catalog" in descriptor_dict:  # Match OSM-IM vnfd-catalog and nsd-catalog
-                charms_list = self._charms_search_on_sol006_dict(descriptor_dict, desc_type)
-            else:
+            #self._logger.debug("\n"+yaml.safe_dump(descriptor_dict, indent=4, default_flow_style=False))
+
+            if ( (desc_type=="vnf" and ("vnfd:vnfd-catalog" in descriptor_dict or "vnfd-catalog" in descriptor_dict)) or
+                 (desc_type=="ns" and ( "nsd:nsd-catalog" in descriptor_dict or "nsd-catalog" in descriptor_dict)) ):
                 charms_list = self._charms_search_on_osm_im_dict(descriptor_dict, desc_type)
+            else:
+                charms_list = self._charms_search_on_sol006_dict(descriptor_dict, desc_type)
 
         return charms_list