X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fv1%2Fpackage.py;fp=osmclient%2Fv1%2Fpackage.py;h=f1a4bf49022ac9b2a2725fa6bb43be0693af5fc2;hb=95686bbc69ded243c346f94dceb0bee567572fb7;hp=b7a2d9756ab8c7b737d42e8fb16ddb0ae10f2921;hpb=52424a2ae26db69c5a97d01e84454ffdd4d31228;p=osm%2Fosmclient.git diff --git a/osmclient/v1/package.py b/osmclient/v1/package.py index b7a2d97..f1a4bf4 100644 --- a/osmclient/v1/package.py +++ b/osmclient/v1/package.py @@ -30,9 +30,9 @@ class Package(object): self._upload_http = upload_http def _wait_for_package(self, pkg_type): - if 'vnfd' in pkg_type['type']: + if "vnfd" in pkg_type["type"]: get_method = self._client.vnfd.get - elif 'nsd' in pkg_type['type']: + elif "nsd" in pkg_type["type"]: get_method = self._client.nsd.get else: raise ClientException("no valid package type found") @@ -45,16 +45,16 @@ class Package(object): return False return True - return utils.wait_for_value(lambda: - check_exists(lambda: - get_method(pkg_type['name']))) + return utils.wait_for_value( + lambda: check_exists(lambda: get_method(pkg_type["name"])) + ) def get_key_val_from_pkg(self, descriptor_file): return utils.get_key_val_from_pkg(descriptor_file) def wait_for_upload(self, filename): """wait(block) for an upload to succeed. - The filename passed is assumed to be a descriptor tarball. + The filename passed is assumed to be a descriptor tarball. """ pkg_type = utils.get_key_val_from_pkg(filename) @@ -62,10 +62,9 @@ class Package(object): raise ClientException("Cannot determine package type") if not self._wait_for_package(pkg_type): - raise ClientException("package {} failed to upload" - .format(filename)) + raise ClientException("package {} failed to upload".format(filename)) def upload(self, filename): - resp = self._upload_http.post_cmd(formfile=('package', filename)) - if not resp or 'transaction_id' not in resp: + resp = self._upload_http.post_cmd(formfile=("package", filename)) + if not resp or "transaction_id" not in resp: raise ClientException("failed to upload package")