X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=osmclient%2Fsol005%2Fns.py;h=1c45f013dbf443d34544311693e94c844e734925;hb=7b716df9faa2fbe223b7525118842988d97fbd5e;hp=b271e039c4e29d8444da92b69d8f7290b74e764e;hpb=ab51ef7a920bfb6d036d18ae5f3063a0d780cab2;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py index b271e03..1c45f01 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,6 +37,19 @@ 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 """ @@ -74,17 +88,22 @@ class Ns(object): 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,9 +115,9 @@ 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): nsd = self._client.nsd.get(nsd_name) @@ -132,8 +151,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' @@ -181,6 +198,10 @@ 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) try: @@ -194,14 +215,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 = "" @@ -286,7 +310,7 @@ class Ns(object): exc.message) 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) @@ -306,6 +330,10 @@ class Ns(object): 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 = "" @@ -321,7 +349,7 @@ class Ns(object): exc.message) 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 """ try: @@ -336,7 +364,7 @@ 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) @@ -425,6 +453,7 @@ class Ns(object): 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))