Skip to content

Commit 458b038

Browse files
TKIPisalegacycipherGitHub Action
and
GitHub Action
authored
Automatically regenerated library to version 1.54.0. (#274)
Co-authored-by: GitHub Action <[email protected]>
1 parent 3747bd8 commit 458b038

9 files changed

+281
-4
lines changed

meraki/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
)
4444
from meraki.rest_session import *
4545

46-
__version__ = '1.53.0'
46+
__version__ = '1.54.0'
4747

4848

4949
class DashboardAPI(object):

meraki/aio/api/organizations.py

+72
Original file line numberDiff line numberDiff line change
@@ -1983,6 +1983,78 @@ def getOrganizationDevicesAvailabilitiesChangeHistory(self, organizationId: str,
19831983

19841984

19851985

1986+
def createOrganizationDevicesControllerMigration(self, organizationId: str, serials: list, target: str):
1987+
"""
1988+
**Migrate devices to another controller or management mode**
1989+
https://developer.cisco.com/meraki/api-v1/#!create-organization-devices-controller-migration
1990+
1991+
- organizationId (string): Organization ID
1992+
- serials (array): A list of Meraki Serials to migrate
1993+
- target (string): The controller or management mode to which the devices will be migrated
1994+
"""
1995+
1996+
kwargs = locals()
1997+
1998+
if 'target' in kwargs:
1999+
options = ['wirelessController']
2000+
assert kwargs['target'] in options, f'''"target" cannot be "{kwargs['target']}", & must be set to one of: {options}'''
2001+
2002+
metadata = {
2003+
'tags': ['organizations', 'configure', 'devices', 'controller', 'migrations'],
2004+
'operation': 'createOrganizationDevicesControllerMigration'
2005+
}
2006+
organizationId = urllib.parse.quote(str(organizationId), safe='')
2007+
resource = f'/organizations/{organizationId}/devices/controller/migrations'
2008+
2009+
body_params = ['serials', 'target', ]
2010+
payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
2011+
2012+
return self._session.post(metadata, resource, payload)
2013+
2014+
2015+
2016+
def getOrganizationDevicesControllerMigrations(self, organizationId: str, total_pages=1, direction='next', **kwargs):
2017+
"""
2018+
**Retrieve device migration statuses in an organization**
2019+
https://developer.cisco.com/meraki/api-v1/#!get-organization-devices-controller-migrations
2020+
2021+
- organizationId (string): Organization ID
2022+
- total_pages (integer or string): use with perPage to get total results up to total_pages*perPage; -1 or "all" for all pages
2023+
- direction (string): direction to paginate, either "next" (default) or "prev" page
2024+
- serials (array): A list of Meraki Serials for which to retrieve migrations
2025+
- networkIds (array): Filter device migrations by network IDs
2026+
- target (string): Filter device migrations by target destination
2027+
- perPage (integer): The number of entries per page returned. Acceptable range is 3 - 1000. Default is 100.
2028+
- 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.
2029+
- 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.
2030+
"""
2031+
2032+
kwargs.update(locals())
2033+
2034+
if 'target' in kwargs:
2035+
options = ['wirelessController']
2036+
assert kwargs['target'] in options, f'''"target" cannot be "{kwargs['target']}", & must be set to one of: {options}'''
2037+
2038+
metadata = {
2039+
'tags': ['organizations', 'configure', 'devices', 'controller', 'migrations'],
2040+
'operation': 'getOrganizationDevicesControllerMigrations'
2041+
}
2042+
organizationId = urllib.parse.quote(str(organizationId), safe='')
2043+
resource = f'/organizations/{organizationId}/devices/controller/migrations'
2044+
2045+
query_params = ['serials', 'networkIds', 'target', 'perPage', 'startingAfter', 'endingBefore', ]
2046+
params = {k.strip(): v for k, v in kwargs.items() if k.strip() in query_params}
2047+
2048+
array_params = ['serials', 'networkIds', ]
2049+
for k, v in kwargs.items():
2050+
if k.strip() in array_params:
2051+
params[f'{k.strip()}[]'] = kwargs[f'{k}']
2052+
params.pop(k.strip())
2053+
2054+
return self._session.get_pages(metadata, resource, params, total_pages, direction)
2055+
2056+
2057+
19862058
def bulkUpdateOrganizationDevicesDetails(self, organizationId: str, serials: list, details: list):
19872059
"""
19882060
**Updating device details (currently only used for Catalyst devices)**

meraki/aio/api/switch.py

+47
Original file line numberDiff line numberDiff line change
@@ -2729,3 +2729,50 @@ def getOrganizationSwitchPortsTopologyDiscoveryByDevice(self, organizationId: st
27292729

27302730
return self._session.get_pages(metadata, resource, params, total_pages, direction)
27312731

2732+
2733+
2734+
def getOrganizationSwitchPortsUsageHistoryByDeviceByInterval(self, organizationId: str, total_pages=1, direction='next', **kwargs):
2735+
"""
2736+
**List the historical usage and traffic data of switchports in an organization.**
2737+
https://developer.cisco.com/meraki/api-v1/#!get-organization-switch-ports-usage-history-by-device-by-interval
2738+
2739+
- organizationId (string): Organization ID
2740+
- total_pages (integer or string): use with perPage to get total results up to total_pages*perPage; -1 or "all" for all pages
2741+
- direction (string): direction to paginate, either "next" (default) or "prev" page
2742+
- t0 (string): The beginning of the timespan for the data. The maximum lookback period is 31 days from today.
2743+
- t1 (string): The end of the timespan for the data. t1 can be a maximum of 31 days after t0.
2744+
- 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. If interval is provided, the timespan will be autocalculated.
2745+
- interval (integer): The time interval in seconds for returned data. The valid intervals are: 300, 1200, 14400, 86400. The default is 1200. Interval is calculated if time params are provided.
2746+
- perPage (integer): The number of entries per page returned. Acceptable range is 3 - 50. Default is 10.
2747+
- 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.
2748+
- 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.
2749+
- configurationUpdatedAfter (string): Optional parameter to filter items to switches where the configuration has been updated after the given timestamp.
2750+
- mac (string): Optional parameter to filter items to switches with MAC addresses that contain the search term or are an exact match.
2751+
- macs (array): Optional parameter to filter items to switches that have one of the provided MAC addresses.
2752+
- name (string): Optional parameter to filter items to switches with names that contain the search term or are an exact match.
2753+
- networkIds (array): Optional parameter to filter items to switches in one of the provided networks.
2754+
- portProfileIds (array): Optional parameter to filter items to switches that contain switchports belonging to one of the specified port profiles.
2755+
- serial (string): Optional parameter to filter items to switches with serial number that contains the search term or are an exact match.
2756+
- serials (array): Optional parameter to filter items to switches that have one of the provided serials.
2757+
"""
2758+
2759+
kwargs.update(locals())
2760+
2761+
metadata = {
2762+
'tags': ['switch', 'monitor', 'ports', 'usage', 'history', 'byDevice', 'byInterval'],
2763+
'operation': 'getOrganizationSwitchPortsUsageHistoryByDeviceByInterval'
2764+
}
2765+
organizationId = urllib.parse.quote(str(organizationId), safe='')
2766+
resource = f'/organizations/{organizationId}/switch/ports/usage/history/byDevice/byInterval'
2767+
2768+
query_params = ['t0', 't1', 'timespan', 'interval', 'perPage', 'startingAfter', 'endingBefore', 'configurationUpdatedAfter', 'mac', 'macs', 'name', 'networkIds', 'portProfileIds', 'serial', 'serials', ]
2769+
params = {k.strip(): v for k, v in kwargs.items() if k.strip() in query_params}
2770+
2771+
array_params = ['macs', 'networkIds', 'portProfileIds', 'serials', ]
2772+
for k, v in kwargs.items():
2773+
if k.strip() in array_params:
2774+
params[f'{k.strip()}[]'] = kwargs[f'{k}']
2775+
params.pop(k.strip())
2776+
2777+
return self._session.get_pages(metadata, resource, params, total_pages, direction)
2778+

meraki/aio/api/wireless.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1687,6 +1687,7 @@ def updateNetworkWirelessSsid(self, networkId: str, number: str, **kwargs):
16871687
- radiusServerTimeout (integer): The amount of time for which a RADIUS client waits for a reply from the RADIUS server (must be between 1-10 seconds).
16881688
- radiusServerAttemptsLimit (integer): The maximum number of transmit attempts after which a RADIUS server is failed over (must be between 1-5).
16891689
- radiusFallbackEnabled (boolean): Whether or not higher priority RADIUS servers should be retried after 60 seconds.
1690+
- radiusRadsec (object): The current settings for RADIUS RADSec
16901691
- radiusCoaEnabled (boolean): If true, Meraki devices will act as a RADIUS Dynamic Authorization Server and will respond to RADIUS Change-of-Authorization and Disconnect messages sent by the RADIUS server.
16911692
- radiusFailoverPolicy (string): This policy determines how authentication requests should be handled in the event that all of the configured RADIUS servers are unreachable ('Deny access' or 'Allow access')
16921693
- radiusLoadBalancingPolicy (string): This policy determines which RADIUS server will be contacted first in an authentication attempt and the ordering of any necessary retry attempts ('Strict priority order' or 'Round robin')
@@ -1760,7 +1761,7 @@ def updateNetworkWirelessSsid(self, networkId: str, number: str, **kwargs):
17601761
number = urllib.parse.quote(str(number), safe='')
17611762
resource = f'/networks/{networkId}/wireless/ssids/{number}'
17621763

1763-
body_params = ['name', 'enabled', 'localAuth', 'authMode', 'enterpriseAdminAccess', 'encryptionMode', 'psk', 'wpaEncryptionMode', 'dot11w', 'dot11r', 'splashPage', 'splashGuestSponsorDomains', 'oauth', 'localRadius', 'ldap', 'activeDirectory', 'radiusServers', 'radiusProxyEnabled', 'radiusTestingEnabled', 'radiusCalledStationId', 'radiusAuthenticationNasId', 'radiusServerTimeout', 'radiusServerAttemptsLimit', 'radiusFallbackEnabled', 'radiusCoaEnabled', 'radiusFailoverPolicy', 'radiusLoadBalancingPolicy', 'radiusAccountingEnabled', 'radiusAccountingServers', 'radiusAccountingInterimInterval', 'radiusAttributeForGroupPolicies', 'ipAssignmentMode', 'useVlanTagging', 'concentratorNetworkId', 'secondaryConcentratorNetworkId', 'disassociateClientsOnVpnFailover', 'vlanId', 'defaultVlanId', 'apTagsAndVlanIds', 'walledGardenEnabled', 'walledGardenRanges', 'gre', 'radiusOverride', 'radiusGuestVlanEnabled', 'radiusGuestVlanId', 'minBitrate', 'bandSelection', 'perClientBandwidthLimitUp', 'perClientBandwidthLimitDown', 'perSsidBandwidthLimitUp', 'perSsidBandwidthLimitDown', 'lanIsolationEnabled', 'visible', 'availableOnAllAps', 'availabilityTags', 'mandatoryDhcpEnabled', 'adultContentFilteringEnabled', 'dnsRewrite', 'speedBurst', 'namedVlans', ]
1764+
body_params = ['name', 'enabled', 'localAuth', 'authMode', 'enterpriseAdminAccess', 'encryptionMode', 'psk', 'wpaEncryptionMode', 'dot11w', 'dot11r', 'splashPage', 'splashGuestSponsorDomains', 'oauth', 'localRadius', 'ldap', 'activeDirectory', 'radiusServers', 'radiusProxyEnabled', 'radiusTestingEnabled', 'radiusCalledStationId', 'radiusAuthenticationNasId', 'radiusServerTimeout', 'radiusServerAttemptsLimit', 'radiusFallbackEnabled', 'radiusRadsec', 'radiusCoaEnabled', 'radiusFailoverPolicy', 'radiusLoadBalancingPolicy', 'radiusAccountingEnabled', 'radiusAccountingServers', 'radiusAccountingInterimInterval', 'radiusAttributeForGroupPolicies', 'ipAssignmentMode', 'useVlanTagging', 'concentratorNetworkId', 'secondaryConcentratorNetworkId', 'disassociateClientsOnVpnFailover', 'vlanId', 'defaultVlanId', 'apTagsAndVlanIds', 'walledGardenEnabled', 'walledGardenRanges', 'gre', 'radiusOverride', 'radiusGuestVlanEnabled', 'radiusGuestVlanId', 'minBitrate', 'bandSelection', 'perClientBandwidthLimitUp', 'perClientBandwidthLimitDown', 'perSsidBandwidthLimitUp', 'perSsidBandwidthLimitDown', 'lanIsolationEnabled', 'visible', 'availableOnAllAps', 'availabilityTags', 'mandatoryDhcpEnabled', 'adultContentFilteringEnabled', 'dnsRewrite', 'speedBurst', 'namedVlans', ]
17641765
payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
17651766

17661767
return self._session.put(metadata, resource, payload)

meraki/api/batch/organizations.py

+36
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,42 @@ def updateOrganizationConfigTemplate(self, organizationId: str, configTemplateId
648648

649649

650650

651+
def createOrganizationDevicesControllerMigration(self, organizationId: str, serials: list, target: str):
652+
"""
653+
**Migrate devices to another controller or management mode**
654+
https://developer.cisco.com/meraki/api-v1/#!create-organization-devices-controller-migration
655+
656+
- organizationId (string): Organization ID
657+
- serials (array): A list of Meraki Serials to migrate
658+
- target (string): The controller or management mode to which the devices will be migrated
659+
"""
660+
661+
kwargs = locals()
662+
663+
if 'target' in kwargs:
664+
options = ['wirelessController']
665+
assert kwargs['target'] in options, f'''"target" cannot be "{kwargs['target']}", & must be set to one of: {options}'''
666+
667+
metadata = {
668+
'tags': ['organizations', 'configure', 'devices', 'controller', 'migrations'],
669+
'operation': 'createOrganizationDevicesControllerMigration'
670+
}
671+
resource = f'/organizations/{organizationId}/devices/controller/migrations'
672+
673+
body_params = ['serials', 'target', ]
674+
payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
675+
action = {
676+
"resource": resource,
677+
"operation": "mr/actions/migrate",
678+
"body": payload
679+
}
680+
return action
681+
682+
683+
684+
685+
686+
651687
def bulkUpdateOrganizationDevicesDetails(self, organizationId: str, serials: list, details: list):
652688
"""
653689
**Updating device details (currently only used for Catalyst devices)**

meraki/api/batch/wireless.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,7 @@ def updateNetworkWirelessSsid(self, networkId: str, number: str, **kwargs):
720720
- radiusServerTimeout (integer): The amount of time for which a RADIUS client waits for a reply from the RADIUS server (must be between 1-10 seconds).
721721
- radiusServerAttemptsLimit (integer): The maximum number of transmit attempts after which a RADIUS server is failed over (must be between 1-5).
722722
- radiusFallbackEnabled (boolean): Whether or not higher priority RADIUS servers should be retried after 60 seconds.
723+
- radiusRadsec (object): The current settings for RADIUS RADSec
723724
- radiusCoaEnabled (boolean): If true, Meraki devices will act as a RADIUS Dynamic Authorization Server and will respond to RADIUS Change-of-Authorization and Disconnect messages sent by the RADIUS server.
724725
- radiusFailoverPolicy (string): This policy determines how authentication requests should be handled in the event that all of the configured RADIUS servers are unreachable ('Deny access' or 'Allow access')
725726
- radiusLoadBalancingPolicy (string): This policy determines which RADIUS server will be contacted first in an authentication attempt and the ordering of any necessary retry attempts ('Strict priority order' or 'Round robin')
@@ -791,7 +792,7 @@ def updateNetworkWirelessSsid(self, networkId: str, number: str, **kwargs):
791792
}
792793
resource = f'/networks/{networkId}/wireless/ssids/{number}'
793794

794-
body_params = ['name', 'enabled', 'localAuth', 'authMode', 'enterpriseAdminAccess', 'encryptionMode', 'psk', 'wpaEncryptionMode', 'dot11w', 'dot11r', 'splashPage', 'splashGuestSponsorDomains', 'oauth', 'localRadius', 'ldap', 'activeDirectory', 'radiusServers', 'radiusProxyEnabled', 'radiusTestingEnabled', 'radiusCalledStationId', 'radiusAuthenticationNasId', 'radiusServerTimeout', 'radiusServerAttemptsLimit', 'radiusFallbackEnabled', 'radiusCoaEnabled', 'radiusFailoverPolicy', 'radiusLoadBalancingPolicy', 'radiusAccountingEnabled', 'radiusAccountingServers', 'radiusAccountingInterimInterval', 'radiusAttributeForGroupPolicies', 'ipAssignmentMode', 'useVlanTagging', 'concentratorNetworkId', 'secondaryConcentratorNetworkId', 'disassociateClientsOnVpnFailover', 'vlanId', 'defaultVlanId', 'apTagsAndVlanIds', 'walledGardenEnabled', 'walledGardenRanges', 'gre', 'radiusOverride', 'radiusGuestVlanEnabled', 'radiusGuestVlanId', 'minBitrate', 'bandSelection', 'perClientBandwidthLimitUp', 'perClientBandwidthLimitDown', 'perSsidBandwidthLimitUp', 'perSsidBandwidthLimitDown', 'lanIsolationEnabled', 'visible', 'availableOnAllAps', 'availabilityTags', 'mandatoryDhcpEnabled', 'adultContentFilteringEnabled', 'dnsRewrite', 'speedBurst', 'namedVlans', ]
795+
body_params = ['name', 'enabled', 'localAuth', 'authMode', 'enterpriseAdminAccess', 'encryptionMode', 'psk', 'wpaEncryptionMode', 'dot11w', 'dot11r', 'splashPage', 'splashGuestSponsorDomains', 'oauth', 'localRadius', 'ldap', 'activeDirectory', 'radiusServers', 'radiusProxyEnabled', 'radiusTestingEnabled', 'radiusCalledStationId', 'radiusAuthenticationNasId', 'radiusServerTimeout', 'radiusServerAttemptsLimit', 'radiusFallbackEnabled', 'radiusRadsec', 'radiusCoaEnabled', 'radiusFailoverPolicy', 'radiusLoadBalancingPolicy', 'radiusAccountingEnabled', 'radiusAccountingServers', 'radiusAccountingInterimInterval', 'radiusAttributeForGroupPolicies', 'ipAssignmentMode', 'useVlanTagging', 'concentratorNetworkId', 'secondaryConcentratorNetworkId', 'disassociateClientsOnVpnFailover', 'vlanId', 'defaultVlanId', 'apTagsAndVlanIds', 'walledGardenEnabled', 'walledGardenRanges', 'gre', 'radiusOverride', 'radiusGuestVlanEnabled', 'radiusGuestVlanId', 'minBitrate', 'bandSelection', 'perClientBandwidthLimitUp', 'perClientBandwidthLimitDown', 'perSsidBandwidthLimitUp', 'perSsidBandwidthLimitDown', 'lanIsolationEnabled', 'visible', 'availableOnAllAps', 'availabilityTags', 'mandatoryDhcpEnabled', 'adultContentFilteringEnabled', 'dnsRewrite', 'speedBurst', 'namedVlans', ]
795796
payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
796797
action = {
797798
"resource": resource,

0 commit comments

Comments
 (0)