X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fnsd.py;h=9adc8f754a3ecd7e0be5dc824cd3995060cd26c6;hb=d8cf387ce15e74c4c13d966ecc146499e2c37684;hp=873be5b3a0d056b46fdd57c8b28fca3f6620ffae;hpb=4cf06fb2ad8d7865227ef9600a11795cbc41d641;p=osm%2Fosmclient.git

diff --git a/osmclient/sol005/nsd.py b/osmclient/sol005/nsd.py
index 873be5b..9adc8f7 100644
--- a/osmclient/sol005/nsd.py
+++ b/osmclient/sol005/nsd.py
@@ -40,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']:
@@ -61,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))
@@ -75,8 +78,8 @@ class Nsd(object):
         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)
+        #print('HTTP CODE: {}'.format(http_code))
+        #print('RESP: {}'.format(resp))
         if http_code in (200, 201, 202, 204):
             if resp:
                 #store in a file
@@ -106,8 +109,8 @@ class Nsd(object):
             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:
@@ -122,6 +125,7 @@ class Nsd(object):
             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(
@@ -157,8 +161,8 @@ 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)
+        #print('HTTP CODE: {}'.format(http_code))
+        #print('RESP: {}'.format(resp))
         if http_code in (200, 201, 202, 204):
             if resp:
                 resp = json.loads(resp)