diff --git a/meraki/api/networks.py b/meraki/api/networks.py index df9f7456..8ff94b8b 100644 --- a/meraki/api/networks.py +++ b/meraki/api/networks.py @@ -741,6 +741,7 @@ def getNetworkEvents(self, networkId: str, total_pages=1, direction='prev', even - perPage (integer): The number of entries per page returned. Acceptable range is 3 - 1000. Default is 10. - 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. + - verbose (boolean): Request additional event details. Returned in the "extraData" key. """ kwargs.update(locals()) @@ -756,7 +757,7 @@ def getNetworkEvents(self, networkId: str, total_pages=1, direction='prev', even networkId = urllib.parse.quote(str(networkId), safe='') resource = f'/networks/{networkId}/events' - query_params = ['productType', 'includedEventTypes', 'excludedEventTypes', 'deviceMac', 'deviceSerial', 'deviceName', 'clientIp', 'clientMac', 'clientName', 'smDeviceMac', 'smDeviceName', 'perPage', 'startingAfter', 'endingBefore', ] + query_params = ['productType', 'includedEventTypes', 'excludedEventTypes', 'deviceMac', 'deviceSerial', 'deviceName', 'clientIp', 'clientMac', 'clientName', 'smDeviceMac', 'smDeviceName', 'perPage', 'startingAfter', 'endingBefore', 'verbose', ] params = {k.strip(): v for k, v in kwargs.items() if k.strip() in query_params} array_params = ['includedEventTypes', 'excludedEventTypes', ] diff --git a/meraki/rest_session.py b/meraki/rest_session.py index 28a31e84..62b4f549 100644 --- a/meraki/rest_session.py +++ b/meraki/rest_session.py @@ -184,10 +184,7 @@ def request(self, metadata, method, url, **kwargs): time.sleep(1) retries -= 1 if retries == 0: - if e.response and e.response.status_code: - raise APIError(metadata, APIResponseError(e.__class__.__name__, e.response.status_code, str(e))) - else: - raise APIError(metadata, APIResponseError(e.__class__.__name__, 503, str(e))) + raise APIError(metadata, response) else: continue @@ -320,8 +317,8 @@ def _get_pages_iterator( if direction == "next" and "next" in links: # Prevent getNetworkEvents from infinite loop as time goes forward if metadata["operation"] == "getNetworkEvents": - starting_after = urllib.parse.unquote( - str(links["next"]["url"]).split("startingAfter=")[1] + starting_after = self._get_url_parameter( + str(links["next"]["url"]), "startingAfter" ) delta = datetime.utcnow() - datetime.fromisoformat( starting_after[:-1] @@ -338,8 +335,8 @@ def _get_pages_iterator( elif direction == "prev" and "prev" in links: # Prevent getNetworkEvents from infinite loop as time goes backward (to epoch 0) if metadata["operation"] == "getNetworkEvents": - ending_before = urllib.parse.unquote( - str(links["prev"]["url"]).split("endingBefore=")[1] + ending_before = self._get_url_parameter( + str(links["prev"]["url"]), "endingBefore=" ) # Break out of loop if endingBefore returned from prev link is before 2014 if ending_before < "2014-01-01": @@ -395,7 +392,9 @@ def _get_pages_legacy(self, metadata, url, params=None, total_pages=-1, directio if direction == 'next' and 'next' in links: # Prevent getNetworkEvents from infinite loop as time goes forward if metadata['operation'] == 'getNetworkEvents': - starting_after = urllib.parse.unquote(links['next']['url'].split('startingAfter=')[1]) + starting_after = self._get_url_parameter( + str(links['next']['url']), "startingAfter" + ) delta = datetime.utcnow() - datetime.fromisoformat(starting_after[:-1]) # Break out of loop if startingAfter returned from next link is within 5 minutes of current time if delta.total_seconds() < 300: @@ -409,7 +408,9 @@ def _get_pages_legacy(self, metadata, url, params=None, total_pages=-1, directio elif direction == 'prev' and 'prev' in links: # Prevent getNetworkEvents from infinite loop as time goes backward (to epoch 0) if metadata['operation'] == 'getNetworkEvents': - ending_before = urllib.parse.unquote(links['prev']['url'].split('endingBefore=')[1]) + ending_before = self._get_url_parameter( + str(links['prev']['url']), "endingBefore=" + ) # Break out of loop if endingBefore returned from prev link is before 2014 if ending_before < '2014-01-01': break @@ -442,6 +443,16 @@ def _get_pages_legacy(self, metadata, url, params=None, total_pages=-1, directio return results + def _get_url_parameter(self, url, param_name, *args, **kwargs): + param_value = None + qs = urllib.parse.urlsplit(url).query + if qs: + params = urllib.parse.parse_qs(qs) + if params: + param_value = urllib.parse.unquote(params.get(param_name)[0]) + + return param_value + def post(self, metadata, url, json=None): metadata['method'] = 'POST' metadata['url'] = url