Remove ruamel.yaml dependency, use pyyaml instead

[osm/osmclient.git] / osmclient / sol005 / osmrepo.py

diff --git a/osmclient/sol005/osmrepo.py b/osmclient/sol005/osmrepo.py
index c2bb0c9..3aa3720 100644 (file)
--- a/osmclient/sol005/osmrepo.py
+++ b/osmclient/sol005/osmrepo.py
@@ -31,7 +31,7 @@ from osmclient.common.package_tool import PackageTool
 from osmclient.sol005.repo import Repo
 from packaging import version as versioning
 import requests
-import ruamel.yaml
+import yaml
 
 
 class OSMRepo(Repo):
@@ -64,7 +64,7 @@ class OSMRepo(Repo):
                 r = requests.get('{}/index.yaml'.format(repository.get('url')))
 
                 if r.status_code == 200:
-                    repo_list = ruamel.yaml.safe_load(r.text)
+                    repo_list = yaml.safe_load(r.text)
                     vnf_packages = repo_list.get('{}_packages'.format(pkgtype))
                     for repo in vnf_packages:
                         versions = vnf_packages.get(repo)
@@ -137,7 +137,7 @@ class OSMRepo(Repo):
             raise ClientException('Package not found')
         folder, descriptor = self.zip_extraction(pkg_name)
         with open(descriptor) as pkg:
-            pkg_descriptor = ruamel.yaml.safe_load(pkg)
+            pkg_descriptor = yaml.safe_load(pkg)
         rmtree(folder, ignore_errors=False)
         if ((pkgtype == 'vnf' and (pkg_descriptor.get('vnfd') or pkg_descriptor.get('vnfd:vnfd_catalog'))) or
                 (pkgtype == 'ns' and (pkg_descriptor.get('nsd') or pkg_descriptor.get('nsd:nsd_catalog')))):
@@ -150,6 +150,7 @@ class OSMRepo(Repo):
             :param origin: origin directory for getting all the artifacts
             :param destination: destination folder for create and index the valid artifacts
         """
+        self._logger.debug("")
         if destination == '.':
             if origin == destination:
                 destination = 'repository'
@@ -179,6 +180,7 @@ class OSMRepo(Repo):
             :param fname: file path
             :return: checksum string
         """
+        self._logger.debug("")
         hash_md5 = hashlib.md5()
         with open(fname, "rb") as f:
             for chunk in iter(lambda: f.read(4096), b""):
@@ -193,6 +195,7 @@ class OSMRepo(Repo):
             :param package_type: type of artifact (vnf or ns)
             :return: fields
         """
+        self._logger.debug("")
         fields = {}
         base_path = '/{}/'.format(package_type)
         aux_dict = {}
@@ -252,6 +255,7 @@ class OSMRepo(Repo):
             :param path: file path
             :return: status details, status, fields, package_type
         """
+        self._logger.debug("")
         package_type = ''
         folder = ''
         try:
@@ -291,6 +295,7 @@ class OSMRepo(Repo):
             file: VNF or NS
             destination: path for index creation
         """
+        self._logger.debug("")
         pt = PackageTool()
         compresed = False
         try:
@@ -320,6 +325,7 @@ class OSMRepo(Repo):
             :param package_type: package type (vnf, ns)
             :param fields: dict with the required values
         """
+        self._logger.debug("")
         data_ind = {'name': fields.get('name'), 'description': fields.get('description'),
                     'vendor': fields.get('vendor'), 'path': fields.get('path')}
 
@@ -331,28 +337,31 @@ class OSMRepo(Repo):
                 mkdir(final_path)
                 copyfile(path,
                          final_path + '/' + fields.get('id') + "-" + fields.get('version') + '.tar.gz')
-                ruamel.yaml.dump(fields, open(final_path + '/' + 'metadata.yaml', 'w'),
-                                 Dumper=ruamel.yaml.RoundTripDumper)
-                index = ruamel.yaml.load(open(destination + '/index.yaml'), Loader=ruamel.yaml.Loader)
+                yaml.safe_dump(fields, open(final_path + '/' + 'metadata.yaml', 'w'),
+                               default_flow_style=False, width=80, indent=4)
+                index = yaml.safe_load(open(destination + '/index.yaml'))
 
                 index['{}_packages'.format(package_type)][fields.get('id')][fields.get('version')] = data_ind
                 if versioning.parse(index['{}_packages'.format(package_type)][fields.get('id')][
                                     'latest']) < versioning.parse(fields.get('version')):
                     index['{}_packages'.format(package_type)][fields.get('id')]['latest'] = fields.get(
                         'version')
-                ruamel.yaml.dump(index, open(destination + '/index.yaml', 'w'), Dumper=ruamel.yaml.RoundTripDumper)
+                yaml.safe_dump(index, open(destination + '/index.yaml', 'w'),
+                               default_flow_style=False, width=80, indent=4)
                 self._logger.info('{} {} added in the repository'.format(package_type.upper(), str(path)))
         else:
             mkdir(destination + '/{}/'.format(package_type) + fields.get('id'))
             mkdir(final_path)
             copyfile(path,
                      final_path + '/' + fields.get('id') + "-" + fields.get('version') + '.tar.gz')
-            ruamel.yaml.dump(fields, open(join(final_path, 'metadata.yaml'), 'w'), Dumper=ruamel.yaml.RoundTripDumper)
-            index = ruamel.yaml.load(open(destination + '/index.yaml'), Loader=ruamel.yaml.Loader)
+            yaml.safe_dump(fields, open(join(final_path, 'metadata.yaml'), 'w'),
+                           default_flow_style=False, width=80, indent=4)
+            index = yaml.safe_load(open(destination + '/index.yaml'))
 
             index['{}_packages'.format(package_type)][fields.get('id')] = {fields.get('version'): data_ind}
             index['{}_packages'.format(package_type)][fields.get('id')]['latest'] = fields.get('version')
-            ruamel.yaml.dump(index, open(join(destination, 'index.yaml'), 'w'), Dumper=ruamel.yaml.RoundTripDumper)
+            yaml.safe_dump(index, open(join(destination, 'index.yaml'), 'w'),
+                           default_flow_style=False, width=80, indent=4)
             self._logger.info('{} {} added in the repository'.format(package_type.upper(), str(path)))
 
     def current_datatime(self):
@@ -360,6 +369,7 @@ class OSMRepo(Repo):
             Datetime Generator
             :return: Datetime as string with the following structure "2020-04-29T08:41:07.681653Z"
         """
+        self._logger.debug("")
         return time.strftime('%Y-%m-%dT%H:%M:%S.%sZ')
 
     def init_directory(self, destination):
@@ -368,6 +378,7 @@ class OSMRepo(Repo):
             :param destination:
             :return:
         """
+        self._logger.debug("")
         if not isdir(destination):
             mkdir(destination)
         if not isfile(join(destination, 'index.yaml')):
@@ -376,4 +387,5 @@ class OSMRepo(Repo):
             index_data = {'apiVersion': 'v1', 'generated': self.current_datatime(), 'vnf_packages': {},
                           'ns_packages': {}}
             with open(join(destination, 'index.yaml'), 'w') as outfile:
-                ruamel.yaml.dump(index_data, outfile, default_flow_style=False)
+                yaml.safe_dump(index_data, outfile, default_flow_style=False, width=80, indent=4)
+