import shutil
import yaml
import logging
+import pathlib
+
class PackageTool(object):
def __init__(self, client=None):
: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:
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 '
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):
"""
def charms_search(self, descriptor_file, desc_type):
self._logger.debug("")
- dict = {}
- list = []
+
+ descriptor_dict = {}
+ charm_list = []
+ bundle_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():
+ 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 k3, v3 in name.items():
- if 'charm' in v3:
- list.append((v3['charm']))
- if 'vdu' in entry:
- name = entry['vdu']
+ 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 k4, v4 in vdu['vdu-configuration'].items():
- if 'charm' in v4:
- list.append((v4['charm']))
- return list
+ 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