X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fnsi.py;h=0fcfe1d979288b65440f34e15d5c72e68cb37783;hb=a2999a460707408e636d81fe8e735a7625def0d4;hp=f6009ddbcdb81a845a0997ad9ddfd36cac353226;hpb=3f592284d97ed71e8d7bab435586f12623691e47;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/nsi.py b/osmclient/sol005/nsi.py index f6009dd..0fcfe1d 100644 --- a/osmclient/sol005/nsi.py +++ b/osmclient/sol005/nsi.py @@ -19,6 +19,7 @@ OSM NSI (Network Slice Instance) 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,24 @@ class Nsi(object): self._apiBase = '{}{}{}'.format(self._apiName, self._apiVersion, self._apiResource) + # NSI '--wait' option + def _wait(self, id, deleteFlag=False): + self._client.get_token() + # Endpoint to get operation status + apiUrlStatus = '{}{}{}'.format(self._apiName, self._apiVersion, '/nsi_lcm_op_occs') + # Wait for status for NSI instance creation/update/deletion + WaitForStatus.wait_for_status( + 'NSI', + str(id), + WaitForStatus.TIMEOUT_NSI_OPERATION, + apiUrlStatus, + self._http.get2_cmd, + deleteFlag=deleteFlag) + def list(self, filter=None): """Returns a list of NSI """ + self._client.get_token() filter_string = '' if filter: filter_string = '?{}'.format(filter) @@ -50,6 +66,7 @@ class Nsi(object): def get(self, name): """Returns an NSI based on name or id """ + self._client.get_token() if utils.validate_uuid4(name): for nsi in self.list(): if name == nsi['_id']: @@ -62,6 +79,7 @@ class Nsi(object): def get_individual(self, name): nsi_id = name + self._client.get_token() if not utils.validate_uuid4(name): for nsi in self.list(): if name == nsi['name']: @@ -69,22 +87,28 @@ class Nsi(object): break resp = self._http.get_cmd('{}/{}'.format(self._apiBase, nsi_id)) #resp = self._http.get_cmd('{}/{}/nsd_content'.format(self._apiBase, nsi_id)) - #print yaml.safe_dump(resp) + #print(yaml.safe_dump(resp)) if resp: return resp raise NotFound("nsi {} not found".format(name)) - def delete(self, name, force=False): + def delete(self, name, force=False, wait=False): nsi = self.get(name) querystring = '' if force: querystring = '?FORCE=True' http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase, nsi['_id'], querystring)) - #print 'HTTP CODE: {}'.format(http_code) - #print 'RESP: {}'.format(resp) + # 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) + # Wait for status for NSI instance deletion + # 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: @@ -98,8 +122,9 @@ class Nsi(object): def create(self, nst_name, nsi_name, account, config=None, ssh_keys=None, description='default description', - admin_status='ENABLED'): + admin_status='ENABLED', wait=False): + self._client.get_token() nst = self._client.nst.get(nst_name) vim_account_id = {} @@ -135,7 +160,7 @@ class Nsi(object): with open(pubkeyfile, 'r') as f: nsi['ssh_keys'].append(f.read()) if config: - nsi_config = yaml.load(config) + nsi_config = yaml.safe_load(config) if "netslice-vld" in nsi_config: for vld in nsi_config["netslice-vld"]: if vld.get("vim-network-name"): @@ -161,7 +186,25 @@ class Nsi(object): vnf["vimAccountId"] = get_vim_account_id(vnf.pop("vim_account")) nsi["netslice-subnet"] = nsi_config["netslice-subnet"] - #print yaml.safe_dump(nsi) + if "additionalParamsForNsi" in nsi_config: + nsi["additionalParamsForNsi"] = nsi_config.pop("additionalParamsForNsi") + if not isinstance(nsi["additionalParamsForNsi"], dict): + raise ValueError("Error at --config 'additionalParamsForNsi' must be a dictionary") + if "additionalParamsForSubnet" in nsi_config: + nsi["additionalParamsForSubnet"] = nsi_config.pop("additionalParamsForSubnet") + if not isinstance(nsi["additionalParamsForSubnet"], list): + raise ValueError("Error at --config 'additionalParamsForSubnet' must be a list") + for additional_param_subnet in nsi["additionalParamsForSubnet"]: + if not isinstance(additional_param_subnet, dict): + raise ValueError("Error at --config 'additionalParamsForSubnet' items must be dictionaries") + if not additional_param_subnet.get("id"): + raise ValueError("Error at --config 'additionalParamsForSubnet' items must contain subnet 'id'") + if not additional_param_subnet.get("additionalParamsForNs") and\ + not additional_param_subnet.get("additionalParamsForVnf"): + raise ValueError("Error at --config 'additionalParamsForSubnet' items must contain " + "'additionalParamsForNs' and/or 'additionalParamsForVnf'") + + # print(yaml.safe_dump(nsi)) try: self._apiResource = '/netslice_instances_content' self._apiBase = '{}{}{}'.format(self._apiName, @@ -173,14 +216,17 @@ class Nsi(object): self._http.set_http_header(http_header) http_code, resp = self._http.post_cmd(endpoint=self._apiBase, postfields_dict=nsi) - #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 NSI instance creation + self._wait(resp.get('nsilcmop_id')) print(resp['id']) else: msg = "" @@ -194,7 +240,7 @@ class Nsi(object): message="failed to create nsi: {} nst: {}\nerror:\n{}".format( nsi_name, nst_name, - exc.message) + str(exc)) raise ClientException(message) def list_op(self, name, filter=None): @@ -208,11 +254,11 @@ class Nsi(object): filter_string = '' if filter: filter_string = '&{}'.format(filter) - http_code, resp = self._http.get2_cmd('{}?nsiInstanceId={}'.format( + http_code, resp = self._http.get2_cmd('{}?netsliceInstanceId={}'.format( self._apiBase, nsi['_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) @@ -231,19 +277,20 @@ class Nsi(object): except ClientException as exc: message="failed to get operation list of NSI {}:\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 = '/nsi_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) @@ -262,7 +309,7 @@ class Nsi(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): @@ -274,11 +321,11 @@ class Nsi(object): self._apiBase = '{}{}{}'.format(self._apiName, self._apiVersion, self._apiResource) endpoint = '{}/{}/{}'.format(self._apiBase, nsi['_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) @@ -297,6 +344,6 @@ class Nsi(object): except ClientException as exc: message="failed to exec operation {}:\nerror:\n{}".format( name, - exc.message) + str(exc)) raise ClientException(message)