X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fpackage.py;h=172ee45d499ac45af07a889e57d26e4b02bc833f;hb=refs%2Fchanges%2F86%2F6186%2F2;hp=b2fe035f7aea9cc83ac9e0300aeb7743b6db3074;hpb=2eba9951d0366a7aff90554bbc48db828a8e3ddf;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/package.py b/osmclient/sol005/package.py index b2fe035..172ee45 100644 --- a/osmclient/sol005/package.py +++ b/osmclient/sol005/package.py @@ -59,12 +59,21 @@ class Package(object): for (key,val) in headers.items()] self._http.set_http_header(http_header) 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") - else: + #print 'HTTP CODE: {}'.format(http_code) + #print 'RESP: {}'.format(resp) + if http_code in (200, 201, 202, 204): + if resp: + resp = json.loads(resp) + if not resp or 'id' not in resp: + raise ClientException('unexpected response from server - {}'.format( + resp)) print resp['id'] - + else: + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException("failed to delete ns {} - {}".format(name, msg))