X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fns.py;h=75cdf3f8adc2a888fc816a8ea0fdb9ab58a37231;hb=061856b26ecc63183378489fa7eb6ed5a6f0250f;hp=cdb6bd80bc08a2d93d7d74c24fac935bb4a71a3e;hpb=4f9d2874c732a12776c3723e9862a7c81e901d68;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py index cdb6bd8..75cdf3f 100644 --- a/osmclient/sol005/ns.py +++ b/osmclient/sol005/ns.py @@ -74,16 +74,27 @@ class Ns(object): return resp raise NotFound("ns {} not found".format(name)) - def delete(self, name): + def delete(self, name, force=False): ns = self.get(name) - http_code, resp = self._http.delete_cmd('{}/{}'.format(self._apiBase,ns['_id'])) + querystring = '' + if force: + querystring = '?FORCE=True' + http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase, + ns['_id'], querystring)) + #print 'HTTP CODE: {}'.format(http_code) #print 'RESP: {}'.format(resp) if http_code == 202: print 'Deletion in progress' elif http_code == 204: print 'Deleted' else: - raise ClientException("failed to delete ns {}: {}".format(name, resp)) + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException("failed to delete ns {} - {}".format(name, msg)) def create(self, nsd_name, nsr_name, account, config=None, ssh_keys=None, description='default description', @@ -148,14 +159,25 @@ 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) + #print 'HTTP CODE: {}'.format(http_code) #print 'RESP: {}'.format(resp) - if not resp or 'id' not in resp: - raise ClientException('unexpected response from server: '.format( + if http_code in (200, 201, 202, 204): + if resp: + resp = json.loads(resp) + if not resp or 'id' not in resp: + raise ClientException('unexpected response from server - {} '.format( resp)) - else: print resp['id'] + else: + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException(msg) except ClientException as exc: message="failed to create ns: {} nsd: {}\nerror:\n{}".format( nsr_name, @@ -174,15 +196,26 @@ class Ns(object): 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.decode()) + http_code, resp = self._http.get2_cmd('{}?nsInstanceId={}'.format( + self._apiBase, ns['_id'], + filter_string) ) + #print 'HTTP CODE: {}'.format(http_code) #print 'RESP: {}'.format(resp) if http_code == 200: - return resp + if resp: + resp = json.loads(resp) + return resp + else: + raise ClientException('unexpected response from server') else: - raise ClientException('{}'.format(resp['detail'])) - + msg = "" + if resp: + try: + resp = json.loads(resp) + msg = resp['detail'] + except ValueError: + msg = resp + raise ClientException(msg) except ClientException as exc: message="failed to get operation list of NS {}:\nerror:\n{}".format( name, @@ -197,12 +230,23 @@ 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()) + #print 'HTTP CODE: {}'.format(http_code) #print 'RESP: {}'.format(resp) if http_code == 200: - return resp + if resp: + resp = json.loads(resp) + return resp + else: + raise ClientException('unexpected response from server') else: - raise ClientException("{}".format(resp['detail'])) + msg = "" + if resp: + try: + resp = json.loads(resp) + msg = resp['detail'] + except ValueError: + msg = resp + raise ClientException(msg) except ClientException as exc: message="failed to get status of operation {}:\nerror:\n{}".format( operationId, @@ -220,16 +264,108 @@ 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) + #print 'HTTP CODE: {}'.format(http_code) #print 'RESP: {}'.format(resp) - if not resp or 'id' not in resp: - raise ClientException('unexpected response from server: '.format( + if http_code in (200, 201, 202, 204): + if resp: + resp = json.loads(resp) + if not resp or 'id' not in resp: + raise ClientException('unexpected response from server - {}'.format( resp)) - else: print resp['id'] + else: + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException(msg) 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) + #print 'HTTP CODE: {}'.format(http_code) + #print 'RESP: {}'.format(resp) + if http_code in (200, 201, 202, 204): + #resp = json.loads(resp) + print 'Alarm created' + else: + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException('error: code: {}, resp: {}'.format( + http_code, msg)) + except ClientException as exc: + message="failed to create alarm: alarm {}\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) + #print 'HTTP CODE: {}'.format(http_code) + #print 'RESP: {}'.format(resp) + if http_code in (200, 201, 202, 204): + #resp = json.loads(resp) + print 'Alarm deleted' + else: + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException('error: code: {}, resp: {}'.format( + http_code, msg)) + except ClientException as exc: + message="failed to delete alarm: alarm {}\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) + #print 'HTTP CODE: {}'.format(http_code) + #print 'RESP: {}'.format(resp) + if http_code in (200, 201, 202, 204): + #resp = json.loads(resp) + return 'Metric exported' + else: + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException('error: code: {}, resp: {}'.format( + http_code, msg)) + except ClientException as exc: + message="failed to export metric: metric {}\n{}".format( + metric, + exc.message) + raise ClientException(message) +