x/vmware-nsxlib
Code Issues Proposed changes

Merge "Retry search calls on error"

Browse Source
This commit is contained in:
Zuul 2018-03-19 11:38:27 +00:00 committed by Gerrit Code Review
commit f680a5acd2
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vmware_nsxlib/v3/__init__.py
View File

@ -134,7 +134,14 @@ class NsxLibBase(object):
url += "&cursor=%d" % cursor url += "&cursor=%d" % cursor
if page_size: if page_size:
url += "&page_size=%d" % page_size url += "&page_size=%d" % page_size
return self.client.url_get(url)
# Retry the search on case of error
@utils.retry_upon_exception(exceptions.NsxIndexingInProgress,
max_attempts=self.client.max_attempts)
def do_search(url):
return self.client.url_get(url)
return do_search(url)
def search_all_by_tags(self, tags, resource_type=None): def search_all_by_tags(self, tags, resource_type=None):
"""Return all the results searched based on tags.""" """Return all the results searched based on tags."""

2
vmware_nsxlib/v3/client.py
View File

@ -34,6 +34,8 @@ def http_error_to_exception(status_code, error_code):
requests.codes.NOT_FOUND: requests.codes.NOT_FOUND:
{'202': exceptions.BackendResourceNotFound, {'202': exceptions.BackendResourceNotFound,
'default': exceptions.ResourceNotFound}, 'default': exceptions.ResourceNotFound},
requests.codes.BAD_REQUEST:
{'60508': exceptions.NsxIndexingInProgress},
requests.codes.CONFLICT: exceptions.StaleRevision, requests.codes.CONFLICT: exceptions.StaleRevision,
requests.codes.PRECONDITION_FAILED: exceptions.StaleRevision, requests.codes.PRECONDITION_FAILED: exceptions.StaleRevision,
requests.codes.INTERNAL_SERVER_ERROR: requests.codes.INTERNAL_SERVER_ERROR:

5
vmware_nsxlib/v3/exceptions.py
View File

@ -140,3 +140,8 @@ class SecurityGroupMaximumCapacityReached(ManagerError):
class NsxSearchInvalidQuery(NsxLibException): class NsxSearchInvalidQuery(NsxLibException):
message = _("Invalid input for NSX search query. Reason: %(reason)s") message = _("Invalid input for NSX search query. Reason: %(reason)s")
class NsxIndexingInProgress(NsxLibException):
message = _("Bad Request due to indexing is in progress, please retry "
"after sometime")