updated w/ release 1.0.0b19

Author: Shiyue Cheng

meraki/__init__.py

@@ -20,7 +20,7 @@
     SUPPRESS_LOGGING, SIMULATE_API_CALLS, BE_GEO_ID, MERAKI_PYTHON_SDK_CALLER
 )
 
-__version__ = '1.0.0b18'
+__version__ = '1.0.0b19'
 
 class DashboardAPI(object):
     """
@@ -72,7 +72,7 @@ def __init__(self, api_key=None, base_url=DEFAULT_BASE_URL, single_request_timeo
             self._logger.setLevel(logging.DEBUG)
 
             formatter = logging.Formatter(
-                fmt='%(name)12s: %(levelname)8s > %(message)s',
+                fmt='%(asctime)s %(name)12s: %(levelname)8s > %(message)s',
                 datefmt='%Y-%m-%d %H:%M:%S'
             )
 

meraki/aio/__init__.py

@@ -72,7 +72,7 @@ def __init__(self, api_key=None, base_url=DEFAULT_BASE_URL, single_request_timeo
             self._logger.setLevel(logging.DEBUG)
 
             formatter = logging.Formatter(
-                fmt='%(name)12s: %(levelname)8s > %(message)s',
+                fmt='%(asctime)s %(name)12s: %(levelname)8s > %(message)s',
                 datefmt='%Y-%m-%d %H:%M:%S'
             )
 

meraki/aio/api/organizations.py

@@ -773,6 +773,7 @@ def getOrganizationInventoryDevices(self, organizationId: str, total_pages=1, di
         - startingAfter (string): A token used by the server to indicate the start of the page. Often this is a timestamp or an ID but it is not limited to those. This parameter should not be defined by client applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
         - endingBefore (string): A token used by the server to indicate the end of the page. Often this is a timestamp or an ID but it is not limited to those. This parameter should not be defined by client applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
         - usedState (string): Filter results by used or unused inventory. Accepted values are "used" or "unused".
+        - search (string): Search for devices in inventory based on serial number, mac address, or model.
         """
 
         kwargs.update(locals())
@@ -787,7 +788,7 @@ def getOrganizationInventoryDevices(self, organizationId: str, total_pages=1, di
         }
         resource = f'/organizations/{organizationId}/inventoryDevices'
 
-        query_params = ['perPage', 'startingAfter', 'endingBefore', 'usedState', ]
+        query_params = ['perPage', 'startingAfter', 'endingBefore', 'usedState', 'search', ]
         params = {k.strip(): v for k, v in kwargs.items() if k.strip() in query_params}
 
         return self._session.get_pages(metadata, resource, params, total_pages, direction)

meraki/aio/rest_session.py

@@ -176,6 +176,7 @@ async def _request(self, metadata, method, url, **kwargs):
             for _ in range(retries):
                 # Make the HTTP request to the API endpoint
                 try:
+                    self._logger.info(f'{method} {abs_url}')
                     response = await self._req_session.request(method, abs_url, **kwargs)
                     reason = response.reason if response.reason else None
                     status = response.status

meraki/api/organizations.py

@@ -773,6 +773,7 @@ def getOrganizationInventoryDevices(self, organizationId: str, total_pages=1, di
         - startingAfter (string): A token used by the server to indicate the start of the page. Often this is a timestamp or an ID but it is not limited to those. This parameter should not be defined by client applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
         - endingBefore (string): A token used by the server to indicate the end of the page. Often this is a timestamp or an ID but it is not limited to those. This parameter should not be defined by client applications. The link for the first, last, prev, or next page in the HTTP Link header should define it.
         - usedState (string): Filter results by used or unused inventory. Accepted values are "used" or "unused".
+        - search (string): Search for devices in inventory based on serial number, mac address, or model.
         """
 
         kwargs.update(locals())
@@ -787,7 +788,7 @@ def getOrganizationInventoryDevices(self, organizationId: str, total_pages=1, di
         }
         resource = f'/organizations/{organizationId}/inventoryDevices'
 
-        query_params = ['perPage', 'startingAfter', 'endingBefore', 'usedState', ]
+        query_params = ['perPage', 'startingAfter', 'endingBefore', 'usedState', 'search', ]
         params = {k.strip(): v for k, v in kwargs.items() if k.strip() in query_params}
 
         return self._session.get_pages(metadata, resource, params, total_pages, direction)

meraki/rest_session.py

@@ -157,6 +157,7 @@ def request(self, metadata, method, url, **kwargs):
                 try:
                     if response:
                         response.close()
+                    self._logger.info(f'{method} {abs_url}')
                     response = self._req_session.request(method, abs_url, allow_redirects=False, **kwargs)
                     reason = response.reason if response.reason else ''
                     status = response.status_code