X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fvim.py;h=34411610a28a047f14c8d5103e9450b5df2ed2ca;hb=3438b975a2c637dc87f1ba39d109184cf504f741;hp=16c361519f115d1188103bf5b36a22c2496b37d6;hpb=d86773c981d4eb7e92365515066a83da75671886;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/vim.py b/osmclient/sol005/vim.py index 16c3615..3441161 100644 --- a/osmclient/sol005/vim.py +++ b/osmclient/sol005/vim.py @@ -39,16 +39,18 @@ class Vim(object): self._apiVersion, self._apiResource) # VIM '--wait' option - def _wait(self, id, deleteFlag=False): + def _wait(self, id, wait_time, 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 + if isinstance(wait_time, bool): + wait_time = WaitForStatus.TIMEOUT_VIM_OPERATION WaitForStatus.wait_for_status( 'VIM', str(id), - WaitForStatus.TIMEOUT_VIM_OPERATION, + wait_time, apiUrlStatus, self._http.get2_cmd, deleteFlag=deleteFlag) @@ -102,7 +104,7 @@ class Vim(object): resp)) if wait: # Wait for status for VIM instance creation - self._wait(resp.get('id')) + self._wait(resp.get('id'), wait) print(resp['id']) #else: # msg = "" @@ -148,7 +150,7 @@ class Vim(object): # Use the previously obtained id instead. wait_id = vim_id_for_wait # Wait for status for VI instance update - self._wait(wait_id) + self._wait(wait_id, wait) # else: # pass #else: @@ -201,7 +203,7 @@ class Vim(object): resp = json.loads(resp) wait_id = resp.get('id') # Wait for status for VIM account deletion - self._wait(wait_id, deleteFlag=True) + self._wait(wait_id, wait, deleteFlag=True) else: print('Deletion in progress') elif http_code == 204: