X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fns.py;h=387bcd573bbf89c1f6a74504d7bd2b8d1d3a64a7;hb=5b342f49c7a37323a79b11e51e745c5a1a8f2439;hp=590cdb1676c138aec8cf2f0e6609e496336a6f85;hpb=74341f044cb996f8002ba8f66f4ab0de765098a3;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py index 590cdb1..387bcd5 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): @@ -73,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' + print('Deletion in progress') elif http_code == 204: - print 'Deleted' + 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', @@ -110,15 +122,12 @@ 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 = [] - # for key in ssh_keys.split(','): - # ssh_keys_format.append({'key-pair-ref': key}) - # - # ns['ssh-authorized-key'] = ssh_keys_format - ns['ssh-authorized-key'] = ssh_keys.split(',') + ns['ssh_keys'] = [] + for pubkeyfile in ssh_keys.split(','): + with open(pubkeyfile, 'r') as f: + ns['ssh_keys'].append(f.read()) if config: ns_config = yaml.load(config) if "vim-network-name" in ns_config: @@ -128,7 +137,7 @@ class Ns(object): if vld.get("vim-network-name"): if isinstance(vld["vim-network-name"], dict): vim_network_name_dict = {} - for vim_account, vim_net in vld["vim-network-name"].items(): + for vim_account, vim_net in list(vld["vim-network-name"].items()): vim_network_name_dict[get_vim_account_id(vim_account)] = vim_net vld["vim-network-name"] = vim_network_name_dict ns["vld"] = ns_config["vld"] @@ -144,14 +153,30 @@ 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, + headers = self._client._headers + headers['Content-Type'] = 'application/yaml' + http_header = ['{}: {}'.format(key,val) + for (key,val) in list(headers.items())] + self._http.set_http_header(http_header) + http_code, resp = self._http.post_cmd(endpoint=self._apiBase, postfields_dict=ns) - if not resp or 'id' not in resp: - raise ClientException('unexpected response from server: '.format( + #print 'HTTP CODE: {}'.format(http_code) + #print 'RESP: {}'.format(resp) + 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)) + return resp['id'] else: - print resp['id'] + 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, @@ -159,3 +184,196 @@ 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) ) + #print 'HTTP CODE: {}'.format(http_code) + #print 'RESP: {}'.format(resp) + if http_code == 200: + if resp: + resp = json.loads(resp) + return resp + else: + raise ClientException('unexpected response from server') + else: + 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, + 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)) + #print 'HTTP CODE: {}'.format(http_code) + #print 'RESP: {}'.format(resp) + if http_code == 200: + if resp: + resp = json.loads(resp) + return resp + else: + raise ClientException('unexpected response from server') + else: + 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, + 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) + #print 'HTTP CODE: {}'.format(http_code) + #print 'RESP: {}'.format(resp) + 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)) + 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( + name, + 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) + + def get_field(self, ns_name, field): + nsr = self.get(ns_name) + if nsr is None: + raise NotFound("failed to retrieve ns {}".format(ns_name)) + + if field in nsr: + return nsr[field] + + raise NotFound("failed to find {} in ns {}".format(field, ns_name))