X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fns.py;h=945e6221218e158f88c691540f09e3206151fe92;hb=93b9862dd5092327dab103ce44cf27bb89606b69;hp=cdb6bd80bc08a2d93d7d74c24fac935bb4a71a3e;hpb=18e271cc1982a6d36032bd413d970fabe711e262;p=osm%2Fosmclient.git

diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py
index cdb6bd8..945e622 100644
--- a/osmclient/sol005/ns.py
+++ b/osmclient/sol005/ns.py
@@ -148,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(
@@ -176,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
@@ -197,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
@@ -220,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(
@@ -233,3 +237,69 @@ class Ns(object):
                     exc.message)
             raise ClientException(message)
 
+    def create_alarm(self, alarm):
+        ns = self.get(alarm['ns_name'])
+        alarm['ns_id'] = ns['_id']
+        alarm.pop('ns_name')
+        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 resp:
+                resp = json.loads(resp)
+            #print 'RESP: {}'.format(resp)
+            if not resp:
+                raise ClientException('unexpected response from server: '.format(
+                                      resp))
+            print 'Alarm created'
+        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 resp:
+                resp = json.loads(resp)
+            #print 'RESP: {}'.format(resp)
+            if not resp:
+                raise ClientException('unexpected response from server: '.format(
+                                      resp))
+            print 'Alarm deleted'
+        except ClientException as exc:
+            message="failed to delete alarm: alarm {}\nerror:\n{}".format(
+                    alarm,
+                    exc.message)
+            raise ClientException(message)
+
+    def export_metric(self, metric):
+        ns = self.get(metric['ns_name'])
+        metric['ns_id'] = ns['_id']
+        metric.pop('ns_name')
+        data = {}
+        data["read_metric_data_request"] = metric
+        try:
+            http_code, resp = self._http.post_cmd(endpoint='/test/message/metric_request',
+                                       postfields_dict=data)
+            if resp:
+                resp = json.loads(resp)
+            #print 'RESP: {}'.format(resp)
+            if not resp:
+                raise ClientException('unexpected response from server: '.format(
+                                      resp))
+            print 'Metric exported'
+        except ClientException as exc:
+            message="failed to export metric: metric {}\nerror:\n{}".format(
+                    metric,
+                    exc.message)
+            raise ClientException(message)
+