X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fnsd.py;fp=osmclient%2Fsol005%2Fnsd.py;h=bf91ca6e34f61207ca22f42476248f46177f7078;hb=6bc001c642c74e6742d0a5dd5922738ae4c4fb0d;hp=9adc8f754a3ecd7e0be5dc824cd3995060cd26c6;hpb=43e9684cc5f12d9cf47f0bd45f9c9b26d9ce0a26;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/nsd.py b/osmclient/sol005/nsd.py index 9adc8f7..bf91ca6 100644 --- a/osmclient/sol005/nsd.py +++ b/osmclient/sol005/nsd.py @@ -24,6 +24,7 @@ from osmclient.common import utils import json import magic from os.path import basename +import logging #from os import stat @@ -32,6 +33,7 @@ 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' @@ -40,6 +42,7 @@ class Nsd(object): #self._apiBase='/nsds' def list(self, filter=None): + self._logger.debug("") self._client.get_token() filter_string = '' if filter: @@ -51,6 +54,7 @@ class Nsd(object): return list() def get(self, name): + self._logger.debug("") self._client.get_token() if utils.validate_uuid4(name): for nsd in self.list(): @@ -63,7 +67,8 @@ 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. + 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 @@ -74,6 +79,8 @@ class Nsd(object): 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' @@ -94,15 +101,19 @@ class Nsd(object): 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: @@ -125,6 +136,7 @@ class Nsd(object): raise ClientException("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: @@ -182,6 +194,7 @@ class Nsd(object): 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)