X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fns.py;h=30bbe02b0a2200302b66b4c3ad889e24f2a80f57;hb=6a9fdb5215ac407f2b39cb82194c54926cb2fb8a;hp=99fb83e905fe6633cc67f055c5f5d855afb30b0d;hpb=ce093de18e01ebda56b54c36ab69074cf3761f50;p=osm%2Fosmclient.git

diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py
index 99fb83e..30bbe02 100644
--- a/osmclient/sol005/ns.py
+++ b/osmclient/sol005/ns.py
@@ -111,7 +111,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 = []
@@ -119,7 +119,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:
@@ -145,8 +148,10 @@ class Ns(object):
             self._apiResource = '/ns_instances_content'
             self._apiBase = '{}{}{}'.format(self._apiName,
                                             self._apiVersion, self._apiResource)
-            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(
@@ -173,7 +178,7 @@ class Ns(object):
                 filter_string = '&{}'.format(filter)
             http_code, resp = self._http.get2_cmd('{}?nsInstanceId={}'.format(self._apiBase, ns['_id'],
                                                                   filter_string) )
-            resp = json.loads(resp.decode())
+            resp = json.loads(resp)
             #print 'RESP: {}'.format(resp)
             if http_code == 200:
                 return resp
@@ -194,7 +199,7 @@ class Ns(object):
             self._apiBase = '{}{}{}'.format(self._apiName,
                                       self._apiVersion, self._apiResource)
             http_code, resp = self._http.get2_cmd('{}/{}'.format(self._apiBase, operationId))
-            resp = json.loads(resp.decode())
+            resp = json.loads(resp)
             #print 'RESP: {}'.format(resp)
             if http_code == 200:
                 return resp
@@ -217,7 +222,9 @@ class Ns(object):
             endpoint = '{}/{}/{}'.format(self._apiBase, ns['_id'], op_name)
             #print 'OP_NAME: {}'.format(op_name)
             #print 'OP_DATA: {}'.format(json.dumps(op_data))
-            resp = self._http.post_cmd(endpoint=endpoint, postfields_dict=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(
@@ -230,3 +237,63 @@ class Ns(object):
                     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)
+