X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fns.py;h=ebb779c67583da9b33cc7506197ec56a72db06f7;hb=98213d0b29e9a26d113eaced1e0975a1d2ce833c;hp=590cdb1676c138aec8cf2f0e6609e496336a6f85;hpb=74341f044cb996f8002ba8f66f4ab0de765098a3;p=osm%2Fosmclient.git

diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py
index 590cdb1..ebb779c 100644
--- a/osmclient/sol005/ns.py
+++ b/osmclient/sol005/ns.py
@@ -22,6 +22,7 @@ from osmclient.common import utils
 from osmclient.common.exceptions import ClientException
 from osmclient.common.exceptions import NotFound
 import yaml
+import json
 
 
 class Ns(object):
@@ -76,6 +77,8 @@ class Ns(object):
     def delete(self, name):
         ns = self.get(name)
         http_code, resp = self._http.delete_cmd('{}/{}'.format(self._apiBase,ns['_id']))
+        if resp:
+            resp = json.loads(resp)
         #print 'RESP: {}'.format(resp)
         if http_code == 202:
             print 'Deletion in progress'
@@ -110,7 +113,7 @@ class Ns(object):
         #ns['userdata'] = {}
         #ns['userdata']['key1']='value1'
         #ns['userdata']['key2']='value2'
-        
+
         if ssh_keys is not None:
             # ssh_keys is comma separate list
             # ssh_keys_format = []
@@ -118,7 +121,10 @@ class Ns(object):
             #     ssh_keys_format.append({'key-pair-ref': key})
             #
             # ns['ssh-authorized-key'] = ssh_keys_format
-            ns['ssh-authorized-key'] = ssh_keys.split(',')
+            ns['ssh-authorized-key'] = []
+            for pubkeyfile in ssh_keys.split(','):
+                with open(pubkeyfile, 'r') as f:
+                    ns['ssh-authorized-key'].append(f.read())
         if config:
             ns_config = yaml.load(config)
             if "vim-network-name" in ns_config:
@@ -144,9 +150,11 @@ class Ns(object):
             self._apiResource = '/ns_instances_content'
             self._apiBase = '{}{}{}'.format(self._apiName,
                                             self._apiVersion, self._apiResource)
-            #print resp
-            resp = self._http.post_cmd(endpoint=self._apiBase,
+            http_code, resp = self._http.post_cmd(endpoint=self._apiBase,
                                        postfields_dict=ns)
+            if resp:
+                resp = json.loads(resp)
+            #print 'RESP: {}'.format(resp)
             if not resp or 'id' not in resp:
                 raise ClientException('unexpected response from server: '.format(
                                       resp))
@@ -159,3 +167,135 @@ class Ns(object):
                     exc.message)
             raise ClientException(message)
 
+    def list_op(self, name, filter=None):
+        """Returns the list of operations of a NS
+        """
+        ns = self.get(name)
+        try:
+            self._apiResource = '/ns_lcm_op_occs'
+            self._apiBase = '{}{}{}'.format(self._apiName,
+                                      self._apiVersion, self._apiResource)
+            filter_string = ''
+            if filter:
+                filter_string = '&{}'.format(filter)
+            http_code, resp = self._http.get2_cmd('{}?nsInstanceId={}'.format(self._apiBase, ns['_id'],
+                                                                  filter_string) )
+            resp = json.loads(resp)
+            #print 'RESP: {}'.format(resp)
+            if http_code == 200:
+                return resp
+            else:
+                raise ClientException('{}'.format(resp['detail']))
+
+        except ClientException as exc:
+            message="failed to get operation list of NS {}:\nerror:\n{}".format(
+                    name,
+                    exc.message)
+            raise ClientException(message)
+
+    def get_op(self, operationId):
+        """Returns the status of an operation
+        """
+        try:
+            self._apiResource = '/ns_lcm_op_occs'
+            self._apiBase = '{}{}{}'.format(self._apiName,
+                                      self._apiVersion, self._apiResource)
+            http_code, resp = self._http.get2_cmd('{}/{}'.format(self._apiBase, operationId))
+            resp = json.loads(resp)
+            #print 'RESP: {}'.format(resp)
+            if http_code == 200:
+                return resp
+            else:
+                raise ClientException("{}".format(resp['detail']))
+        except ClientException as exc:
+            message="failed to get status of operation {}:\nerror:\n{}".format(
+                    operationId,
+                    exc.message)
+            raise ClientException(message)
+
+    def exec_op(self, name, op_name, op_data=None):
+        """Executes an operation on a NS
+        """
+        ns = self.get(name)
+        try:
+            self._apiResource = '/ns_instances'
+            self._apiBase = '{}{}{}'.format(self._apiName,
+                                            self._apiVersion, self._apiResource)
+            endpoint = '{}/{}/{}'.format(self._apiBase, ns['_id'], op_name)
+            #print 'OP_NAME: {}'.format(op_name)
+            #print 'OP_DATA: {}'.format(json.dumps(op_data))
+            http_code, resp = self._http.post_cmd(endpoint=endpoint, postfields_dict=op_data)
+            if resp:
+                resp = json.loads(resp)
+            #print 'RESP: {}'.format(resp)
+            if not resp or 'id' not in resp:
+                raise ClientException('unexpected response from server: '.format(
+                                      resp))
+            else:
+                print resp['id']
+        except ClientException as exc:
+            message="failed to exec operation {}:\nerror:\n{}".format(
+                    name,
+                    exc.message)
+            raise ClientException(message)
+
+    def create_alarm(self, alarm):
+        data = {}
+        data["create_alarm_request"] = {}
+        data["create_alarm_request"]["alarm_create_request"] = alarm
+        try:
+            http_code, resp = self._http.post_cmd(endpoint='/test/message/alarm_request',
+                                       postfields_dict=data)
+            if http_code in (200, 201, 202, 204):
+                #resp = json.loads(resp)
+                #print 'RESP: {}'.format(resp)
+                print 'Alarm created'
+            else:
+                raise ClientException('unexpected response from server: code: {}, resp: {}'.format(
+                                      http_code, resp))
+        except ClientException as exc:
+            message="failed to create alarm: alarm {}\nerror:\n{}".format(
+                    alarm,
+                    exc.message)
+            raise ClientException(message)
+
+    def delete_alarm(self, name):
+        data = {}
+        data["delete_alarm_request"] = {}
+        data["delete_alarm_request"]["alarm_delete_request"] = {}
+        data["delete_alarm_request"]["alarm_delete_request"]["alarm_uuid"] = name
+        try:
+            http_code, resp = self._http.post_cmd(endpoint='/test/message/alarm_request',
+                                       postfields_dict=data)
+            if http_code in (200, 201, 202, 204):
+                #resp = json.loads(resp)
+                #print 'RESP: {}'.format(resp)
+                print 'Alarm deleted'
+            else:
+                raise ClientException('unexpected response from server: code: {}, resp: {}'.format(
+                                      http_code, resp))
+        except ClientException as exc:
+            message="failed to delete alarm: alarm {}\nerror:\n{}".format(
+                    alarm,
+                    exc.message)
+            raise ClientException(message)
+
+    def export_metric(self, metric):
+        data = {}
+        data["read_metric_data_request"] = metric
+        try:
+            http_code, resp = self._http.post_cmd(endpoint='/test/message/metric_request',
+                                       postfields_dict=data)
+            if http_code in (200, 201, 202, 204):
+                #resp = json.loads(resp)
+                #print 'RESP: {}'.format(resp)
+                return 'Metric exported'
+            else:
+                raise ClientException('unexpected response from server: code: {}, resp: {}'.format(
+                                      http_code, resp))
+        except ClientException as exc:
+            message="failed to export metric: metric {}\nerror:\n{}".format(
+                    metric,
+                    exc.message)
+            raise ClientException(message)
+