X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=osmclient%2Fsol005%2Fvim.py;h=1af7cc760933a5ce44c8bf9ce06e8bc337992911;hb=c94275062d1faf60c9b6ac360506bbd1a715c0ab;hp=ad6f9b791ababfcc618fa0221ef8829230081b49;hpb=09fa3d4dffb1fd9ea427f32a32264dd3bda56543;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/vim.py b/osmclient/sol005/vim.py index ad6f9b7..1af7cc7 100644 --- a/osmclient/sol005/vim.py +++ b/osmclient/sol005/vim.py @@ -35,8 +35,10 @@ class Vim(object): self._apiResource = '/vim_accounts' self._apiBase = '{}{}{}'.format(self._apiName, self._apiVersion, self._apiResource) + # VIM '--wait' option def _wait(self, id, deleteFlag=False): + 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 @@ -59,6 +61,7 @@ class Vim(object): return '' def create(self, name, vim_access, sdn_controller=None, sdn_port_mapping=None, wait=False): + self._client.get_token() if 'vim-type' not in vim_access: #'openstack' not in vim_access['vim-type']): raise Exception("vim type not provided") @@ -104,6 +107,7 @@ class Vim(object): raise ClientException("failed to create vim {} - {}".format(name, msg)) def update(self, vim_name, vim_account, sdn_controller, sdn_port_mapping, wait=False): + self._client.get_token() vim = self.get(vim_name) vim_id_for_wait = self._get_id_for_wait(vim_name) vim_config = {} @@ -122,7 +126,7 @@ 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)) @@ -162,6 +166,7 @@ class Vim(object): raise NotFound("vim {} not found".format(name)) def delete(self, vim_name, force=False, wait=False): + self._client.get_token() vim_id = vim_name if not utils.validate_uuid4(vim_name): vim_id = self.get_id(vim_name) @@ -198,6 +203,7 @@ class Vim(object): def list(self, filter=None): """Returns a list of VIM accounts """ + self._client.get_token() filter_string = '' if filter: filter_string = '?{}'.format(filter) @@ -213,6 +219,7 @@ class Vim(object): def get(self, name): """Returns a VIM account based on name or id """ + self._client.get_token() vim_id = name if not utils.validate_uuid4(name): vim_id = self.get_id(name)