X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fnsd.py;h=7c2925275b2444a2a68192adcab91038e4c02846;hb=4054a86e8a9e206b36c53d84d67035646f0beee9;hp=9aca93011bec06a1cf7df34b1a3b22795e11df4e;hpb=566a8c34fbf1d676a0acd725f6f30fce8baf8c0a;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/nsd.py b/osmclient/sol005/nsd.py index 9aca930..7c29252 100644 --- a/osmclient/sol005/nsd.py +++ b/osmclient/sol005/nsd.py @@ -26,30 +26,28 @@ import magic from os.path import basename import logging import os.path -#from os import stat class Nsd(object): - def __init__(self, http=None, client=None): self._http = http self._client = client - self._logger = logging.getLogger('osmclient') - self._apiName = '/nsd' - self._apiVersion = '/v1' - self._apiResource = '/ns_descriptors' - self._apiBase = '{}{}{}'.format(self._apiName, - self._apiVersion, self._apiResource) - #self._apiBase='/nsds' + self._logger = logging.getLogger("osmclient") + self._apiName = "/nsd" + self._apiVersion = "/v1" + self._apiResource = "/ns_descriptors" + self._apiBase = "{}{}{}".format( + self._apiName, self._apiVersion, self._apiResource + ) def list(self, filter=None): self._logger.debug("") self._client.get_token() - filter_string = '' + filter_string = "" if filter: - filter_string = '?{}'.format(filter) - _, resp = self._http.get2_cmd('{}{}'.format(self._apiBase, filter_string)) - #print(yaml.safe_dump(resp)) + filter_string = "?{}".format(filter) + _, resp = self._http.get2_cmd("{}{}".format(self._apiBase, filter_string)) + if resp: return json.loads(resp) return list() @@ -59,11 +57,11 @@ class Nsd(object): self._client.get_token() if utils.validate_uuid4(name): for nsd in self.list(): - if name == nsd['_id']: + if name == nsd["_id"]: return nsd else: for nsd in self.list(): - if 'name' in nsd and name == nsd['name']: + if "name" in nsd and name == nsd["name"]: return nsd raise NotFound("nsd {} not found".format(name)) @@ -74,8 +72,7 @@ class Nsd(object): 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.get2_cmd('{}/{}'.format(self._apiBase, nsd['_id'])) - #print(yaml.safe_dump(resp)) + _, resp = self._http.get2_cmd("{}/{}".format(self._apiBase, nsd["_id"])) if resp: return json.loads(resp) except NotFound: @@ -87,125 +84,115 @@ class Nsd(object): # Call to get_token not required, because will be implicitly called by get. nsd = self.get(name) 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)) - #if http_code in (200, 201, 202, 204): + headers["Accept"] = "application/binary" + http_code, resp = self._http.get2_cmd( + "{}/{}/{}".format(self._apiBase, nsd["_id"], thing) + ) + if resp: - #store in a file return json.loads(resp) else: msg = resp or "" - # if resp: - # try: - # msg = json.loads(resp) - # except ValueError: - # msg = resp - raise ClientException("failed to get {} from {} - {}".format(thing, name, msg)) + raise ClientException( + "failed to get {} from {} - {}".format(thing, name, msg) + ) def get_descriptor(self, name, filename): self._logger.debug("") - self.get_thing(name, 'nsd', filename) + self.get_thing(name, "nsd", filename) def get_package(self, name, filename): self._logger.debug("") - self.get_thing(name, 'package_content', filename) + self.get_thing(name, "package_content", filename) def get_artifact(self, name, artifact, filename): self._logger.debug("") - self.get_thing(name, 'artifacts/{}'.format(artifact), filename) + self.get_thing(name, "artifacts/{}".format(artifact), filename) def delete(self, name, force=False): self._logger.debug("") nsd = self.get(name) - querystring = '' + 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)) + querystring = "?FORCE=True" + http_code, resp = self._http.delete_cmd( + "{}/{}{}".format(self._apiBase, nsd["_id"], querystring) + ) + if http_code == 202: - print('Deletion in progress') + print("Deletion in progress") elif http_code == 204: - print('Deleted') + print("Deleted") else: msg = resp or "" - # 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, skip_charm_build=False): + def create( + self, filename, overwrite=None, update_endpoint=None, skip_charm_build=False + ): self._logger.debug("") if os.path.isdir(filename): - filename = filename.rstrip('/') - filename = self._client.package_tool.build(filename, skip_validation=False, skip_charm_build=skip_charm_build) + filename = filename.rstrip("/") + filename = self._client.package_tool.build( + filename, skip_validation=False, skip_charm_build=skip_charm_build + ) self.create(filename, overwrite=overwrite, update_endpoint=update_endpoint) else: self._client.get_token() mime_type = magic.from_file(filename, mime=True) if mime_type is None: raise ClientException( - "Unexpected MIME type for file {}: MIME type {}".format( - filename, mime_type) - ) - headers= self._client._headers - 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 - #headers['Content-Filename'] = basename(filename) - #file_size = stat(filename).st_size - #headers['Content-Range'] = 'bytes 0-{}/{}'.format(file_size - 1, file_size) + "Unexpected MIME type for file {}: MIME type {}".format( + filename, mime_type + ) + ) + headers = self._client._headers + 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" else: raise ClientException( - "Unexpected MIME type for file {}: MIME type {}".format( - filename, mime_type) - ) + "Unexpected MIME type for file {}: MIME type {}".format( + filename, mime_type + ) + ) headers["Content-File-MD5"] = utils.md5(filename) - http_header = ['{}: {}'.format(key,val) - for (key,val) in list(headers.items())] + http_header = [ + "{}: {}".format(key, val) for (key, val) in list(headers.items()) + ] self._http.set_http_header(http_header) if update_endpoint: - http_code, 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 = '' + ow_string = "" if overwrite: - ow_string = '?{}'.format(overwrite) - self._apiResource = '/ns_descriptors_content' - self._apiBase = '{}{}{}'.format(self._apiName, - 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)) + ow_string = "?{}".format(overwrite) + self._apiResource = "/ns_descriptors_content" + self._apiBase = "{}{}{}".format( + self._apiName, self._apiVersion, self._apiResource + ) + endpoint = "{}{}".format(self._apiBase, ow_string) + http_code, resp = self._http.post_cmd( + endpoint=endpoint, filename=filename + ) + if http_code in (200, 201, 202): 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']) + 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: - # 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)) + print("Updated") def update(self, name, filename): self._logger.debug("") nsd = self.get(name) - endpoint = '{}/{}/nsd_content'.format(self._apiBase, nsd['_id']) + endpoint = "{}/{}/nsd_content".format(self._apiBase, nsd["_id"]) self.create(filename=filename, update_endpoint=endpoint) -