From 6339e540c59dd9429d57dd5f5e4aa2345b69352a Mon Sep 17 00:00:00 2001 From: "John M. Kuchta" Date: Mon, 18 Dec 2023 09:53:25 -0800 Subject: [PATCH 001/105] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9617cf81..cd68ba03 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ aiohttp~=3.9.0 requests~=2.31.0 -meraki~=1.38.0 +meraki~=1.40.1 setuptools~=67.2.0 Jinja2==3.1.2 pytest~=7.2.1 \ No newline at end of file From 7869ca8b9ba0d67e5d0f7051fab39080653d621f Mon Sep 17 00:00:00 2001 From: "John M. Kuchta" Date: Mon, 18 Dec 2023 10:28:18 -0800 Subject: [PATCH 002/105] Automatically regenerated library. (#237) Co-authored-by: GitHub Action Includes mid-cycle release 1.41.0. --- meraki/__init__.py | 2 +- meraki/aio/api/appliance.py | 2 +- meraki/aio/api/licensing.py | 114 ++++++++++++++++++++++++++++++++++ meraki/api/appliance.py | 2 +- meraki/api/batch/appliance.py | 2 +- meraki/api/licensing.py | 114 ++++++++++++++++++++++++++++++++++ 6 files changed, 232 insertions(+), 4 deletions(-) diff --git a/meraki/__init__.py b/meraki/__init__.py index 738518ae..81f3ac07 100644 --- a/meraki/__init__.py +++ b/meraki/__init__.py @@ -43,7 +43,7 @@ ) from meraki.rest_session import * -__version__ = '1.40.1' +__version__ = '1.41.0' class DashboardAPI(object): diff --git a/meraki/aio/api/appliance.py b/meraki/aio/api/appliance.py index 134c7ff0..d04f2ea8 100644 --- a/meraki/aio/api/appliance.py +++ b/meraki/aio/api/appliance.py @@ -2180,7 +2180,7 @@ def updateNetworkApplianceVpnBgp(self, networkId: str, enabled: bool, **kwargs): - networkId (string): Network ID - enabled (boolean): Boolean value to enable or disable the BGP configuration. When BGP is enabled, the asNumber (ASN) will be autopopulated with the preconfigured ASN at other Hubs or a default value if there is no ASN configured. - asNumber (integer): An Autonomous System Number (ASN) is required if you are to run BGP and peer with another BGP Speaker outside of the Auto VPN domain. This ASN will be applied to the entire Auto VPN domain. The entire 4-byte ASN range is supported. So, the ASN must be an integer between 1 and 4294967295. When absent, this field is not updated. If no value exists then it defaults to 64512. - - ibgpHoldTimer (integer): The IBGP holdtimer in seconds. The IBGP holdtimer must be an integer between 12 and 240. When absent, this field is not updated. If no value exists then it defaults to 240. + - ibgpHoldTimer (integer): The iBGP holdtimer in seconds. The iBGP holdtimer must be an integer between 12 and 240. When absent, this field is not updated. If no value exists then it defaults to 240. - neighbors (array): List of BGP neighbors. This list replaces the existing set of neighbors. When absent, this field is not updated. """ diff --git a/meraki/aio/api/licensing.py b/meraki/aio/api/licensing.py index a76b51b9..7440b895 100644 --- a/meraki/aio/api/licensing.py +++ b/meraki/aio/api/licensing.py @@ -8,6 +8,120 @@ def __init__(self, session): + def getAdministeredLicensingSubscriptionSubscriptions(self, total_pages=1, direction='next', **kwargs): + """ + **List available subscriptions** + https://developer.cisco.com/meraki/api-v1/#!get-administered-licensing-subscription-subscriptions + + - total_pages (integer or string): use with perPage to get total results up to total_pages*perPage; -1 or "all" for all pages + - direction (string): direction to paginate, either "next" (default) or "prev" page + - perPage (integer): The number of entries per page returned. Acceptable range is 3 - 1000. Default is 1000. + - 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. + - subscriptionIds (array): List of subscription ids to fetch + - organizationIds (array): Organizations to get associated subscriptions for + - startDate (string): Filter subscriptions by start date, ISO 8601 format. To filter with a range of dates, use 'startDate[