x
/
vmware-nsx
Code Issues Proposed changes

Merge "NSXV: Handle requests ConnectionError exception"

This commit is contained in:
Zuul 2021-04-28 09:13:47 +00:00 committed by Gerrit Code Review
parent 52084e3a2e 9f53623d2f
commit a36c11a833
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vmware_nsx/plugins/nsx_v/vshield/common/VcnsApiClient.py
View File

@ -168,6 +168,9 @@ class VcnsApiHelper(object):
except requests.exceptions.Timeout: except requests.exceptions.Timeout:
raise exceptions.ResourceTimedOut(uri=uri) raise exceptions.ResourceTimedOut(uri=uri)
except requests.exceptions.ConnectionError:
raise exceptions.ResourceConnectionError(uri=uri)
status = response.status_code status = response.status_code
if 200 <= status < 300: if 200 <= status < 300:

4
vmware_nsx/plugins/nsx_v/vshield/common/exceptions.py
View File

@ -80,3 +80,7 @@ class ServiceConflict(VcnsApiException):
class AlreadyExists(VcnsApiException): class AlreadyExists(VcnsApiException):
message = _("Resource %(resource)s already exists") message = _("Resource %(resource)s already exists")
class ResourceConnectionError(VcnsApiException):
message = _("Resource %(uri)s connection error")

1
vmware_nsx/plugins/nsx_v/vshield/vcns.py
View File

@ -124,6 +124,7 @@ class Vcns(object):
self._normalized_global_objects = None self._normalized_global_objects = None
@retry_upon_exception(exceptions.ServiceConflict) @retry_upon_exception(exceptions.ServiceConflict)
@retry_upon_exception(exceptions.ResourceConnectionError)
def _client_request(self, client, method, uri, def _client_request(self, client, method, uri,
params, headers, encodeParams, timeout=None): params, headers, encodeParams, timeout=None):
return client(method, uri, params, headers, encodeParams, return client(method, uri, params, headers, encodeParams,