projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Point dependencies to branch
[osm/osmclient.git]
/
osmclient
/
v1
/
package.py
diff --git
a/osmclient/v1/package.py
b/osmclient/v1/package.py
index
49527c2
..
f1a4bf4
100644
(file)
--- 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):
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
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")
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 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):
def get_key_val_from_pkg(self, descriptor_file):
- utils.get_key_val_from_pkg(descriptor_file)
+
return
utils.get_key_val_from_pkg(descriptor_file)
def wait_for_upload(self, filename):
"""wait(block) for an upload to succeed.
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)
"""
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("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):
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")
raise ClientException("failed to upload package")