X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fcommon%2Fwait.py;h=e3152af145cbe8cdbd4636d452ae115c46c45b88;hb=e79f0cafb1e4f8b065708187c6dd0f58b56a2aeb;hp=620e7f5ef6c26f07b5fbcbfd730743b869e518d1;hpb=1f3e889846ff574daf98fc699d81279f5f302e71;p=osm%2Fosmclient.git diff --git a/osmclient/common/wait.py b/osmclient/common/wait.py index 620e7f5..e3152af 100644 --- a/osmclient/common/wait.py +++ b/osmclient/common/wait.py @@ -28,9 +28,10 @@ TIMEOUT_GENERIC_OPERATION = 600 TIMEOUT_NSI_OPERATION = TIMEOUT_GENERIC_OPERATION TIMEOUT_SDNC_OPERATION = TIMEOUT_GENERIC_OPERATION TIMEOUT_VIM_OPERATION = TIMEOUT_GENERIC_OPERATION +TIMEOUT_K8S_OPERATION = TIMEOUT_GENERIC_OPERATION TIMEOUT_WIM_OPERATION = TIMEOUT_GENERIC_OPERATION TIMEOUT_NS_OPERATION = 3600 -POLLING_TIME_INTERVAL = 1 +POLLING_TIME_INTERVAL = 5 MAX_DELETE_ATTEMPTS = 3 def _show_detailed_status(old_detailed_status, new_detailed_status): @@ -134,9 +135,9 @@ def wait_for_status(entity_label, entity_id, timeout, apiUrlStatus, http_cmd, de resp = '' if resp_unicode: resp = json.loads(resp_unicode) - # print 'HTTP CODE: {}'.format(http_code) - # print 'RESP: {}'.format(resp) - # print 'URL: {}/{}'.format(apiUrlStatus, entity_id) + # print('HTTP CODE: {}'.format(http_code)) + # print('RESP: {}'.format(resp)) + # print('URL: {}/{}'.format(apiUrlStatus, entity_id)) if deleteFlag and http_code == 404: # In case of deletion, '404 Not Found' means successfully deleted # Display 'detailed-status: Deleted' and return @@ -173,8 +174,8 @@ def wait_for_status(entity_label, entity_id, timeout, apiUrlStatus, http_cmd, de else: time_to_return = True new_detailed_status = _get_detailed_status(resp, entity_label, detailed_status_deleted) - # print 'DETAILED-STATUS: {}'.format(new_detailed_status) - # print 'DELETE-ATTEMPTS-LEFT: {}'.format(delete_attempts_left) + # print('DETAILED-STATUS: {}'.format(new_detailed_status)) + # print('DELETE-ATTEMPTS-LEFT: {}'.format(delete_attempts_left)) if not new_detailed_status: new_detailed_status = 'In progress' # TODO: Change LCM to provide detailed-status more up to date @@ -193,5 +194,5 @@ def wait_for_status(entity_label, entity_id, timeout, apiUrlStatus, http_cmd, de except ClientException as exc: message="Operation failed for {}:\nerror:\n{}".format( entity_label, - exc.message) + str(exc)) raise ClientException(message)