X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fnsd.py;h=bbfed17376ace54d4de0849a0b5ac07eda6051f9;hb=dd006fac5cefcff43d83bdd0ab1660d2bf2ef891;hp=6a18828c12d22e53a19dcb095f6d9e4a1e15708d;hpb=56202fc5897ddf9f58ddca0d1b9860b6b77765e8;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/nsd.py b/osmclient/sol005/nsd.py index 6a18828..bbfed17 100644 --- a/osmclient/sol005/nsd.py +++ b/osmclient/sol005/nsd.py @@ -44,7 +44,7 @@ class Nsd(object): if filter: filter_string = '?{}'.format(filter) resp = self._http.get_cmd('{}{}'.format(self._apiBase, filter_string)) - #print yaml.safe_dump(resp) + #print(yaml.safe_dump(resp)) if resp: return resp return list() @@ -65,7 +65,7 @@ class Nsd(object): # It is redundant, since the previous one already gets the whole nsdinfo # The only difference is that a different primitive is exercised resp = self._http.get_cmd('{}/{}'.format(self._apiBase, nsd['_id'])) - #print yaml.safe_dump(resp) + #print(yaml.safe_dump(resp)) if resp: return resp raise NotFound("nsd {} not found".format(name)) @@ -75,8 +75,8 @@ class Nsd(object): headers = self._client._headers headers['Accept'] = 'application/binary' http_code, resp = self._http.get2_cmd('{}/{}/{}'.format(self._apiBase, nsd['_id'], thing)) - #print 'HTTP CODE: {}'.format(http_code) - #print 'RESP: {}'.format(resp) + #print('HTTP CODE: {}'.format(http_code)) + #print('RESP: {}'.format(resp)) if http_code in (200, 201, 202, 204): if resp: #store in a file @@ -106,8 +106,8 @@ class Nsd(object): querystring = '?FORCE=True' http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase, nsd['_id'], querystring)) - #print 'HTTP CODE: {}'.format(http_code) - #print 'RESP: {}'.format(resp) + #print('HTTP CODE: {}'.format(http_code)) + #print('RESP: {}'.format(resp)) if http_code == 202: print('Deletion in progress') elif http_code == 204: @@ -116,7 +116,7 @@ class Nsd(object): msg = "" if resp: try: - resp = json.loads(resp) + msg = json.loads(resp) except ValueError: msg = resp raise ClientException("failed to delete nsd {} - {}".format(name, msg)) @@ -157,8 +157,8 @@ class Nsd(object): self._apiVersion, self._apiResource) endpoint = '{}{}'.format(self._apiBase,ow_string) http_code, resp = self._http.post_cmd(endpoint=endpoint, filename=filename) - #print 'HTTP CODE: {}'.format(http_code) - #print 'RESP: {}'.format(resp) + #print('HTTP CODE: {}'.format(http_code)) + #print('RESP: {}'.format(resp)) if http_code in (200, 201, 202, 204): if resp: resp = json.loads(resp) @@ -166,6 +166,8 @@ class Nsd(object): raise ClientException('unexpected response from server - {}'.format( resp)) print(resp['id']) + elif http_code == 204: + print('Updated') else: msg = "Error {}".format(http_code) if resp: