NSX|V3 update client with max attempts

When a resource is created from a client, the max_attempts was not
configured, so retrying an action fails

Change-Id: I126c6bd9d0307eedbcaff9536d77fda64d645192

vmware_nsx/nsxlib/v3/client.py

@@ -20,6 +20,7 @@ from oslo_log import log
 from oslo_serialization import jsonutils
 from vmware_nsx._i18n import _, _LW
 from vmware_nsx.nsxlib.v3 import exceptions
+from vmware_nsx.nsxlib.v3 import utils
 
 LOG = log.getLogger(__name__)
 
@@ -38,10 +39,12 @@ class RESTClient(object):
     }
 
     def __init__(self, connection, url_prefix=None,
-                 default_headers=None):
+                 default_headers=None,
+                 max_attempts=utils.DEFAULT_MAX_ATTEMPTS):
         self._conn = connection
         self._url_prefix = url_prefix or ""
         self._default_headers = default_headers or {}
+        self.max_attempts = max_attempts
 
     def new_client_for(self, *uri_segments):
         uri = self._build_url('/'.join(uri_segments))
@@ -49,7 +52,8 @@ class RESTClient(object):
         return self.__class__(
             self._conn,
             url_prefix=uri,
-            default_headers=self._default_headers)
+            default_headers=self._default_headers,
+            max_attempts=self.max_attempts)
 
     def list(self, headers=None):
         return self.url_list('')
@@ -154,13 +158,15 @@ class JSONRESTClient(RESTClient):
     }
 
     def __init__(self, connection, url_prefix=None,
-                 default_headers=None):
+                 default_headers=None,
+                 max_attempts=utils.DEFAULT_MAX_ATTEMPTS):
 
         super(JSONRESTClient, self).__init__(
             connection,
             url_prefix=url_prefix,
             default_headers=RESTClient.merge_headers(
-                JSONRESTClient._DEFAULT_HEADERS, default_headers))
+                JSONRESTClient._DEFAULT_HEADERS, default_headers),
+            max_attempts=max_attempts)
 
     def _rest_call(self, *args, **kwargs):
         if kwargs.get('body') is not None:
@@ -176,7 +182,7 @@ class NSX3Client(JSONRESTClient):
     def __init__(self, connection, url_prefix=None,
                  default_headers=None,
                  nsx_api_managers=None,
-                 max_attempts=0):
+                 max_attempts=utils.DEFAULT_MAX_ATTEMPTS):
 
         self.nsx_api_managers = nsx_api_managers or []
 
@@ -187,11 +193,11 @@ class NSX3Client(JSONRESTClient):
             else:
                 url_prefix = "%s/%s" % (NSX3Client._NSX_V1_API_PREFIX,
                                         url_prefix or '')
-        self.max_attempts = max_attempts
 
         super(NSX3Client, self).__init__(
             connection, url_prefix=url_prefix,
-            default_headers=default_headers)
+            default_headers=default_headers,
+            max_attempts=max_attempts)
 
     def _raise_error(self, status_code, operation, result_msg):
         """Override the Rest client errors to add the manager IPs"""

vmware_nsx/tests/unit/nsxlib/v3/nsxlib_testcase.py

@@ -35,6 +35,7 @@ NSX_HTTP_TIMEOUT = 10
 NSX_HTTP_READ_TIMEOUT = 180
 NSX_CONCURENT_CONN = 10
 NSX_CONN_IDLE_TIME = 10
+NSX_MAX_ATTEMPTS = 10
 
 PLUGIN_SCOPE = "plugin scope"
 PLUGIN_TAG = "plugin tag"
@@ -277,7 +278,8 @@ class NsxClientTestCase(NsxLibTestCase):
     def mocked_resource(self, resource_class, mock_validate=True,
                         session_response=None):
         mocked = resource_class(nsx_client.NSX3Client(
-            self.mock_nsx_clustered_api(session_response=session_response)))
+            self.mock_nsx_clustered_api(session_response=session_response),
+            max_attempts=NSX_MAX_ATTEMPTS))
         if mock_validate:
             mock.patch.object(mocked._client, '_validate_result').start()
 

vmware_nsx/tests/unit/nsxlib/v3/test_resources.py

@@ -463,6 +463,15 @@ class LogicalRouterPortTestCase(nsxlib_testcase.NsxClientTestCase):
             'https://1.2.3.4/api/v1/logical-router-ports',
             data=jsonutils.dumps(data, sort_keys=True))
 
+    def test_logical_router_port_max_attempts(self):
+        """
+        Test a router port api has the configured retries
+        """
+        lrport = self._mocked_lrport()
+
+        self.assertEqual(nsxlib_testcase.NSX_MAX_ATTEMPTS,
+                         lrport._client.max_attempts)
+
     def test_delete_logical_router_port(self):
         """
         Test deleting router port