Skip to content

Commit 34f6b01

Browse files
TKIPisalegacycipherGitHub Action
andauthored
Automatically regenerated library. (#221)
Co-authored-by: GitHub Action <support@meraki.com>
1 parent 7de644b commit 34f6b01

13 files changed

Lines changed: 52 additions & 43 deletions

File tree

meraki/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
USE_ITERATOR_FOR_GET_PAGES,
4646
)
4747

48-
__version__ = '1.34.3'
48+
__version__ = '1.36.0'
4949

5050

5151
class DashboardAPI(object):

meraki/aio/api/camera.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ def updateDeviceCameraQualityAndRetention(self, serial: str, **kwargs):
244244
- audioRecordingEnabled (boolean): Boolean indicating if audio recording is enabled(true) or disabled(false) on the camera
245245
- restrictedBandwidthModeEnabled (boolean): Boolean indicating if restricted bandwidth is enabled(true) or disabled(false) on the camera. This setting does not apply to MV2 cameras.
246246
- quality (string): Quality of the camera. Can be one of 'Standard', 'High' or 'Enhanced'. Not all qualities are supported by every camera model.
247-
- resolution (string): Resolution of the camera. Can be one of '1280x720', '1920x1080', '1080x1080', '2058x2058', '2112x2112', '2880x2880', '2688x1512' or '3840x2160'.Not all resolutions are supported by every camera model.
247+
- resolution (string): Resolution of the camera. Can be one of '1280x720', '1920x1080', '1080x1080', '2112x2112', '2880x2880', '2688x1512' or '3840x2160'.Not all resolutions are supported by every camera model.
248248
- motionDetectorVersion (integer): The version of the motion detector that will be used by the camera. Only applies to Gen 2 cameras. Defaults to v2.
249249
"""
250250

@@ -254,7 +254,7 @@ def updateDeviceCameraQualityAndRetention(self, serial: str, **kwargs):
254254
options = ['Enhanced', 'High', 'Standard']
255255
assert kwargs['quality'] in options, f'''"quality" cannot be "{kwargs['quality']}", & must be set to one of: {options}'''
256256
if 'resolution' in kwargs:
257-
options = ['1080x1080', '1280x720', '1920x1080', '2058x2058', '2112x2112', '2688x1512', '2880x2880', '3840x2160']
257+
options = ['1080x1080', '1280x720', '1920x1080', '2112x2112', '2688x1512', '2880x2880', '3840x2160']
258258
assert kwargs['resolution'] in options, f'''"resolution" cannot be "{kwargs['resolution']}", & must be set to one of: {options}'''
259259
if 'motionDetectorVersion' in kwargs:
260260
options = [1, 2]

meraki/aio/api/networks.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,15 +1506,18 @@ def getNetworkMerakiAuthUser(self, networkId: str, merakiAuthUserId: str):
15061506

15071507

15081508

1509-
def deleteNetworkMerakiAuthUser(self, networkId: str, merakiAuthUserId: str):
1509+
def deleteNetworkMerakiAuthUser(self, networkId: str, merakiAuthUserId: str, **kwargs):
15101510
"""
1511-
**Deauthorize a user**
1511+
**Delete an 802.1X RADIUS user, or deauthorize and optionally delete a splash guest or client VPN user.**
15121512
https://developer.cisco.com/meraki/api-v1/#!delete-network-meraki-auth-user
15131513
15141514
- networkId (string): Network ID
15151515
- merakiAuthUserId (string): Meraki auth user ID
1516+
- delete (boolean): If the ID supplied is for a splash guest or client VPN user, and that user is not authorized for any other networks in the organization, then also delete the user. 802.1X RADIUS users are always deleted regardless of this optional attribute.
15161517
"""
15171518

1519+
kwargs.update(locals())
1520+
15181521
metadata = {
15191522
'tags': ['networks', 'configure', 'merakiAuthUsers'],
15201523
'operation': 'deleteNetworkMerakiAuthUser'

meraki/aio/api/organizations.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2005,7 +2005,7 @@ def getOrganizationFirmwareUpgrades(self, organizationId: str, **kwargs):
20052005
20062006
- organizationId (string): Organization ID
20072007
- status (array): The status of an upgrade
2008-
- productType (array): The product type in a given upgrade ID
2008+
- productTypes (array): The product type in a given upgrade ID
20092009
"""
20102010

20112011
kwargs.update(locals())
@@ -2017,10 +2017,10 @@ def getOrganizationFirmwareUpgrades(self, organizationId: str, **kwargs):
20172017
organizationId = urllib.parse.quote(str(organizationId), safe='')
20182018
resource = f'/organizations/{organizationId}/firmware/upgrades'
20192019

2020-
query_params = ['status', 'productType', ]
2020+
query_params = ['status', 'productTypes', ]
20212021
params = {k.strip(): v for k, v in kwargs.items() if k.strip() in query_params}
20222022

2023-
array_params = ['status', 'productType', ]
2023+
array_params = ['status', 'productTypes', ]
20242024
for k, v in kwargs.items():
20252025
if k.strip() in array_params:
20262026
params[f'{k.strip()}[]'] = kwargs[f'{k}']
@@ -2038,14 +2038,14 @@ def getOrganizationFirmwareUpgradesByDevice(self, organizationId: str, total_pag
20382038
- organizationId (string): Organization ID
20392039
- total_pages (integer or string): use with perPage to get total results up to total_pages*perPage; -1 or "all" for all pages
20402040
- direction (string): direction to paginate, either "next" (default) or "prev" page
2041-
- perPage (integer): The number of entries per page returned. Acceptable range is 3 - 50. Default is 50.
2041+
- perPage (integer): The number of entries per page returned. Acceptable range is 3 - 1000. Default is 50.
20422042
- 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.
20432043
- 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.
20442044
- networkIds (array): Optional parameter to filter by network
20452045
- serials (array): Optional parameter to filter by serial number. All returned devices will have a serial number that is an exact match.
20462046
- macs (array): Optional parameter to filter by one or more MAC addresses belonging to devices. All devices returned belong to MAC addresses that are an exact match.
2047-
- firmwareUpgradeIds (array): Optional parameter to filter by firmware upgrade ids.
20482047
- firmwareUpgradeBatchIds (array): Optional parameter to filter by firmware upgrade batch ids.
2048+
- upgradeStatuses (array): Optional parameter to filter by firmware upgrade statuses.
20492049
"""
20502050

20512051
kwargs.update(locals())
@@ -2057,10 +2057,10 @@ def getOrganizationFirmwareUpgradesByDevice(self, organizationId: str, total_pag
20572057
organizationId = urllib.parse.quote(str(organizationId), safe='')
20582058
resource = f'/organizations/{organizationId}/firmware/upgrades/byDevice'
20592059

2060-
query_params = ['perPage', 'startingAfter', 'endingBefore', 'networkIds', 'serials', 'macs', 'firmwareUpgradeIds', 'firmwareUpgradeBatchIds', ]
2060+
query_params = ['perPage', 'startingAfter', 'endingBefore', 'networkIds', 'serials', 'macs', 'firmwareUpgradeBatchIds', 'upgradeStatuses', ]
20612061
params = {k.strip(): v for k, v in kwargs.items() if k.strip() in query_params}
20622062

2063-
array_params = ['networkIds', 'serials', 'macs', 'firmwareUpgradeIds', 'firmwareUpgradeBatchIds', ]
2063+
array_params = ['networkIds', 'serials', 'macs', 'firmwareUpgradeBatchIds', 'upgradeStatuses', ]
20642064
for k, v in kwargs.items():
20652065
if k.strip() in array_params:
20662066
params[f'{k.strip()}[]'] = kwargs[f'{k}']
@@ -3344,7 +3344,7 @@ def getOrganizationSummaryTopAppliancesByUtilization(self, organizationId: str,
33443344
- organizationId (string): Organization ID
33453345
- t0 (string): The beginning of the timespan for the data.
33463346
- t1 (string): The end of the timespan for the data. t1 can be a maximum of 31 days after t0.
3347-
- timespan (number): The timespan for which the information will be fetched. If specifying timespan, do not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The default is 1 day.
3347+
- timespan (number): The timespan for which the information will be fetched. If specifying timespan, do not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 25 minutes and be less than or equal to 31 days. The default is 1 day.
33483348
"""
33493349

33503350
kwargs.update(locals())
@@ -3371,7 +3371,7 @@ def getOrganizationSummaryTopClientsByUsage(self, organizationId: str, **kwargs)
33713371
- organizationId (string): Organization ID
33723372
- t0 (string): The beginning of the timespan for the data.
33733373
- t1 (string): The end of the timespan for the data. t1 can be a maximum of 31 days after t0.
3374-
- timespan (number): The timespan for which the information will be fetched. If specifying timespan, do not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The default is 1 day.
3374+
- timespan (number): The timespan for which the information will be fetched. If specifying timespan, do not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 8 hours and be less than or equal to 31 days. The default is 1 day.
33753375
"""
33763376

33773377
kwargs.update(locals())
@@ -3425,7 +3425,7 @@ def getOrganizationSummaryTopDevicesByUsage(self, organizationId: str, **kwargs)
34253425
- organizationId (string): Organization ID
34263426
- t0 (string): The beginning of the timespan for the data.
34273427
- t1 (string): The end of the timespan for the data. t1 can be a maximum of 31 days after t0.
3428-
- timespan (number): The timespan for which the information will be fetched. If specifying timespan, do not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The default is 1 day.
3428+
- timespan (number): The timespan for which the information will be fetched. If specifying timespan, do not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 8 hours and be less than or equal to 31 days. The default is 1 day.
34293429
"""
34303430

34313431
kwargs.update(locals())
@@ -3452,7 +3452,7 @@ def getOrganizationSummaryTopDevicesModelsByUsage(self, organizationId: str, **k
34523452
- organizationId (string): Organization ID
34533453
- t0 (string): The beginning of the timespan for the data.
34543454
- t1 (string): The end of the timespan for the data. t1 can be a maximum of 31 days after t0.
3455-
- timespan (number): The timespan for which the information will be fetched. If specifying timespan, do not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The default is 1 day.
3455+
- timespan (number): The timespan for which the information will be fetched. If specifying timespan, do not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 8 hours and be less than or equal to 31 days. The default is 1 day.
34563456
"""
34573457

34583458
kwargs.update(locals())
@@ -3479,7 +3479,7 @@ def getOrganizationSummaryTopSsidsByUsage(self, organizationId: str, **kwargs):
34793479
- organizationId (string): Organization ID
34803480
- t0 (string): The beginning of the timespan for the data.
34813481
- t1 (string): The end of the timespan for the data. t1 can be a maximum of 31 days after t0.
3482-
- timespan (number): The timespan for which the information will be fetched. If specifying timespan, do not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The default is 1 day.
3482+
- timespan (number): The timespan for which the information will be fetched. If specifying timespan, do not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 8 hours and be less than or equal to 31 days. The default is 1 day.
34833483
"""
34843484

34853485
kwargs.update(locals())
@@ -3506,7 +3506,7 @@ def getOrganizationSummaryTopSwitchesByEnergyUsage(self, organizationId: str, **
35063506
- organizationId (string): Organization ID
35073507
- t0 (string): The beginning of the timespan for the data.
35083508
- t1 (string): The end of the timespan for the data. t1 can be a maximum of 31 days after t0.
3509-
- timespan (number): The timespan for which the information will be fetched. If specifying timespan, do not specify parameters t0 and t1. The value must be in seconds and be less than or equal to 31 days. The default is 1 day.
3509+
- timespan (number): The timespan for which the information will be fetched. If specifying timespan, do not specify parameters t0 and t1. The value must be in seconds and be greater than or equal to 25 minutes and be less than or equal to 31 days. The default is 1 day.
35103510
"""
35113511

35123512
kwargs.update(locals())

meraki/aio/api/sm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ def getNetworkSmDeviceWlanLists(self, networkId: str, deviceId: str):
608608

609609
def getNetworkSmProfiles(self, networkId: str):
610610
"""
611-
**List all profiles in a network**
611+
**List all the profiles in the network**
612612
https://developer.cisco.com/meraki/api-v1/#!get-network-sm-profiles
613613
614614
- networkId (string): Network ID

meraki/aio/api/wireless.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2202,7 +2202,7 @@ def getOrganizationWirelessDevicesChannelUtilizationHistoryByNetworkByInterval(s
22022202

22032203
def getOrganizationWirelessDevicesEthernetStatuses(self, organizationId: str, total_pages=1, direction='next', **kwargs):
22042204
"""
2205-
**Endpoint to see power status for wireless devices**
2205+
**List the most recent Ethernet link speed, duplex, aggregation and power mode and status information for wireless devices.**
22062206
https://developer.cisco.com/meraki/api-v1/#!get-organization-wireless-devices-ethernet-statuses
22072207
22082208
- organizationId (string): Organization ID

meraki/api/batch/camera.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def updateDeviceCameraQualityAndRetention(self, serial: str, **kwargs):
5151
- audioRecordingEnabled (boolean): Boolean indicating if audio recording is enabled(true) or disabled(false) on the camera
5252
- restrictedBandwidthModeEnabled (boolean): Boolean indicating if restricted bandwidth is enabled(true) or disabled(false) on the camera. This setting does not apply to MV2 cameras.
5353
- quality (string): Quality of the camera. Can be one of 'Standard', 'High' or 'Enhanced'. Not all qualities are supported by every camera model.
54-
- resolution (string): Resolution of the camera. Can be one of '1280x720', '1920x1080', '1080x1080', '2058x2058', '2112x2112', '2880x2880', '2688x1512' or '3840x2160'.Not all resolutions are supported by every camera model.
54+
- resolution (string): Resolution of the camera. Can be one of '1280x720', '1920x1080', '1080x1080', '2112x2112', '2880x2880', '2688x1512' or '3840x2160'.Not all resolutions are supported by every camera model.
5555
- motionDetectorVersion (integer): The version of the motion detector that will be used by the camera. Only applies to Gen 2 cameras. Defaults to v2.
5656
"""
5757

@@ -61,7 +61,7 @@ def updateDeviceCameraQualityAndRetention(self, serial: str, **kwargs):
6161
options = ['Enhanced', 'High', 'Standard']
6262
assert kwargs['quality'] in options, f'''"quality" cannot be "{kwargs['quality']}", & must be set to one of: {options}'''
6363
if 'resolution' in kwargs:
64-
options = ['1080x1080', '1280x720', '1920x1080', '2058x2058', '2112x2112', '2688x1512', '2880x2880', '3840x2160']
64+
options = ['1080x1080', '1280x720', '1920x1080', '2112x2112', '2688x1512', '2880x2880', '3840x2160']
6565
assert kwargs['resolution'] in options, f'''"resolution" cannot be "{kwargs['resolution']}", & must be set to one of: {options}'''
6666
if 'motionDetectorVersion' in kwargs:
6767
options = [1, 2]

meraki/api/batch/networks.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -588,15 +588,18 @@ def createNetworkMerakiAuthUser(self, networkId: str, email: str, authorizations
588588

589589

590590

591-
def deleteNetworkMerakiAuthUser(self, networkId: str, merakiAuthUserId: str):
591+
def deleteNetworkMerakiAuthUser(self, networkId: str, merakiAuthUserId: str, **kwargs):
592592
"""
593-
**Deauthorize a user**
593+
**Delete an 802.1X RADIUS user, or deauthorize and optionally delete a splash guest or client VPN user.**
594594
https://developer.cisco.com/meraki/api-v1/#!delete-network-meraki-auth-user
595595
596596
- networkId (string): Network ID
597597
- merakiAuthUserId (string): Meraki auth user ID
598+
- delete (boolean): If the ID supplied is for a splash guest or client VPN user, and that user is not authorized for any other networks in the organization, then also delete the user. 802.1X RADIUS users are always deleted regardless of this optional attribute.
598599
"""
599600

601+
kwargs.update(locals())
602+
600603
metadata = {
601604
'tags': ['networks', 'configure', 'merakiAuthUsers'],
602605
'operation': 'deleteNetworkMerakiAuthUser'

meraki/api/camera.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ def updateDeviceCameraQualityAndRetention(self, serial: str, **kwargs):
244244
- audioRecordingEnabled (boolean): Boolean indicating if audio recording is enabled(true) or disabled(false) on the camera
245245
- restrictedBandwidthModeEnabled (boolean): Boolean indicating if restricted bandwidth is enabled(true) or disabled(false) on the camera. This setting does not apply to MV2 cameras.
246246
- quality (string): Quality of the camera. Can be one of 'Standard', 'High' or 'Enhanced'. Not all qualities are supported by every camera model.
247-
- resolution (string): Resolution of the camera. Can be one of '1280x720', '1920x1080', '1080x1080', '2058x2058', '2112x2112', '2880x2880', '2688x1512' or '3840x2160'.Not all resolutions are supported by every camera model.
247+
- resolution (string): Resolution of the camera. Can be one of '1280x720', '1920x1080', '1080x1080', '2112x2112', '2880x2880', '2688x1512' or '3840x2160'.Not all resolutions are supported by every camera model.
248248
- motionDetectorVersion (integer): The version of the motion detector that will be used by the camera. Only applies to Gen 2 cameras. Defaults to v2.
249249
"""
250250

@@ -254,7 +254,7 @@ def updateDeviceCameraQualityAndRetention(self, serial: str, **kwargs):
254254
options = ['Enhanced', 'High', 'Standard']
255255
assert kwargs['quality'] in options, f'''"quality" cannot be "{kwargs['quality']}", & must be set to one of: {options}'''
256256
if 'resolution' in kwargs:
257-
options = ['1080x1080', '1280x720', '1920x1080', '2058x2058', '2112x2112', '2688x1512', '2880x2880', '3840x2160']
257+
options = ['1080x1080', '1280x720', '1920x1080', '2112x2112', '2688x1512', '2880x2880', '3840x2160']
258258
assert kwargs['resolution'] in options, f'''"resolution" cannot be "{kwargs['resolution']}", & must be set to one of: {options}'''
259259
if 'motionDetectorVersion' in kwargs:
260260
options = [1, 2]

meraki/api/networks.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,15 +1506,18 @@ def getNetworkMerakiAuthUser(self, networkId: str, merakiAuthUserId: str):
15061506

15071507

15081508

1509-
def deleteNetworkMerakiAuthUser(self, networkId: str, merakiAuthUserId: str):
1509+
def deleteNetworkMerakiAuthUser(self, networkId: str, merakiAuthUserId: str, **kwargs):
15101510
"""
1511-
**Deauthorize a user**
1511+
**Delete an 802.1X RADIUS user, or deauthorize and optionally delete a splash guest or client VPN user.**
15121512
https://developer.cisco.com/meraki/api-v1/#!delete-network-meraki-auth-user
15131513
15141514
- networkId (string): Network ID
15151515
- merakiAuthUserId (string): Meraki auth user ID
1516+
- delete (boolean): If the ID supplied is for a splash guest or client VPN user, and that user is not authorized for any other networks in the organization, then also delete the user. 802.1X RADIUS users are always deleted regardless of this optional attribute.
15161517
"""
15171518

1519+
kwargs.update(locals())
1520+
15181521
metadata = {
15191522
'tags': ['networks', 'configure', 'merakiAuthUsers'],
15201523
'operation': 'deleteNetworkMerakiAuthUser'

0 commit comments

Comments
 (0)