projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proper handling of http_codes in http.post_cmd
[osm/osmclient.git]
/
osmclient
/
sol005
/
package.py
diff --git
a/osmclient/sol005/package.py
b/osmclient/sol005/package.py
index
de604c3
..
b2fe035
100644
(file)
--- a/
osmclient/sol005/package.py
+++ b/
osmclient/sol005/package.py
@@
-26,6
+26,7
@@
import yaml
from osmclient.common.exceptions import ClientException
from osmclient.common.exceptions import NotFound
from osmclient.common import utils
from osmclient.common.exceptions import ClientException
from osmclient.common.exceptions import NotFound
from osmclient.common import utils
+import json
class Package(object):
class Package(object):
@@
-41,9
+42,9
@@
class Package(object):
if pkg_type is None:
raise ClientException("Cannot determine package type")
if pkg_type['type'] == 'nsd':
if pkg_type is None:
raise ClientException("Cannot determine package type")
if pkg_type['type'] == 'nsd':
- endpoint = '/nsd/v1/ns_descriptors'
+ endpoint = '/nsd/v1/ns_descriptors
_content
'
else:
else:
- endpoint = '/vnfpkgm/v1/vnf_packages'
+ endpoint = '/vnfpkgm/v1/vnf_packages
_content
'
#endpoint = '/nsds' if pkg_type['type'] == 'nsd' else '/vnfds'
#print 'Endpoint: {}'.format(endpoint)
headers = self._client._headers
#endpoint = '/nsds' if pkg_type['type'] == 'nsd' else '/vnfds'
#print 'Endpoint: {}'.format(endpoint)
headers = self._client._headers
@@
-57,8
+58,9
@@
class Package(object):
http_header = ['{}: {}'.format(key,val)
for (key,val) in headers.items()]
self._http.set_http_header(http_header)
http_header = ['{}: {}'.format(key,val)
for (key,val) in headers.items()]
self._http.set_http_header(http_header)
- resp = self._http.post_cmd(endpoint=endpoint,
- filename=filename)
+ http_code, resp = self._http.post_cmd(endpoint=endpoint, filename=filename)
+ if resp:
+ resp = json.loads(resp)
#print 'RESP: {}'.format(yaml.safe_dump(resp))
if not resp or 'id' not in resp:
raise ClientException("failed to upload package")
#print 'RESP: {}'.format(yaml.safe_dump(resp))
if not resp or 'id' not in resp:
raise ClientException("failed to upload package")