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'
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(
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
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
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(
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:
- resp = self._http.post_cmd(endpoint='/test/message/alarm_request',
+ http_code, resp = self._http.post_cmd(endpoint='/test/message/alarm_request',
postfields_dict=data)
- #print 'RESP: {}'.format(resp)
- if not resp:
- raise ClientException('unexpected response from server: '.format(
- resp))
- print 'Alarm created'
+ 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,
data["delete_alarm_request"]["alarm_delete_request"] = {}
data["delete_alarm_request"]["alarm_delete_request"]["alarm_uuid"] = name
try:
- resp = self._http.post_cmd(endpoint='/test/message/alarm_request',
+ http_code, resp = self._http.post_cmd(endpoint='/test/message/alarm_request',
postfields_dict=data)
- #print 'RESP: {}'.format(resp)
- if not resp:
- raise ClientException('unexpected response from server: '.format(
- resp))
- print 'Alarm deleted'
+ 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,
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:
- resp = self._http.post_cmd(endpoint='/test/message/metric_request',
+ http_code, resp = self._http.post_cmd(endpoint='/test/message/metric_request',
postfields_dict=data)
- #print 'RESP: {}'.format(resp)
- if not resp:
- raise ClientException('unexpected response from server: '.format(
- resp))
- print 'Metric exported'
+ 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,