Updated with 1.0.0b4 & 0.110.1 releases

Author: Shiyue Cheng

meraki/__init__.py

@@ -88,7 +88,7 @@
 )
 
 
-__version__ = '0.110.0'
+__version__ = '0.110.1'
 
 
 class DashboardAPI(object):

meraki/aio/api/mx_warm_spare_settings.py

@@ -3,17 +3,17 @@ def __init__(self, session):
         super().__init__()
         self._session = session
 
-    async def swapNetworkWarmspare(self, networkId: str):
+    async def swapNetworkWarmSpare(self, networkId: str):
         """
         **Swap MX primary and warm spare appliances**
-        https://developer.cisco.com/docs/meraki-api-v0/#!swap-network-warmspare
+        https://developer.cisco.com/docs/meraki-api-v0/#!swap-network-warm-spare
         
         - networkId (string)
         """
 
         metadata = {
             'tags': ['MX warm spare settings'],
-            'operation': 'swapNetworkWarmspare',
+            'operation': 'swapNetworkWarmSpare',
         }
         resource = f'/networks/{networkId}/swapWarmSpare'
 

meraki/aio/api/security_events.py

@@ -5,7 +5,7 @@ def __init__(self, session):
 
     async def getNetworkClientSecurityEvents(self, networkId: str, clientId: str, total_pages=1, direction='next', **kwargs):
         """
-        **List the security events for a client. Clients can be identified by a client key or either the MAC or IP depending on whether the network uses Track-by-IP.**
+        **List the security events (intrusion detection only) for a client. Clients can be identified by a client key or either the MAC or IP depending on whether the network uses Track-by-IP.**
         https://developer.cisco.com/docs/meraki-api-v0/#!get-network-client-security-events
         
         - networkId (string)
@@ -36,7 +36,7 @@ async def getNetworkClientSecurityEvents(self, networkId: str, clientId: str, to
 
     async def getNetworkSecurityEvents(self, networkId: str, total_pages=1, direction='next', **kwargs):
         """
-        **List the security events for a network**
+        **List the security events (intrusion detection only) for a network**
         https://developer.cisco.com/docs/meraki-api-v0/#!get-network-security-events
         
         - networkId (string)
@@ -66,7 +66,7 @@ async def getNetworkSecurityEvents(self, networkId: str, total_pages=1, directio
 
     async def getOrganizationSecurityEvents(self, organizationId: str, total_pages=1, direction='next', **kwargs):
         """
-        **List the security events for an organization**
+        **List the security events (intrusion detection only) for an organization**
         https://developer.cisco.com/docs/meraki-api-v0/#!get-organization-security-events
         
         - organizationId (string)

meraki/aio/rest_session.py

@@ -1,6 +1,7 @@
 import asyncio
 import json
 import platform
+import random
 import ssl
 import sys
 import urllib.parse
@@ -207,7 +208,7 @@ async def _request(self, metadata, method, url, **kwargs):
                     if "Retry-After" in response.headers:
                         wait = int(response.headers["Retry-After"])
                     else:
-                        wait = self._nginx_429_retry_wait_time
+                        wait = random.randint(1, self._nginx_429_retry_wait_time)
                     if self._logger:
                         self._logger.warning(f"{tag}, {operation} > {abs_url} - {status} {reason}, retrying in {wait} seconds")
                     await asyncio.sleep(wait)
@@ -221,7 +222,7 @@ async def _request(self, metadata, method, url, **kwargs):
                     try:
                         message = await response.json()
                     except aiohttp.client_exceptions.ContentTypeError:
-                        message = (await response.text())[:100]
+                        message = (await response.content())[:100]
 
                     # Check specifically for action batch concurrency error
                     action_batch_concurrency_error = {
@@ -236,7 +237,7 @@ async def _request(self, metadata, method, url, **kwargs):
                         await asyncio.sleep(wait)
 
                     elif self._retry_4xx_error:
-                        wait = self._retry_4xx_error_wait_time
+                        wait = random.randint(1, self._retry_4xx_error_wait_time)
                         if self._logger:
                             self._logger.warning(f"{tag}, {operation} > {abs_url} - {status} {reason}, retrying in {wait} seconds")
                         await asyncio.sleep(wait)

meraki/api/mx_warm_spare_settings.py

@@ -3,17 +3,17 @@ def __init__(self, session):
         super(MXWarmSpareSettings, self).__init__()
         self._session = session
 
-    def swapNetworkWarmspare(self, networkId: str):
+    def swapNetworkWarmSpare(self, networkId: str):
         """
         **Swap MX primary and warm spare appliances**
-        https://developer.cisco.com/docs/meraki-api-v0/#!swap-network-warmspare
+        https://developer.cisco.com/docs/meraki-api-v0/#!swap-network-warm-spare
         
         - networkId (string)
         """
 
         metadata = {
             'tags': ['MX warm spare settings'],
-            'operation': 'swapNetworkWarmspare',
+            'operation': 'swapNetworkWarmSpare',
         }
         resource = f'/networks/{networkId}/swapWarmSpare'
 

meraki/api/security_events.py

@@ -5,7 +5,7 @@ def __init__(self, session):
 
     def getNetworkClientSecurityEvents(self, networkId: str, clientId: str, total_pages=1, direction='next', **kwargs):
         """
-        **List the security events for a client. Clients can be identified by a client key or either the MAC or IP depending on whether the network uses Track-by-IP.**
+        **List the security events (intrusion detection only) for a client. Clients can be identified by a client key or either the MAC or IP depending on whether the network uses Track-by-IP.**
         https://developer.cisco.com/docs/meraki-api-v0/#!get-network-client-security-events
         
         - networkId (string)
@@ -36,7 +36,7 @@ def getNetworkClientSecurityEvents(self, networkId: str, clientId: str, total_pa
 
     def getNetworkSecurityEvents(self, networkId: str, total_pages=1, direction='next', **kwargs):
         """
-        **List the security events for a network**
+        **List the security events (intrusion detection only) for a network**
         https://developer.cisco.com/docs/meraki-api-v0/#!get-network-security-events
         
         - networkId (string)
@@ -66,7 +66,7 @@ def getNetworkSecurityEvents(self, networkId: str, total_pages=1, direction='nex
 
     def getOrganizationSecurityEvents(self, organizationId: str, total_pages=1, direction='next', **kwargs):
         """
-        **List the security events for an organization**
+        **List the security events (intrusion detection only) for an organization**
         https://developer.cisco.com/docs/meraki-api-v0/#!get-organization-security-events
         
         - organizationId (string)

meraki/exceptions.py

@@ -19,7 +19,7 @@ def __init__(self, metadata, response):
         try:
             self.message = self.response.json() if self.response is not None and self.response.json() else None
         except ValueError:
-            self.message = self.response.text[:100]
+            self.message = self.response.content[:100]
         super(APIError, self).__init__(f'{self.tag}, {self.operation} - {self.status} {self.reason}, {self.message}')
 
     def __repr__(self):

meraki/rest_session.py

@@ -1,5 +1,6 @@
 import json
 import platform
+import random
 import sys
 import time
 import urllib.parse
@@ -91,6 +92,7 @@ def __init__(
 
         # Initialize a new `requests` session
         self._req_session = requests.session()
+        self._req_session.encoding = 'utf-8'
 
         # Check base URL
         if 'v1' in self._base_url:
@@ -176,7 +178,7 @@ def request(self, metadata, method, url, **kwargs):
                             self._logger.info(f'{tag}, {operation} - {status} {reason}')
                     # For non-empty response to GET, ensure valid JSON
                     try:
-                        if method == 'GET' and response.text.strip():
+                        if method == 'GET' and response.content.strip():
                             response.json()
                         return response
                     except json.decoder.JSONDecodeError as e:
@@ -194,7 +196,7 @@ def request(self, metadata, method, url, **kwargs):
                     if 'Retry-After' in response.headers:
                         wait = int(response.headers['Retry-After'])
                     else:
-                        wait = self._nginx_429_retry_wait_time
+                        wait = random.randint(1, self._nginx_429_retry_wait_time)
                     if self._logger:
                         self._logger.warning(f'{tag}, {operation} - {status} {reason}, retrying in {wait} seconds')
                     time.sleep(wait)
@@ -216,7 +218,7 @@ def request(self, metadata, method, url, **kwargs):
                     try:
                         message = response.json()
                     except ValueError:
-                        message = response.text[:100]
+                        message = response.content[:100]
 
                     # Check specifically for action batch concurrency error
                     action_batch_concurrency_error = {'errors': [
@@ -231,7 +233,7 @@ def request(self, metadata, method, url, **kwargs):
                         if retries == 0:
                             raise APIError(metadata, response)
                     elif self._retry_4xx_error:
-                        wait = self._retry_4xx_error_wait_time
+                        wait = random.randint(1, self._retry_4xx_error_wait_time)
                         if self._logger:
                             self._logger.warning(f'{tag}, {operation} - {status} {reason}, retrying in {wait} seconds')
                         time.sleep(wait)
@@ -252,7 +254,7 @@ def get(self, metadata, url, params=None):
         response = self.request(metadata, 'GET', url, params=params)
         ret = None
         if response:
-            if response.text.strip():
+            if response.content.strip():
                 ret = response.json()
             response.close()
         return ret
@@ -323,7 +325,7 @@ def post(self, metadata, url, json=None):
         response = self.request(metadata, 'POST', url, json=json)
         ret = None
         if response:
-            if response.text.strip():
+            if response.content.strip():
                 ret = response.json()
             response.close()
         return ret
@@ -335,7 +337,7 @@ def put(self, metadata, url, json=None):
         response = self.request(metadata, 'PUT', url, json=json)
         ret = None
         if response:
-            if response.text.strip():
+            if response.content.strip():
                 ret = response.json()
             response.close()
         return ret

meraki_v1/__init__.py

@@ -21,7 +21,7 @@
     BE_GEO_ID, MERAKI_PYTHON_SDK_CALLER
 )
 
-__version__ = '1.0.0b3'
+__version__ = '1.0.0b4'
 
 class DashboardAPI(object):
     """