X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=inline;f=osmclient%2Fsol005%2Fns.py;h=7fd1859c071eba0d3c5aa26e2e122cea210b7160;hb=c75dd58c410b5eff09d11e20650c69f26d834e18;hp=c8e2a7724545e55cda4ff34ad072e7163db39eac;hpb=70d6f1843686f323ced68a253127fedde86a1c25;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py index c8e2a77..7fd1859 100644 --- a/osmclient/sol005/ns.py +++ b/osmclient/sol005/ns.py @@ -22,7 +22,6 @@ from osmclient.common import utils from osmclient.common import wait as WaitForStatus from osmclient.common.exceptions import ClientException from osmclient.common.exceptions import NotFound -from osmclient.common.exceptions import OsmHttpException import yaml import json import logging @@ -80,7 +79,7 @@ class Ns(object): for ns in self.list(): if name == ns['name']: return ns - raise NotFound("ns {} not found".format(name)) + raise NotFound("ns '{}' not found".format(name)) def get_individual(self, name): self._logger.debug("") @@ -91,12 +90,15 @@ class Ns(object): if name == ns['name']: ns_id = ns['_id'] break - _, resp = self._http.get2_cmd('{}/{}'.format(self._apiBase, ns_id)) - #resp = self._http.get_cmd('{}/{}/nsd_content'.format(self._apiBase, ns_id)) - #print(yaml.safe_dump(resp)) - if resp: - return json.loads(resp) - raise NotFound("ns {} not found".format(name)) + try: + _, resp = self._http.get2_cmd('{}/{}'.format(self._apiBase, ns_id)) + #resp = self._http.get_cmd('{}/{}/nsd_content'.format(self._apiBase, ns_id)) + #print(yaml.safe_dump(resp)) + if resp: + return json.loads(resp) + except NotFound: + raise NotFound("ns '{}' not found".format(name)) + raise NotFound("ns '{}' not found".format(name)) def delete(self, name, force=False, wait=False): self._logger.debug("") @@ -118,13 +120,13 @@ class Ns(object): elif http_code == 204: print('Deleted') else: - msg = "" - if resp: - try: - msg = json.loads(resp) - except ValueError: - msg = resp - raise OsmHttpException("failed to delete ns {} - {}".format(name, msg)) + msg = resp or "" + # 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', @@ -140,7 +142,6 @@ class Ns(object): self._logger.debug("") if vim_account_id.get(vim_account): return vim_account_id[vim_account] - vim = self._client.vim.get(vim_account) if vim is None: raise NotFound("cannot find vim account '{}'".format(vim_account)) @@ -149,11 +150,11 @@ class Ns(object): def get_wim_account_id(wim_account): self._logger.debug("") + # wim_account can be False (boolean) to indicate not use 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)) @@ -179,31 +180,31 @@ class Ns(object): if "vim-network-name" in ns_config: ns_config["vld"] = ns_config.pop("vim-network-name") if "vld" in ns_config: + if not isinstance(ns_config["vld"], list): + raise ValueError("Error at --config 'vld' must be a list of dictionaries") for vld in ns_config["vld"]: + if not isinstance(vld, dict): + raise ValueError("Error at --config 'vld' must be a list of dictionaries") if vld.get("vim-network-name"): if isinstance(vld["vim-network-name"], dict): vim_network_name_dict = {} - for vim_account, vim_net in list(vld["vim-network-name"].items()): + for vim_account, vim_net in 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"] if "additionalParamsForNs" in ns_config: - ns["additionalParamsForNs"] = ns_config.pop("additionalParamsForNs") - if not isinstance(ns["additionalParamsForNs"], dict): + if not isinstance(ns_config["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): + if not isinstance(ns_config["additionalParamsForVnf"], list): raise ValueError("Error at --config 'additionalParamsForVnf' must be a list") - for additional_param_vnf in ns["additionalParamsForVnf"]: + for additional_param_vnf in ns_config["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"): @@ -213,8 +214,10 @@ class Ns(object): wim_account = ns_config.pop("wim_account") if wim_account is not None: ns['wimAccountId'] = get_wim_account_id(wim_account) - if "timeout_ns_deploy" in ns_config: - ns["timeout_ns_deploy"] = ns_config.pop("timeout_ns_deploy") + # rest of parameters without any transformation or checking + # "timeout_ns_deploy" + # "placement-engine" + ns.update(ns_config) # print(yaml.safe_dump(ns)) try: @@ -239,6 +242,7 @@ class Ns(object): if wait: # Wait for status for NS instance creation self._wait(resp.get('nslcmop_id')) + print(resp['id']) return resp['id'] #else: # msg = "" @@ -253,7 +257,7 @@ class Ns(object): nsr_name, nsd_name, str(exc)) - raise OsmHttpException(message) + raise ClientException(message) def list_op(self, name, filter=None): """Returns the list of operations of a NS @@ -272,26 +276,26 @@ class Ns(object): filter_string) ) #print('HTTP CODE: {}'.format(http_code)) #print('RESP: {}'.format(resp)) - #if http_code == 200: - if resp: - resp = json.loads(resp) - return resp + if http_code == 200: + if resp: + resp = json.loads(resp) + return resp + else: + raise ClientException('unexpected response from server') else: - raise ClientException('unexpected response from server') - #else: - # msg = "" + msg = resp or "" # if resp: # try: # resp = json.loads(resp) # msg = resp['detail'] # except ValueError: # msg = resp - # raise ClientException(msg) + raise ClientException(msg) except ClientException as exc: message="failed to get operation list of NS {}:\nerror:\n{}".format( name, str(exc)) - raise OsmHttpException(message) + raise ClientException(message) def get_op(self, operationId): """Returns the status of an operation @@ -305,26 +309,26 @@ class Ns(object): 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 + if http_code == 200: + if resp: + resp = json.loads(resp) + return resp + else: + raise ClientException('unexpected response from server') else: - raise ClientException('unexpected response from server') - #else: - # msg = "" + msg = resp or "" # if resp: # try: # resp = json.loads(resp) # msg = resp['detail'] # except ValueError: # msg = resp - # raise ClientException(msg) + raise ClientException(msg) except ClientException as exc: message="failed to get status of operation {}:\nerror:\n{}".format( operationId, str(exc)) - raise OsmHttpException(message) + raise ClientException(message) def exec_op(self, name, op_name, op_data=None, wait=False, ): """Executes an operation on a NS @@ -365,7 +369,7 @@ class Ns(object): message="failed to exec operation {}:\nerror:\n{}".format( name, str(exc)) - raise OsmHttpException(message) + 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 @@ -397,14 +401,14 @@ class Ns(object): 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) + 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') + # if http_code in (200, 201, 202, 204): + # resp = json.loads(resp) + print('Alarm created') #else: # msg = "" # if resp: @@ -414,11 +418,11 @@ class Ns(object): # 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) + except ClientException as exc: + message="failed to create alarm: alarm {}\n{}".format( + alarm, + str(exc)) + raise ClientException(message) def delete_alarm(self, name): self._logger.debug("") @@ -427,14 +431,14 @@ class Ns(object): 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) + 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') + # if http_code in (200, 201, 202, 204): + # resp = json.loads(resp) + print('Alarm deleted') #else: # msg = "" # if resp: @@ -444,25 +448,25 @@ class Ns(object): # 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) + except ClientException as exc: + message="failed to delete alarm: alarm {}\n{}".format( + name, + str(exc)) + raise ClientException(message) def export_metric(self, metric): self._logger.debug("") 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) + 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' + # if http_code in (200, 201, 202, 204): + # resp = json.loads(resp) + return 'Metric exported' #else: # msg = "" # if resp: @@ -472,11 +476,11 @@ class Ns(object): # 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) + 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): self._logger.debug("")