rest_session improvements

Network concurrency deletion improvements.

Author: TKIPisalegacycipher

meraki/aio/rest_session.py

@@ -6,6 +6,7 @@
 import urllib.parse
 import asyncio
 import ssl
+import time
 
 
 import aiohttp
@@ -227,7 +228,6 @@ async def _request(self, metadata, method, url, **kwargs):
                                      ]
                 # Rate limit 429 errors
                 elif status == 429:
-                    wait = 0
                     if "Retry-After" in response.headers:
                         wait = int(response.headers["Retry-After"])
                     else:
@@ -264,7 +264,7 @@ async def _request(self, metadata, method, url, **kwargs):
                     # Check specifically for network delete concurrency error
                     if message_is_dict and 'errors' in message.keys() \
                             and network_delete_concurrency_error_text in message['errors'][0]:
-                        wait = self._network_delete_retry_wait_time
+                        wait = random.randint(15, self._network_delete_retry_wait_time)
                         if self._logger:
                             self._logger.warning(f'{tag}, {operation} - {status} {reason}, retrying in {wait} seconds')
                         time.sleep(wait)

meraki/config.py

@@ -25,7 +25,7 @@
 ACTION_BATCH_RETRY_WAIT_TIME = 60
 
 # Network deletion concurrency error retry wait time
-NETWORK_DELETE_RETRY_WAIT_TIME = 120
+NETWORK_DELETE_RETRY_WAIT_TIME = 180
 
 # Retry if encountering other 4XX error (besides 429)?
 RETRY_4XX_ERROR = False

meraki/rest_session.py

@@ -284,7 +284,7 @@ def request(self, metadata, method, url, **kwargs):
                     # Check specifically for network delete concurrency error
                     if message_is_dict and 'errors' in message.keys() \
                             and network_delete_concurrency_error_text in message['errors'][0]:
-                        wait = self._network_delete_retry_wait_time
+                        wait = random.randint(15, self._network_delete_retry_wait_time)
                         if self._logger:
                             self._logger.warning(f'{tag}, {operation} - {status} {reason}, retrying in {wait} seconds')
                         time.sleep(wait)