X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fns.py;h=1165b3de9bbb548931f38342c332241a1edd5a7b;hb=e79f0cafb1e4f8b065708187c6dd0f58b56a2aeb;hp=99fb83e905fe6633cc67f055c5f5d855afb30b0d;hpb=ce093de18e01ebda56b54c36ab69074cf3761f50;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py index 99fb83e..1165b3d 100644 --- a/osmclient/sol005/ns.py +++ b/osmclient/sol005/ns.py @@ -19,6 +19,7 @@ OSM ns API handling """ from osmclient.common import utils +from osmclient.common import wait as WaitForStatus from osmclient.common.exceptions import ClientException from osmclient.common.exceptions import NotFound import yaml @@ -36,9 +37,23 @@ class Ns(object): self._apiBase = '{}{}{}'.format(self._apiName, self._apiVersion, self._apiResource) + # NS '--wait' option + def _wait(self, id, deleteFlag=False): + # Endpoint to get operation status + apiUrlStatus = '{}{}{}'.format(self._apiName, self._apiVersion, '/ns_lcm_op_occs') + # Wait for status for NS instance creation/update/deletion + WaitForStatus.wait_for_status( + 'NS', + str(id), + WaitForStatus.TIMEOUT_NS_OPERATION, + apiUrlStatus, + self._http.get2_cmd, + deleteFlag=deleteFlag) + def list(self, filter=None): """Returns a list of NS """ + self._client.get_token() filter_string = '' if filter: filter_string = '?{}'.format(filter) @@ -50,6 +65,7 @@ class Ns(object): def get(self, name): """Returns an NS based on name or id """ + self._client.get_token() if utils.validate_uuid4(name): for ns in self.list(): if name == ns['_id']: @@ -61,6 +77,7 @@ class Ns(object): raise NotFound("ns {} not found".format(name)) def get_individual(self, name): + self._client.get_token() ns_id = name if not utils.validate_uuid4(name): for ns in self.list(): @@ -69,29 +86,46 @@ class Ns(object): break resp = self._http.get_cmd('{}/{}'.format(self._apiBase, ns_id)) #resp = self._http.get_cmd('{}/{}/nsd_content'.format(self._apiBase, ns_id)) - #print yaml.safe_dump(resp) + #print(yaml.safe_dump(resp)) if resp: return resp raise NotFound("ns {} not found".format(name)) - def delete(self, name): + def delete(self, name, force=False, wait=False): ns = self.get(name) - http_code, resp = self._http.delete_cmd('{}/{}'.format(self._apiBase,ns['_id'])) - #print 'RESP: {}'.format(resp) + 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' + if wait and resp: + resp = json.loads(resp) + # For the 'delete' operation, '_id' is used + self._wait(resp.get('_id'), deleteFlag=True) + else: + 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', - admin_status='ENABLED'): - + admin_status='ENABLED', wait=False): + self._client.get_token() nsd = self._client.nsd.get(nsd_name) vim_account_id = {} + wim_account_id = {} def get_vim_account_id(vim_account): if vim_account_id.get(vim_account): @@ -103,6 +137,18 @@ class Ns(object): vim_account_id[vim_account] = vim['_id'] return vim['_id'] + def get_wim_account_id(wim_account): + if not isinstance(wim_account, str): + return wim_account + if wim_account_id.get(wim_account): + return wim_account_id[wim_account] + + wim = self._client.wim.get(wim_account) + if wim is None: + raise NotFound("cannot find wim account '{}'".format(wim_account)) + wim_account_id[wim_account] = wim['_id'] + return wim['_id'] + ns = {} ns['nsdId'] = nsd['_id'] ns['nsName'] = nsr_name @@ -111,17 +157,14 @@ 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) + ns_config = yaml.safe_load(config) if "vim-network-name" in ns_config: ns_config["vld"] = ns_config.pop("vim-network-name") if "vld" in ns_config: @@ -129,35 +172,77 @@ 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 + if "wim_account" in vld and vld["wim_account"] is not None: + vld["wimAccountId"] = get_wim_account_id(vld.pop("wim_account")) ns["vld"] = ns_config["vld"] if "vnf" in ns_config: for vnf in ns_config["vnf"]: if vnf.get("vim_account"): vnf["vimAccountId"] = get_vim_account_id(vnf.pop("vim_account")) - ns["vnf"] = ns_config["vnf"] - #print yaml.safe_dump(ns) + if "additionalParamsForNs" in ns_config: + ns["additionalParamsForNs"] = ns_config.pop("additionalParamsForNs") + if not isinstance(ns["additionalParamsForNs"], dict): + raise ValueError("Error at --config 'additionalParamsForNs' must be a dictionary") + if "additionalParamsForVnf" in ns_config: + ns["additionalParamsForVnf"] = ns_config.pop("additionalParamsForVnf") + if not isinstance(ns["additionalParamsForVnf"], list): + raise ValueError("Error at --config 'additionalParamsForVnf' must be a list") + for additional_param_vnf in ns["additionalParamsForVnf"]: + if not isinstance(additional_param_vnf, dict): + raise ValueError("Error at --config 'additionalParamsForVnf' items must be dictionaries") + if not additional_param_vnf.get("member-vnf-index"): + raise ValueError("Error at --config 'additionalParamsForVnf' items must contain " + "'member-vnf-index'") + if not additional_param_vnf.get("additionalParams"): + raise ValueError("Error at --config 'additionalParamsForVnf' items must contain " + "'additionalParams'") + if "wim_account" in ns_config: + wim_account = ns_config.pop("wim_account") + if wim_account is not None: + ns['wimAccountId'] = get_wim_account_id(wim_account) + + # print(yaml.safe_dump(ns)) try: self._apiResource = '/ns_instances_content' self._apiBase = '{}{}{}'.format(self._apiName, self._apiVersion, self._apiResource) - 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) - #print 'RESP: {}'.format(resp) - 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)) + if wait: + # Wait for status for NS instance creation + self._wait(resp.get('nslcmop_id')) + 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, nsd_name, - exc.message) + str(exc)) raise ClientException(message) def list_op(self, name, filter=None): @@ -171,62 +256,217 @@ 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()) - #print 'RESP: {}'.format(resp) + 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, - exc.message) + str(exc)) raise ClientException(message) def get_op(self, operationId): """Returns the status of an operation """ + self._client.get_token() 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)) - resp = json.loads(resp.decode()) - #print 'RESP: {}'.format(resp) + #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, - exc.message) + str(exc)) raise ClientException(message) - def exec_op(self, name, op_name, op_data=None): + def exec_op(self, name, op_name, op_data=None, wait=False, ): """Executes an operation on a NS """ - ns = self.get(name) try: + ns = self.get(name) 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)) - resp = self._http.post_cmd(endpoint=endpoint, postfields_dict=op_data) - #print 'RESP: {}'.format(resp) - if not resp or 'id' not in resp: - raise ClientException('unexpected response from server: '.format( + #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)) + if wait: + # Wait for status for NS instance action + # For the 'action' operation, 'id' is used + self._wait(resp.get('id')) + 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 exec operation {}:\nerror:\n{}".format( name, - exc.message) + str(exc)) + raise ClientException(message) + + def scale_vnf(self, ns_name, vnf_name, scaling_group, scale_in, scale_out, wait=False): + """Scales a VNF by adding/removing VDUs + """ + self._client.get_token() + try: + op_data={} + op_data["scaleType"] = "SCALE_VNF" + op_data["scaleVnfData"] = {} + if scale_in: + op_data["scaleVnfData"]["scaleVnfType"] = "SCALE_IN" + else: + op_data["scaleVnfData"]["scaleVnfType"] = "SCALE_OUT" + op_data["scaleVnfData"]["scaleByStepData"] = { + "member-vnf-index": vnf_name, + "scaling-group-descriptor": scaling_group, + } + op_id = self.exec_op(ns_name, op_name='scale', op_data=op_data, wait=wait) + print(str(op_id)) + except ClientException as exc: + message="failed to scale vnf {} of ns {}:\nerror:\n{}".format( + vnf_name, ns_name, str(exc)) + raise ClientException(message) + + def create_alarm(self, alarm): + self._client.get_token() + 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, + str(exc)) + raise ClientException(message) + + def delete_alarm(self, name): + self._client.get_token() + 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, + str(exc)) + raise ClientException(message) + + def export_metric(self, metric): + self._client.get_token() + 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, + str(exc)) raise ClientException(message) + def get_field(self, ns_name, field): + nsr = self.get(ns_name) + print(yaml.safe_dump(nsr)) + 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))