X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fvim.py;h=43911a6d69e0ed09ae3b5eefd7c4024f307288ab;hb=6bc001c642c74e6742d0a5dd5922738ae4c4fb0d;hp=6e15e5bbea602e2e49a3a1608bd270883ede1259;hpb=061856b26ecc63183378489fa7eb6ed5a6f0250f;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/vim.py b/osmclient/sol005/vim.py index 6e15e5b..43911a6 100644 --- a/osmclient/sol005/vim.py +++ b/osmclient/sol005/vim.py @@ -19,22 +19,56 @@ 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 import json +import logging class Vim(object): def __init__(self, http=None, client=None): self._http = http self._client = client + self._logger = logging.getLogger('osmclient') self._apiName = '/admin' self._apiVersion = '/v1' self._apiResource = '/vim_accounts' self._apiBase = '{}{}{}'.format(self._apiName, self._apiVersion, self._apiResource) - def create(self, name, vim_access, sdn_controller=None, sdn_port_mapping=None): + + # VIM '--wait' option + def _wait(self, id, deleteFlag=False): + self._logger.debug("") + self._client.get_token() + # 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 _get_id_for_wait(self, name): + """ Returns id of name, or the id itself if given as argument + """ + self._logger.debug("") + self._client.get_token() + for vim in self.list(): + if name == vim['uuid']: + return vim['uuid'] + for vim in self.list(): + if name == vim['name']: + return vim['uuid'] + return '' + + def create(self, name, vim_access, sdn_controller=None, sdn_port_mapping=None, wait=False): + self._logger.debug("") + self._client.get_token() if 'vim-type' not in vim_access: #'openstack' not in vim_access['vim-type']): raise Exception("vim type not provided") @@ -58,15 +92,18 @@ class Vim(object): http_code, resp = self._http.post_cmd(endpoint=self._apiBase, postfields_dict=vim_account) - #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)) - print resp['id'] + if wait: + # Wait for status for VIM instance creation + self._wait(resp.get('id')) + print(resp['id']) else: msg = "" if resp: @@ -76,14 +113,16 @@ class Vim(object): 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): + self._logger.debug("") + self._client.get_token() vim = self.get(vim_name) - + vim_id_for_wait = self._get_id_for_wait(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 = yaml.safe_load(vim_account['config']) @@ -95,17 +134,19 @@ class Vim(object): vim_config['sdn-port-mapping'] = yaml.safe_load(f.read()) vim_account['config'] = vim_config #vim_account['config'] = json.dumps(vim_config) - http_code, resp = self._http.put_cmd(endpoint='{}/{}'.format(self._apiBase,vim['_id']), + http_code, resp = self._http.patch_cmd(endpoint='{}/{}'.format(self._apiBase,vim['_id']), postfields_dict=vim_account) - #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)) - print resp['id'] + if wait: + # In this case, 'resp' always returns None, so 'resp['id']' cannot be used. + # Use the previously obtained id instead. + wait_id = vim_id_for_wait + # Wait for status for VI instance update + self._wait(wait_id) + else: + pass else: msg = "" if resp: @@ -116,6 +157,7 @@ class Vim(object): raise ClientException("failed to update vim {} - {}".format(vim_name, msg)) def update_vim_account_dict(self, vim_account, vim_access): + self._logger.debug("") vim_account['vim_type'] = vim_access['vim-type'] vim_account['description'] = vim_access['description'] vim_account['vim_url'] = vim_access['vim-url'] @@ -127,12 +169,15 @@ class Vim(object): def get_id(self, name): """Returns a VIM id from a VIM name """ + self._logger.debug("") for vim in self.list(): if name == vim['name']: 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): + self._logger.debug("") + self._client.get_token() vim_id = vim_name if not utils.validate_uuid4(vim_name): vim_id = self.get_id(vim_name) @@ -141,12 +186,22 @@ class Vim(object): querystring = '?FORCE=True' http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase, vim_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: + # 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: msg = "" if resp: @@ -159,6 +214,8 @@ class Vim(object): def list(self, filter=None): """Returns a list of VIM accounts """ + self._logger.debug("") + self._client.get_token() filter_string = '' if filter: filter_string = '?{}'.format(filter) @@ -174,6 +231,8 @@ class Vim(object): def get(self, name): """Returns a VIM account based on name or id """ + self._logger.debug("") + self._client.get_token() vim_id = name if not utils.validate_uuid4(name): vim_id = self.get_id(name)