X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fcommon%2Fpackage_tool.py;h=ac0421f0ee5d70a576bb4bbcd8ca937e06efdc0b;hb=refs%2Fchanges%2F48%2F10048%2F7;hp=ec0a6d4c7f8d9eef313c18d72a62174588f9186d;hpb=23e596547276c40031363a9400dc754eb4702c43;p=osm%2Fosmclient.git

diff --git a/osmclient/common/package_tool.py b/osmclient/common/package_tool.py
index ec0a6d4..ac0421f 100644
--- a/osmclient/common/package_tool.py
+++ b/osmclient/common/package_tool.py
@@ -27,7 +27,6 @@ import subprocess
 import shutil
 import yaml
 import logging
-import pathlib
 
 
 class PackageTool(object):
@@ -440,42 +439,47 @@ class PackageTool(object):
 
     def charms_search(self, descriptor_file, desc_type):
         self._logger.debug("")
-
-        descriptor_dict = {}
-        charm_list = []
-        bundle_list = []
-
         with open("{}".format(descriptor_file)) as yaml_desc:
             descriptor_dict = yaml.safe_load(yaml_desc)
-            for _, v1 in descriptor_dict.items():
-                for _, v2 in v1.items():
-                    for entry in v2:
-                        if "{}-configuration".format(desc_type) in entry:
-                            name = entry["{}-configuration".format(desc_type)]
-                            for _, v3 in name.items():
-                                if "charm" in v3:
-                                    charm_list.append((v3["charm"]))
-                        if "vdu" in entry:
-                            name = entry["vdu"]
-                            for vdu in name:
-                                if "vdu-configuration" in vdu:
-                                    for _, v4 in vdu["vdu-configuration"].items():
-                                        if "charm" in v4:
-                                            charm_list.append((v4["charm"]))
-                        if "kdu" in entry:
-                            name = entry["kdu"]
-                            for kdu in name:
-                                if "juju-bundle" in kdu:
-                                    bundle_list.append(kdu["juju-bundle"])
-
-        path = pathlib.Path(descriptor_file).parent
-        for bundle in bundle_list:
-            descriptor_dict = {}
-            with open("{}/juju-bundles/{}".format(path, bundle)) as yaml_desc:
-                descriptor_dict = yaml.safe_load(yaml_desc)
-                if "applications" in descriptor_dict:
-                    for _, v in descriptor_dict["applications"].items():
-                        charm_list.append(pathlib.Path(v["charm"]).name)
-
-        return charm_list
+            if "catalog" in descriptor_dict: # Match OSM-IM vnfd-catalog and nsd-catalog
+                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
+
+    def _charms_search_on_osm_im_dict(self, osm_im_dict, desc_type):
+        charms_list = []
+        for k1, v1 in osm_im_dict.items():
+            for k2, v2 in v1.items():
+                for entry in v2:
+                    if '{}-configuration'.format(desc_type) in entry:
+                        vnf_config = entry['{}-configuration'.format(desc_type)]
+                        for k3, v3 in vnf_config.items():
+                            if 'charm' in v3:
+                                charms_list.append((v3['charm']))
+                    if 'vdu' in entry:
+                        vdus = entry['vdu']
+                        for vdu in vdus:
+                            if 'vdu-configuration' in vdu:
+                                for k4, v4 in vdu['vdu-configuration'].items():
+                                    if 'charm' in v4:
+                                        charms_list.append((v4['charm']))
+        return charms_list
+
+    def _charms_search_on_sol006_dict(self, sol006_dict, desc_type):
+        charms_list = []
+        for k1, v1 in sol006_dict.items():
+            for k2, v2 in v1.items():
+                if '{}-configuration'.format(desc_type) in k2:
+                    for vnf_config in v2:
+                        for k3, v3 in vnf_config.items():
+                            if 'charm' in v3:
+                                charms_list.append((v3['charm']))
+                if 'vdu-configuration' in k2:
+                    for vdu_config in v2:
+                        for k3, v3 in vdu_config.items():
+                            if 'charm' in v3:
+                                charms_list.append((v3['charm']))
+        return charms_list