X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fnsd.py;h=a2a19028595aa473d9fd8d0027400abd3c08fa3f;hb=70d6f1843686f323ced68a253127fedde86a1c25;hp=63308d6c5e63d1de0525a3bce3662f194ca1464b;hpb=119f79ff8103018c12d9f3f5083a97e5a34aecba;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/nsd.py b/osmclient/sol005/nsd.py index 63308d6..a2a1902 100644 --- a/osmclient/sol005/nsd.py +++ b/osmclient/sol005/nsd.py @@ -20,17 +20,21 @@ OSM nsd API handling from osmclient.common.exceptions import NotFound from osmclient.common.exceptions import ClientException +from osmclient.common.exceptions import OsmHttpException from osmclient.common import utils import json import magic +from os.path import basename +import logging #from os import stat -#from os.path import basename + 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' @@ -39,16 +43,20 @@ class Nsd(object): #self._apiBase='/nsds' def list(self, filter=None): + 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) + _, 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 nsd in self.list(): if name == nsd['_id']: @@ -60,53 +68,61 @@ class Nsd(object): raise NotFound("nsd {} not found".format(name)) def get_individual(self, name): + self._logger.debug("") + # Call 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) + _, resp = self._http.get2_cmd('{}/{}'.format(self._apiBase, nsd['_id'])) + #print(yaml.safe_dump(resp)) if resp: - return resp + return json.loads(resp) raise NotFound("nsd {} not found".format(name)) def get_thing(self, name, thing, filename): + self._logger.debug("") + # 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): - 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)) + #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._logger.debug("") self.get_thing(name, 'nsd', filename) def get_package(self, name, filename): + self._logger.debug("") 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) def delete(self, name, force=False): + self._logger.debug("") nsd = self.get(name) 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) + #print('HTTP CODE: {}'.format(http_code)) + #print('RESP: {}'.format(resp)) if http_code == 202: print('Deletion in progress') elif http_code == 204: @@ -115,19 +131,22 @@ 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)) + raise OsmHttpException("failed to delete nsd {} - {}".format(name, msg)) def create(self, filename, overwrite=None, update_endpoint=None): + self._logger.debug("") + 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' + 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' @@ -155,25 +174,27 @@ 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) - if http_code in (200, 201, 202, 204): + #print('HTTP CODE: {}'.format(http_code)) + #print('RESP: {}'.format(resp)) + 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)) + raise OsmHttpException('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 nsd - {}".format(msg)) + 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)) def update(self, name, filename): + self._logger.debug("") nsd = self.get(name) endpoint = '{}/{}/nsd_content'.format(self._apiBase, nsd['_id']) self.create(filename=filename, update_endpoint=endpoint)