X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fns.py;h=1165b3de9bbb548931f38342c332241a1edd5a7b;hb=a2999a460707408e636d81fe8e735a7625def0d4;hp=a75513b0d063ab0be24a06055e9382e1269406b5;hpb=09fa3d4dffb1fd9ea427f32a32264dd3bda56543;p=osm%2Fosmclient.git

diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py
index a75513b..1165b3d 100644
--- a/osmclient/sol005/ns.py
+++ b/osmclient/sol005/ns.py
@@ -53,6 +53,7 @@ class Ns(object):
     def list(self, filter=None):
         """Returns a list of NS
         """
+        self._client.get_token()
         filter_string = ''
         if filter:
             filter_string = '?{}'.format(filter)
@@ -64,6 +65,7 @@ class Ns(object):
     def get(self, name):
         """Returns an NS based on name or id
         """
+        self._client.get_token()
         if utils.validate_uuid4(name):
             for ns in self.list():
                 if name == ns['_id']:
@@ -75,6 +77,7 @@ class Ns(object):
         raise NotFound("ns {} not found".format(name))
 
     def get_individual(self, name):
+        self._client.get_token()
         ns_id = name
         if not utils.validate_uuid4(name):
             for ns in self.list():
@@ -118,7 +121,7 @@ class Ns(object):
     def create(self, nsd_name, nsr_name, account, config=None,
                ssh_keys=None, description='default description',
                admin_status='ENABLED', wait=False):
-
+        self._client.get_token()
         nsd = self._client.nsd.get(nsd_name)
 
         vim_account_id = {}
@@ -161,7 +164,7 @@ class Ns(object):
                 with open(pubkeyfile, 'r') as f:
                     ns['ssh_keys'].append(f.read())
         if config:
-            ns_config = yaml.load(config)
+            ns_config = yaml.safe_load(config)
             if "vim-network-name" in ns_config:
                 ns_config["vld"] = ns_config.pop("vim-network-name")
             if "vld" in ns_config:
@@ -239,7 +242,7 @@ class Ns(object):
             message="failed to create ns: {} nsd: {}\nerror:\n{}".format(
                     nsr_name,
                     nsd_name,
-                    exc.message)
+                    str(exc))
             raise ClientException(message)
 
     def list_op(self, name, filter=None):
@@ -276,12 +279,13 @@ class Ns(object):
         except ClientException as exc:
             message="failed to get operation list of NS {}:\nerror:\n{}".format(
                     name,
-                    exc.message)
+                    str(exc))
             raise ClientException(message)
 
     def get_op(self, operationId):
         """Returns the status of an operation
         """
+        self._client.get_token()
         try:
             self._apiResource = '/ns_lcm_op_occs'
             self._apiBase = '{}{}{}'.format(self._apiName,
@@ -307,14 +311,14 @@ class Ns(object):
         except ClientException as exc:
             message="failed to get status of operation {}:\nerror:\n{}".format(
                     operationId,
-                    exc.message)
+                    str(exc))
             raise ClientException(message)
 
-    def exec_op(self, name, op_name, op_data=None, wait=False):
+    def exec_op(self, name, op_name, op_data=None, wait=False, ):
         """Executes an operation on a NS
         """
-        ns = self.get(name)
         try:
+            ns = self.get(name)
             self._apiResource = '/ns_instances'
             self._apiBase = '{}{}{}'.format(self._apiName,
                                             self._apiVersion, self._apiResource)
@@ -334,7 +338,7 @@ class Ns(object):
                     # Wait for status for NS instance action
                     # For the 'action' operation, 'id' is used
                     self._wait(resp.get('id'))
-                print(resp['id'])
+                return resp['id']
             else:
                 msg = ""
                 if resp:
@@ -346,12 +350,13 @@ class Ns(object):
         except ClientException as exc:
             message="failed to exec operation {}:\nerror:\n{}".format(
                     name,
-                    exc.message)
+                    str(exc))
             raise ClientException(message)
 
     def scale_vnf(self, ns_name, vnf_name, scaling_group, scale_in, scale_out, wait=False):
         """Scales a VNF by adding/removing VDUs
         """
+        self._client.get_token()
         try:
             op_data={}
             op_data["scaleType"] = "SCALE_VNF"
@@ -364,13 +369,15 @@ class Ns(object):
                 "member-vnf-index": vnf_name,
                 "scaling-group-descriptor": scaling_group,
             }
-            self.exec_op(ns_name, op_name='scale', op_data=op_data, wait=wait)
+            op_id = self.exec_op(ns_name, op_name='scale', op_data=op_data, wait=wait)
+            print(str(op_id))
         except ClientException as exc:
             message="failed to scale vnf {} of ns {}:\nerror:\n{}".format(
-                    vnf_name, ns_name, exc.message)
+                    vnf_name, ns_name, str(exc))
             raise ClientException(message)
 
     def create_alarm(self, alarm):
+        self._client.get_token()
         data = {}
         data["create_alarm_request"] = {}
         data["create_alarm_request"]["alarm_create_request"] = alarm
@@ -394,10 +401,11 @@ class Ns(object):
         except ClientException as exc:
             message="failed to create alarm: alarm {}\n{}".format(
                     alarm,
-                    exc.message)
+                    str(exc))
             raise ClientException(message)
 
     def delete_alarm(self, name):
+        self._client.get_token()
         data = {}
         data["delete_alarm_request"] = {}
         data["delete_alarm_request"]["alarm_delete_request"] = {}
@@ -422,10 +430,11 @@ class Ns(object):
         except ClientException as exc:
             message="failed to delete alarm: alarm {}\n{}".format(
                     name,
-                    exc.message)
+                    str(exc))
             raise ClientException(message)
 
     def export_metric(self, metric):
+        self._client.get_token()
         data = {}
         data["read_metric_data_request"] = metric
         try:
@@ -448,7 +457,7 @@ class Ns(object):
         except ClientException as exc:
             message="failed to export metric: metric {}\n{}".format(
                     metric,
-                    exc.message)
+                    str(exc))
             raise ClientException(message)
 
     def get_field(self, ns_name, field):