X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fnst.py;h=19092b218e9c554d50d21b11fac143566f1349b4;hb=4054a86e8a9e206b36c53d84d67035646f0beee9;hp=b7c67be1014795591082bb299088792319a95e25;hpb=3f592284d97ed71e8d7bab435586f12623691e47;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/nst.py b/osmclient/sol005/nst.py index b7c67be..19092b2 100644 --- a/osmclient/sol005/nst.py +++ b/osmclient/sol005/nst.py @@ -23,157 +23,216 @@ from osmclient.common.exceptions import ClientException from osmclient.common import utils import json import magic -#from os import stat -#from os.path import basename +import logging +import os.path + +# from os import stat +# from os.path import basename -class Nst(object): +class Nst(object): def __init__(self, http=None, client=None): self._http = http self._client = client - self._apiName = '/nst' - self._apiVersion = '/v1' - self._apiResource = '/netslice_templates' - self._apiBase = '{}{}{}'.format(self._apiName, - self._apiVersion, self._apiResource) + self._logger = logging.getLogger("osmclient") + self._apiName = "/nst" + self._apiVersion = "/v1" + self._apiResource = "/netslice_templates" + self._apiBase = "{}{}{}".format( + self._apiName, self._apiVersion, self._apiResource + ) def list(self, filter=None): - filter_string = '' + self._logger.debug("") + 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) + filter_string = "?{}".format(filter) + _, resp = self._http.get2_cmd("{}{}".format(self._apiBase, filter_string)) + # print(yaml.safe_dump(resp)) if resp: - return resp + return json.loads(resp) return list() def get(self, name): + self._logger.debug("") + self._client.get_token() if utils.validate_uuid4(name): for nst in self.list(): - if name == nst['_id']: + if name == nst["_id"]: return nst else: for nst in self.list(): - if 'name' in nst and name == nst['name']: + if "name" in nst and name == nst["name"]: return nst raise NotFound("nst {} not found".format(name)) def get_individual(self, name): + self._logger.debug("") nst = self.get(name) # It is redundant, since the previous one already gets the whole nstinfo # The only difference is that a different primitive is exercised - resp = self._http.get_cmd('{}/{}'.format(self._apiBase, nst['_id'])) - #print yaml.safe_dump(resp) - if resp: - return resp - raise NotFound("nst {} not found".format(name)) + try: + _, resp = self._http.get2_cmd("{}/{}".format(self._apiBase, nst["_id"])) + # print(yaml.safe_dump(resp)) + if resp: + return json.loads(resp) + except NotFound: + raise NotFound("nst '{}' not found".format(name)) + raise NotFound("nst '{}' not found".format(name)) def get_thing(self, name, thing, filename): + self._logger.debug("") nst = self.get(name) headers = self._client._headers - headers['Accept'] = 'application/binary' - http_code, resp = self._http.get2_cmd('{}/{}/{}'.format(self._apiBase, nst['_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)) + headers["Accept"] = "application/binary" + try: + http_code, resp = self._http.get2_cmd( + "{}/{}/{}".format(self._apiBase, nst["_id"], thing) + ) + except NotFound: + raise NotFound("nst '{} 'not found".format(name)) + # 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 json.loads(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, 'nst', filename) + self._logger.debug("") + self.get_thing(name, "nst", filename) def get_package(self, name, filename): - self.get_thing(name, 'nst_content', filename) + self._logger.debug("") + self.get_thing(name, "nst_content", filename) def get_artifact(self, name, artifact, filename): - self.get_thing(name, 'artifacts/{}'.format(artifact), filename) + self._logger.debug("") + self.get_thing(name, "artifacts/{}".format(artifact), filename) def delete(self, name, force=False): + self._logger.debug("") nst = self.get(name) - querystring = '' + querystring = "" if force: - querystring = '?FORCE=True' - http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase, - nst['_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, nst["_id"], querystring) + ) + # print('HTTP CODE: {}'.format(http_code)) + # print('RESP: {}'.format(resp)) if http_code == 202: - print('Deletion in progress') + print("Deletion in progress") elif http_code == 204: - print('Deleted') + print("Deleted") else: - msg = "" - if resp: - try: - resp = json.loads(resp) - except ValueError: - msg = resp + msg = resp or "" + # if resp: + # try: + # resp = json.loads(resp) + # except ValueError: + # msg = resp raise ClientException("failed to delete nst {} - {}".format(name, msg)) def create(self, filename, overwrite=None, update_endpoint=None): - 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 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) - else: - raise ClientException( - "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())] - self._http.set_http_header(http_header) - if update_endpoint: - http_code, resp = self._http.put_cmd(endpoint=update_endpoint, filename=filename) + self._logger.debug("") + if os.path.isdir(filename): + charm_folder = filename.rstrip("/") + for files in os.listdir(charm_folder): + if "nst.yaml" in files: + results = self._client.package_tool.validate( + charm_folder, recursive=False + ) + for result in results: + if result["valid"] != "OK": + raise ClientException( + "There was an error validating the file: {} " + "with error: {}".format(result["path"], result["error"]) + ) + result = self._client.package_tool.build(charm_folder) + if "Created" in result: + filename = "{}.tar.gz".format(charm_folder) + else: + raise ClientException( + "Failed in {}tar.gz creation".format(charm_folder) + ) + self.create(filename, overwrite, update_endpoint) else: - ow_string = '' - if overwrite: - ow_string = '?{}'.format(overwrite) - self._apiResource = '/netslice_templates_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) - if http_code in (200, 201, 202, 204): + 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 + if mime_type in ["application/yaml", "text/plain"]: + headers["Content-Type"] = "application/yaml" + 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) + else: + raise ClientException( + "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()) + ] + self._http.set_http_header(http_header) + if update_endpoint: + http_code, resp = self._http.put_cmd( + endpoint=update_endpoint, filename=filename + ) + else: + ow_string = "" + if overwrite: + ow_string = "?{}".format(overwrite) + self._apiResource = "/netslice_templates_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)) + # 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 = "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 nst - {}".format(msg)) + if not resp or "id" not in resp: + raise ClientException( + "unexpected response from server - {}".format(resp) + ) + print(resp["id"]) + # 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 nst - {}".format(msg)) def update(self, name, filename): + self._logger.debug("") nst = self.get(name) - endpoint = '{}/{}/netslice_templates_content'.format(self._apiBase, nst['_id']) + endpoint = "{}/{}/nst_content".format(self._apiBase, nst["_id"]) self.create(filename=filename, update_endpoint=endpoint) -