fix: adjust code for urllib3 v2

Signed-off-by: Norbert Biczo <[email protected]>

Author: pyrooka

ibm_cloud_sdk_core/base_service.py

@@ -131,13 +131,14 @@ def enable_retries(self, max_retries: int = 4, retry_interval: float = 30.0) ->
         self.retry_config = Retry(
             total=max_retries,
             backoff_factor=1.0,
-            backoff_max=retry_interval,
             # List of HTTP status codes to retry on in addition to Timeout/Connection Errors
             status_forcelist=[429, 500, 502, 503, 504],
             # List of HTTP methods to retry on
             # Omitting this will default to all methods except POST
             allowed_methods=['HEAD', 'GET', 'PUT', 'DELETE', 'OPTIONS', 'TRACE', 'POST'],
         )
+        self.retry_config.DEFAULT_BACKOFF_MAX = retry_interval
+
         self.http_adapter = SSLHTTPAdapter(max_retries=self.retry_config)
         self.http_client.mount('http://', self.http_adapter)
         self.http_client.mount('https://', self.http_adapter)

test/test_base_service.py

@@ -724,7 +724,7 @@ def test_retry_config_default():
     service.enable_retries()
     assert service.retry_config.total == 4
     assert service.retry_config.backoff_factor == 1.0
-    assert service.retry_config.backoff_max == 30.0
+    assert service.retry_config.DEFAULT_BACKOFF_MAX == 30.0
     assert service.http_client.get_adapter('https://').max_retries.total == 4
 
     # Ensure retries fail after 4 retries
@@ -760,7 +760,7 @@ def test_retry_config_non_default():
     service.enable_retries(2, 10.0)
     assert service.retry_config.total == 2
     assert service.retry_config.backoff_factor == 1.0
-    assert service.retry_config.backoff_max == 10.0
+    assert service.retry_config.DEFAULT_BACKOFF_MAX == 10.0
 
     # Ensure retries fail after 2 retries
     error = ConnectTimeoutError()
@@ -778,7 +778,7 @@ def test_retry_config_external():
     service = IncludeExternalConfigService('v1', authenticator=NoAuthAuthenticator())
     assert service.retry_config.total == 3
     assert service.retry_config.backoff_factor == 1.0
-    assert service.retry_config.backoff_max == 25.0
+    assert service.retry_config.DEFAULT_BACKOFF_MAX == 25.0
 
     # Ensure retries fail after 3 retries
     error = ConnectTimeoutError()