X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fvim.py;h=bd95d6611256905c7925757afe5e3b9cb84bcc89;hb=5da3f209f7595167bf762e71236076a637244c49;hp=9d103028a6af8fafbc60dc2d705eedf7763a8a9f;hpb=9c79a482e22b9004d7a86fca1781ad4bf7bd32fc;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/vim.py b/osmclient/sol005/vim.py index 9d10302..bd95d66 100644 --- a/osmclient/sol005/vim.py +++ b/osmclient/sol005/vim.py @@ -19,6 +19,7 @@ OSM vim 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 @@ -31,10 +32,23 @@ class Vim(object): self._client = client self._apiName = '/admin' self._apiVersion = '/v1' - self._apiResource = '/vims' + self._apiResource = '/vim_accounts' self._apiBase = '{}{}{}'.format(self._apiName, self._apiVersion, self._apiResource) - def create(self, name, vim_access, sdn_controller, sdn_port_mapping): + # VIM '--wait' option + def _wait(self, id, deleteFlag=False): + # Endpoint to get operation status + apiUrlStatus = '{}{}{}'.format(self._apiName, self._apiVersion, '/vim_accounts') + # Wait for status for VIM instance creation/deletion + WaitForStatus.wait_for_status( + 'VIM', + str(id), + WaitForStatus.TIMEOUT_VIM_OPERATION, + apiUrlStatus, + self._http.get2_cmd, + deleteFlag=deleteFlag) + + def create(self, name, vim_access, sdn_controller=None, sdn_port_mapping=None, wait=False): if 'vim-type' not in vim_access: #'openstack' not in vim_access['vim-type']): raise Exception("vim type not provided") @@ -45,7 +59,7 @@ class Vim(object): vim_config = {} if 'config' in vim_access and vim_access['config'] is not None: - vim_config = json.loads(vim_access['config']) + vim_config = yaml.safe_load(vim_access['config']) if sdn_controller: sdnc = self._client.sdnc.get(sdn_controller) vim_config['sdn-controller'] = sdnc['_id'] @@ -60,25 +74,36 @@ class Vim(object): postfields_dict=vim_account) #print 'HTTP CODE: {}'.format(http_code) #print 'RESP: {}'.format(resp) - if resp: - resp = json.loads(resp) - if not resp or 'id' not in resp: - raise ClientException('failed to create vim {}: {}'.format( - name, 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 VIM instance creation + self._wait(resp.get('id')) + print(resp['id']) else: - print resp['id'] + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException("failed to create vim {} - {}".format(name, msg)) - def update(self, vim_name, vim_account, sdn_controller, sdn_port_mapping): + def update(self, vim_name, vim_account, sdn_controller, sdn_port_mapping, wait=False): vim = self.get(vim_name) vim_config = {} if 'config' in vim_account: - if config=="" and (sdncontroller or sdn_port_mapping): + if vim_account.get('config')=="" and (sdn_controller or sdn_port_mapping): raise ClientException("clearing config is incompatible with updating SDN info") - if config=="": + if vim_account.get('config')=="": vim_config = None else: - vim_config = json.loads(vim_account['config']) + vim_config = yaml.safe_load(vim_account['config']) if sdn_controller: sdnc = self._client.sdnc.get(sdn_controller) vim_config['sdn-controller'] = sdnc['_id'] @@ -91,12 +116,24 @@ class Vim(object): postfields_dict=vim_account) #print 'HTTP CODE: {}'.format(http_code) #print 'RESP: {}'.format(resp) - if resp: - resp = json.loads(resp) - if not resp or 'id' not in resp: - raise ClientException('failed to update vim: '.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 VIM instance update + self._wait(resp.get('id')) + print(resp['id']) else: - print resp['id'] + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException("failed to update vim {} - {}".format(vim_name, msg)) def update_vim_account_dict(self, vim_account, vim_access): vim_account['vim_type'] = vim_access['vim-type'] @@ -115,7 +152,7 @@ class Vim(object): return vim['uuid'] raise NotFound("vim {} not found".format(name)) - def delete(self, vim_name, force=False): + def delete(self, vim_name, force=False, wait=False): vim_id = vim_name if not utils.validate_uuid4(vim_name): vim_id = self.get_id(vim_name) @@ -124,15 +161,30 @@ class Vim(object): querystring = '?FORCE=True' http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase, vim_id, querystring)) - if resp: - resp = json.loads(resp) + #print 'HTTP CODE: {}'.format(http_code) #print 'RESP: {}'.format(resp) if http_code == 202: - print 'Deletion in progress' + if wait: + # When deleting an account, 'resp' may be None. + # In such a case, the 'id' from 'resp' cannot be used, so use 'vim_id' instead + wait_id = vim_id + if resp: + resp = json.loads(resp) + wait_id = resp.get('id') + # Wait for status for VIM account deletion + self._wait(wait_id, deleteFlag=True) + else: + print('Deletion in progress') elif http_code == 204: - print 'Deleted' + print('Deleted') else: - raise ClientException("failed to delete vim {} - {}".format(vim_name, resp)) + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException("failed to delete vim {} - {}".format(vim_name, msg)) def list(self, filter=None): """Returns a list of VIM accounts