Merges branch sol006 into master

[osm/osmclient.git] / osmclient / common / package_tool.py

diff --git a/osmclient/common/package_tool.py b/osmclient/common/package_tool.py
index 203806e..ac0421f 100644 (file)
--- a/osmclient/common/package_tool.py
+++ b/osmclient/common/package_tool.py
@@ -28,6 +28,7 @@ import shutil
 import yaml
 import logging
 
+
 class PackageTool(object):
     def __init__(self, client=None):
         self._client = client
@@ -150,7 +151,7 @@ class PackageTool(object):
             :returns: None
         """
         self._logger.debug("")
-        files = [f for f in glob.glob(package_folder + "/**/*.*", recursive=True)]
+        files = [f for f in glob.glob(package_folder + "/**/*.*", recursive=True) if os.path.isfile(f)]
         with open("{}/checksums.txt".format(package_folder), "w+") as checksum:
             for file_item in files:
                 if "checksums.txt" in file_item:
@@ -289,7 +290,7 @@ class PackageTool(object):
                 if os.path.isdir('{}/charms/layers/{}'.format(package_folder,charmName)):
                     print('Building charm {}/charms/layers/{}'.format(package_folder, charmName))
                     self.charm_build(package_folder, charmName)
-                    print('Charm built {}'.format(charmName))
+                    print('Charm built: {}'.format(charmName))
                 else:
                     if not os.path.isdir('{}/charms/{}'.format(package_folder,charmName)):
                         raise ClientException ('The charm: {} referenced in the descriptor file '
@@ -370,22 +371,24 @@ class PackageTool(object):
             with tarfile.open("{}.tar.gz".format(package_name), mode='w:gz') as archive:
                 print("Adding File: {}".format(package_name))
                 archive.add('{}'.format(package_name), recursive=True)
-            #return "Created {}.tar.gz".format(package_folder)
-            #self.build("{}".format(os.path.basename(package_folder)))
+            # return "Created {}.tar.gz".format(package_folder)
+            # self.build("{}".format(os.path.basename(package_folder)))
             os.chdir(cwd)
+            cwd = None
+            created_package = "{}/{}.tar.gz".format(os.path.dirname(package_folder) or '.', package_name)
+            os.rename("{}/{}.tar.gz".format(directory_name, package_name),
+                      created_package)
+            os.rename("{}/{}/checksums.txt".format(directory_name, package_name),
+                      "{}/checksums.txt".format(package_folder))
+            print("Package created: {}".format(created_package))
+            return created_package
         except Exception as exc:
+            raise ClientException('failure during build of targz file (create temp dir, calculate checksum, '
+                                  'tar.gz file): {}'.format(exc))
+        finally:
             if cwd:
                 os.chdir(cwd)
             shutil.rmtree(os.path.join(package_folder, "tmp"))
-            raise ClientException('failure during build of targz file (create temp dir, calculate checksum, tar.gz file): {}'.format(exc))
-        created_package = "{}/{}.tar.gz".format(package_folder, package_name)
-        os.rename("{}/{}.tar.gz".format(directory_name, package_name),
-                  created_package)
-        os.rename("{}/{}/checksums.txt".format(directory_name, package_name),
-                  "{}/checksums.txt".format(package_folder))
-        shutil.rmtree(os.path.join(package_folder, "tmp"))
-        print("Package created: {}".format(created_package))
-        return created_package
 
     def create_temp_dir(self, package_folder, charm_list=None):
         """
@@ -436,24 +439,47 @@ class PackageTool(object):
 
     def charms_search(self, descriptor_file, desc_type):
         self._logger.debug("")
-        dict = {}
-        list = []
         with open("{}".format(descriptor_file)) as yaml_desc:
-            dict = yaml.safe_load(yaml_desc)
-            for k1, v1 in dict.items():
-                for k2, v2 in v1.items():
-                    for entry in v2:
-                        if '{}-configuration'.format(desc_type) in entry:
-                            name = entry['{}-configuration'.format(desc_type)]
-                            for k3, v3 in name.items():
-                                if 'charm' in v3:
-                                    list.append((v3['charm']))
-                        if 'vdu' in entry:
-                            name = entry['vdu']
-                            for vdu in name:
-                                if 'vdu-configuration' in vdu:
-                                    for k4, v4 in vdu['vdu-configuration'].items():
-                                        if 'charm' in v4:
-                                            list.append((v4['charm']))
-        return list
+            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_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