X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fnsd.py;h=9adc8f754a3ecd7e0be5dc824cd3995060cd26c6;hb=refs%2Fchanges%2F17%2F8117%2F4;hp=3288e954d0f489841b8e1d86951f8201ea998690;hpb=017c4fb032ab1f63e1ce474e12787204f33fce96;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/nsd.py b/osmclient/sol005/nsd.py index 3288e95..9adc8f7 100644 --- a/osmclient/sol005/nsd.py +++ b/osmclient/sol005/nsd.py @@ -21,10 +21,11 @@ OSM nsd API handling from osmclient.common.exceptions import NotFound from osmclient.common.exceptions import ClientException from osmclient.common import utils -import yaml +import json import magic +from os.path import basename #from os import stat -#from os.path import basename + class Nsd(object): @@ -39,16 +40,18 @@ class Nsd(object): #self._apiBase='/nsds' def list(self, filter=None): + self._client.get_token() filter_string = '' 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() def get(self, name): + self._client.get_token() if utils.validate_uuid4(name): for nsd in self.list(): if name == nsd['_id']: @@ -60,11 +63,12 @@ class Nsd(object): raise NotFound("nsd {} not found".format(name)) def get_individual(self, name): + # Called to get_token not required, because will be implicitly called by get. nsd = self.get(name) # 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)) @@ -73,12 +77,21 @@ class Nsd(object): nsd = self.get(name) headers = self._client._headers headers['Accept'] = 'application/binary' - resp2 = self._http.get2_cmd('{}/{}/{}'.format(self._apiBase, nsd['_id'], thing)) - #print yaml.safe_dump(resp2) - if resp2: - #store in a file - return resp2 - raise NotFound("nsd {} not found".format(name)) + http_code, resp = self._http.get2_cmd('{}/{}/{}'.format(self._apiBase, nsd['_id'], thing)) + #print('HTTP CODE: {}'.format(http_code)) + #print('RESP: {}'.format(resp)) + if http_code in (200, 201, 202, 204): + if resp: + #store in a file + return resp + else: + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException("failed to get {} from {} - {}".format(thing, name, msg)) def get_descriptor(self, name, filename): self.get_thing(name, 'nsd', filename) @@ -89,24 +102,39 @@ class Nsd(object): def get_artifact(self, name, artifact, filename): self.get_thing(name, 'artifacts/{}'.format(artifact), filename) - def delete(self, name): + def delete(self, name, force=False): nsd = self.get(name) - resp = self._http.delete_cmd('{}/{}'.format(self._apiBase, nsd['_id'])) - #print 'RESP: '.format(resp) - if resp is None: - print 'Deleted' + querystring = '' + if force: + 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)) + if http_code == 202: + print('Deletion in progress') + elif http_code == 204: + print('Deleted') else: - raise ClientException("failed to delete nsd {}: {}".format(name, resp)) + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException("failed to delete nsd {} - {}".format(name, msg)) def create(self, filename, overwrite=None, update_endpoint=None): + self._client.get_token() mime_type = magic.from_file(filename, mime=True) if mime_type is None: raise ClientException( "failed to guess MIME type for file '{}'".format(filename)) headers= self._client._headers - if mime_type in ['application/yaml', 'text/plain']: - headers['Content-Type'] = 'application/yaml' - elif mime_type == 'application/gzip': + headers['Content-Filename'] = basename(filename) + if mime_type in ['application/yaml', 'text/plain', 'application/json']: + headers['Content-Type'] = 'text/plain' + elif mime_type in ['application/gzip', 'application/x-gzip']: headers['Content-Type'] = 'application/gzip' #headers['Content-Type'] = 'application/binary' # Next three lines are to be removed in next version @@ -120,10 +148,10 @@ class Nsd(object): ) headers["Content-File-MD5"] = utils.md5(filename) http_header = ['{}: {}'.format(key,val) - for (key,val) in headers.items()] + for (key,val) in list(headers.items())] self._http.set_http_header(http_header) if update_endpoint: - resp = self._http.put_cmd(endpoint=update_endpoint, filename=filename) + http_code, resp = self._http.put_cmd(endpoint=update_endpoint, filename=filename) else: ow_string = '' if overwrite: @@ -132,12 +160,26 @@ class Nsd(object): self._apiBase = '{}{}{}'.format(self._apiName, self._apiVersion, self._apiResource) endpoint = '{}{}'.format(self._apiBase,ow_string) - resp = self._http.post_cmd(endpoint=endpoint, filename=filename) - #print resp - if not resp or 'id' not in resp: - raise ClientException("failed to upload package") + http_code, resp = self._http.post_cmd(endpoint=endpoint, filename=filename) + #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']) + elif http_code == 204: + print('Updated') else: - print resp['id'] + msg = "Error {}".format(http_code) + if resp: + try: + msg = "{} - {}".format(msg, json.loads(resp)) + except ValueError: + msg = "{} - {}".format(msg, resp) + raise ClientException("failed to create/update nsd - {}".format(msg)) def update(self, name, filename): nsd = self.get(name)