X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fns.py;h=8a9c9f022dbbac714f8188c3a542e03d06d4e9b0;hb=36253c72d4f7456d6a5b2a199d2e544e699f3d99;hp=b271e039c4e29d8444da92b69d8f7290b74e764e;hpb=ab51ef7a920bfb6d036d18ae5f3063a0d780cab2;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py index b271e03..8a9c9f0 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,22 +86,27 @@ 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, force=False): + def delete(self, name, force=False, wait=False): ns = self.get(name) 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) + 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') else: @@ -96,10 +118,10 @@ class Ns(object): msg = resp raise ClientException("failed to delete ns {} - {}".format(name, msg)) - def create(self, nsd_name, nsr_name, account, wim_account=None, config=None, + 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 = {} @@ -132,8 +154,6 @@ class Ns(object): ns['nsName'] = nsr_name ns['nsDescription'] = description ns['vimAccountId'] = get_vim_account_id(account) - if wim_account: # at this point is a string or None - ns['wimAccountId'] = get_wim_account_id(yaml.load(wim_account)) #ns['userdata'] = {} #ns['userdata']['key1']='value1' #ns['userdata']['key2']='value2' @@ -144,7 +164,7 @@ class Ns(object): 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: @@ -181,8 +201,12 @@ class Ns(object): 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) + # print(yaml.safe_dump(ns)) try: self._apiResource = '/ns_instances_content' self._apiBase = '{}{}{}'.format(self._apiName, @@ -194,14 +218,17 @@ class Ns(object): self._http.set_http_header(http_header) http_code, resp = self._http.post_cmd(endpoint=self._apiBase, postfields_dict=ns) - #print 'HTTP CODE: {}'.format(http_code) - #print 'RESP: {}'.format(resp) + # 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: msg = "" @@ -215,7 +242,7 @@ class Ns(object): 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): @@ -232,8 +259,8 @@ class Ns(object): 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) + #print('HTTP CODE: {}'.format(http_code)) + #print('RESP: {}'.format(resp)) if http_code == 200: if resp: resp = json.loads(resp) @@ -252,19 +279,20 @@ class Ns(object): 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)) - #print 'HTTP CODE: {}'.format(http_code) - #print 'RESP: {}'.format(resp) + #print('HTTP CODE: {}'.format(http_code)) + #print('RESP: {}'.format(resp)) if http_code == 200: if resp: resp = json.loads(resp) @@ -283,10 +311,10 @@ class Ns(object): 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) @@ -295,17 +323,21 @@ class Ns(object): 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)) + #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) + #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')) print(resp['id']) else: msg = "" @@ -318,12 +350,13 @@ class Ns(object): 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): + 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" @@ -336,21 +369,22 @@ class Ns(object): "member-vnf-index": vnf_name, "scaling-group-descriptor": scaling_group, } - self.exec_op(ns_name, op_name='scale', op_data=op_data) + self.exec_op(ns_name, op_name='scale', op_data=op_data, wait=wait) except ClientException as exc: message="failed to scale vnf {} of ns {}:\nerror:\n{}".format( - vnf_name, ns_name, exc.message) + 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) + #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') @@ -366,10 +400,11 @@ class Ns(object): except ClientException as exc: message="failed to create alarm: alarm {}\n{}".format( alarm, - exc.message) + 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"] = {} @@ -377,8 +412,8 @@ class Ns(object): 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) + #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') @@ -394,17 +429,18 @@ class Ns(object): except ClientException as exc: message="failed to delete alarm: alarm {}\n{}".format( name, - exc.message) + 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) + #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' @@ -420,11 +456,12 @@ class Ns(object): except ClientException as exc: message="failed to export metric: metric {}\n{}".format( metric, - exc.message) + 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))