Skip to content

Commit

Permalink
Auto-update library to release version 1.32.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
GitHub Action on behalf of TKIPisalegacycipher committed Apr 6, 2023
1 parent ebf3f97 commit f2287de
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 41 deletions.
2 changes: 1 addition & 1 deletion meraki/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
USE_ITERATOR_FOR_GET_PAGES,
)

__version__ = '1.30.0'
__version__ = '1.32.0'


class DashboardAPI(object):
Expand Down
2 changes: 1 addition & 1 deletion meraki/aio/api/appliance.py
Original file line number Diff line number Diff line change
Expand Up @@ -1639,7 +1639,7 @@ def getNetworkApplianceTrafficShapingRules(self, networkId: str):

def getNetworkApplianceTrafficShapingUplinkBandwidth(self, networkId: str):
"""
**Returns the uplink bandwidth settings for your MX network.**
**Returns the uplink bandwidth limits for your MX network**
https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-traffic-shaping-uplink-bandwidth
- networkId (string): (required)
Expand Down
2 changes: 1 addition & 1 deletion meraki/aio/api/networks.py
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ def createNetworkFirmwareUpgradesStagedEvent(self, networkId: str, stages: list,
- networkId (string): (required)
- stages (array): All firmware upgrade stages in the network with their start time.
- products (object): Contains information about the network to update
- products (object): Contains firmware upgrade version information
"""

kwargs.update(locals())
Expand Down
8 changes: 0 additions & 8 deletions meraki/aio/api/organizations.py
Original file line number Diff line number Diff line change
Expand Up @@ -531,13 +531,9 @@ def createOrganizationAdaptivePolicyPolicy(self, organizationId: str, sourceGrou
- organizationId (string): (required)
- sourceGroup (object): The source adaptive policy group (requires one unique attribute)
- destinationGroup (object): The destination adaptive policy group (requires one unique attribute)
- acls (array): An ordered array of adaptive policy ACLs (each requires one unique attribute) that apply to this policy (default: [])
- lastEntryRule (string): The rule to apply if there is no matching ACL (default: "default")
"""

kwargs.update(locals())
Expand Down Expand Up @@ -589,13 +585,9 @@ def updateOrganizationAdaptivePolicyPolicy(self, organizationId: str, id: str, *
- organizationId (string): (required)
- id (string): (required)
- sourceGroup (object): The source adaptive policy group (requires one unique attribute)
- destinationGroup (object): The destination adaptive policy group (requires one unique attribute)
- acls (array): An ordered array of adaptive policy ACLs (each requires one unique attribute) that apply to this policy
- lastEntryRule (string): The rule to apply if there is no matching ACL
"""

kwargs.update(locals())
Expand Down
6 changes: 4 additions & 2 deletions meraki/aio/api/switch.py
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,7 @@ def createNetworkSwitchAccessPolicy(self, networkId: str, name: str, radiusServe
- hostMode (string): Choose the Host Mode for the access policy.
- urlRedirectWalledGardenEnabled (boolean): Enable to restrict access for clients to a specific set of IP addresses or hostnames prior to authentication
- radius (object): Object for RADIUS Settings
- guestPortBouncing (boolean): If enabled, Meraki devices will periodically send access-request messages to these RADIUS servers
- radiusAccountingServers (array): List of RADIUS accounting servers to require connecting devices to authenticate against before granting network access
- radiusGroupAttribute (string): Acceptable values are `""` for None, or `"11"` for Group Policies ACL
- accessPolicyType (string): Access Type of the policy. Automatically 'Hybrid authentication' when hostMode is 'Multi-Domain'.
Expand All @@ -663,7 +664,7 @@ def createNetworkSwitchAccessPolicy(self, networkId: str, name: str, radiusServe
networkId = urllib.parse.quote(str(networkId), safe='')
resource = f'/networks/{networkId}/switch/accessPolicies'

body_params = ['name', 'radiusServers', 'radius', 'radiusTestingEnabled', 'radiusCoaSupportEnabled', 'radiusAccountingEnabled', 'radiusAccountingServers', 'radiusGroupAttribute', 'hostMode', 'accessPolicyType', 'increaseAccessSpeed', 'guestVlanId', 'dot1x', 'voiceVlanClients', 'urlRedirectWalledGardenEnabled', 'urlRedirectWalledGardenRanges', ]
body_params = ['name', 'radiusServers', 'radius', 'guestPortBouncing', 'radiusTestingEnabled', 'radiusCoaSupportEnabled', 'radiusAccountingEnabled', 'radiusAccountingServers', 'radiusGroupAttribute', 'hostMode', 'accessPolicyType', 'increaseAccessSpeed', 'guestVlanId', 'dot1x', 'voiceVlanClients', 'urlRedirectWalledGardenEnabled', 'urlRedirectWalledGardenRanges', ]
payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}

return self._session.post(metadata, resource, payload)
Expand Down Expand Up @@ -701,6 +702,7 @@ def updateNetworkSwitchAccessPolicy(self, networkId: str, accessPolicyNumber: st
- name (string): Name of the access policy
- radiusServers (array): List of RADIUS servers to require connecting devices to authenticate against before granting network access
- radius (object): Object for RADIUS Settings
- guestPortBouncing (boolean): If enabled, Meraki devices will periodically send access-request messages to these RADIUS servers
- radiusTestingEnabled (boolean): If enabled, Meraki devices will periodically send access-request messages to these RADIUS servers
- radiusCoaSupportEnabled (boolean): Change of authentication for RADIUS re-authentication and disconnection
- radiusAccountingEnabled (boolean): Enable to send start, interim-update and stop messages to a configured RADIUS accounting server for tracking connected clients
Expand Down Expand Up @@ -733,7 +735,7 @@ def updateNetworkSwitchAccessPolicy(self, networkId: str, accessPolicyNumber: st
accessPolicyNumber = urllib.parse.quote(str(accessPolicyNumber), safe='')
resource = f'/networks/{networkId}/switch/accessPolicies/{accessPolicyNumber}'

body_params = ['name', 'radiusServers', 'radius', 'radiusTestingEnabled', 'radiusCoaSupportEnabled', 'radiusAccountingEnabled', 'radiusAccountingServers', 'radiusGroupAttribute', 'hostMode', 'accessPolicyType', 'increaseAccessSpeed', 'guestVlanId', 'dot1x', 'voiceVlanClients', 'urlRedirectWalledGardenEnabled', 'urlRedirectWalledGardenRanges', ]
body_params = ['name', 'radiusServers', 'radius', 'guestPortBouncing', 'radiusTestingEnabled', 'radiusCoaSupportEnabled', 'radiusAccountingEnabled', 'radiusAccountingServers', 'radiusGroupAttribute', 'hostMode', 'accessPolicyType', 'increaseAccessSpeed', 'guestVlanId', 'dot1x', 'voiceVlanClients', 'urlRedirectWalledGardenEnabled', 'urlRedirectWalledGardenRanges', ]
payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}

return self._session.put(metadata, resource, payload)
Expand Down
4 changes: 2 additions & 2 deletions meraki/aio/api/wireless.py
Original file line number Diff line number Diff line change
Expand Up @@ -1244,7 +1244,7 @@ def updateNetworkWirelessSsid(self, networkId: str, number: str, **kwargs):
- enterpriseAdminAccess (string): Whether or not an SSID is accessible by 'enterprise' administrators ('access disabled' or 'access enabled')
- encryptionMode (string): The psk encryption mode for the SSID ('wep' or 'wpa'). This param is only valid if the authMode is 'psk'
- psk (string): The passkey for the SSID. This param is only valid if the authMode is 'psk'
- wpaEncryptionMode (string): The types of WPA encryption. ('WPA1 only', 'WPA1 and WPA2', 'WPA2 only', 'WPA3 Transition Mode' or 'WPA3 only')
- wpaEncryptionMode (string): The types of WPA encryption. ('WPA1 only', 'WPA1 and WPA2', 'WPA2 only', 'WPA3 Transition Mode', 'WPA3 only' or 'WPA3 192-bit Security')
- dot11w (object): The current setting for Protected Management Frames (802.11w).
- dot11r (object): The current setting for 802.11r
- splashPage (string): The type of splash page for the SSID ('None', 'Click-through splash page', 'Billing', 'Password-protected with Meraki RADIUS', 'Password-protected with custom RADIUS', 'Password-protected with Active Directory', 'Password-protected with LDAP', 'SMS authentication', 'Systems Manager Sentry', 'Facebook Wi-Fi', 'Google OAuth', 'Sponsored guest', 'Cisco ISE' or 'Google Apps domain'). This attribute is not supported for template children.
Expand Down Expand Up @@ -1310,7 +1310,7 @@ def updateNetworkWirelessSsid(self, networkId: str, number: str, **kwargs):
options = ['wep', 'wpa']
assert kwargs['encryptionMode'] in options, f'''"encryptionMode" cannot be "{kwargs['encryptionMode']}", & must be set to one of: {options}'''
if 'wpaEncryptionMode' in kwargs:
options = ['WPA1 and WPA2', 'WPA1 only', 'WPA2 only', 'WPA3 Transition Mode', 'WPA3 only']
options = ['WPA1 and WPA2', 'WPA1 only', 'WPA2 only', 'WPA3 192-bit Security', 'WPA3 Transition Mode', 'WPA3 only']
assert kwargs['wpaEncryptionMode'] in options, f'''"wpaEncryptionMode" cannot be "{kwargs['wpaEncryptionMode']}", & must be set to one of: {options}'''
if 'splashPage' in kwargs:
options = ['Billing', 'Cisco ISE', 'Click-through splash page', 'Facebook Wi-Fi', 'Google Apps domain', 'Google OAuth', 'None', 'Password-protected with Active Directory', 'Password-protected with LDAP', 'Password-protected with Meraki RADIUS', 'Password-protected with custom RADIUS', 'SMS authentication', 'Sponsored guest', 'Systems Manager Sentry']
Expand Down
2 changes: 1 addition & 1 deletion meraki/api/appliance.py
Original file line number Diff line number Diff line change
Expand Up @@ -1639,7 +1639,7 @@ def getNetworkApplianceTrafficShapingRules(self, networkId: str):

def getNetworkApplianceTrafficShapingUplinkBandwidth(self, networkId: str):
"""
**Returns the uplink bandwidth settings for your MX network.**
**Returns the uplink bandwidth limits for your MX network**
https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-traffic-shaping-uplink-bandwidth
- networkId (string): (required)
Expand Down
8 changes: 0 additions & 8 deletions meraki/api/batch/organizations.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,13 +212,9 @@ def createOrganizationAdaptivePolicyPolicy(self, organizationId: str, sourceGrou
- organizationId (string): (required)
- sourceGroup (object): The source adaptive policy group (requires one unique attribute)
- destinationGroup (object): The destination adaptive policy group (requires one unique attribute)
- acls (array): An ordered array of adaptive policy ACLs (each requires one unique attribute) that apply to this policy (default: [])
- lastEntryRule (string): The rule to apply if there is no matching ACL (default: "default")
"""

kwargs.update(locals())
Expand Down Expand Up @@ -255,13 +251,9 @@ def updateOrganizationAdaptivePolicyPolicy(self, organizationId: str, id: str, *
- organizationId (string): (required)
- id (string): (required)
- sourceGroup (object): The source adaptive policy group (requires one unique attribute)
- destinationGroup (object): The destination adaptive policy group (requires one unique attribute)
- acls (array): An ordered array of adaptive policy ACLs (each requires one unique attribute) that apply to this policy
- lastEntryRule (string): The rule to apply if there is no matching ACL
"""

kwargs.update(locals())
Expand Down
6 changes: 4 additions & 2 deletions meraki/api/batch/switch.py
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ def createNetworkSwitchAccessPolicy(self, networkId: str, name: str, radiusServe
- hostMode (string): Choose the Host Mode for the access policy.
- urlRedirectWalledGardenEnabled (boolean): Enable to restrict access for clients to a specific set of IP addresses or hostnames prior to authentication
- radius (object): Object for RADIUS Settings
- guestPortBouncing (boolean): If enabled, Meraki devices will periodically send access-request messages to these RADIUS servers
- radiusAccountingServers (array): List of RADIUS accounting servers to require connecting devices to authenticate against before granting network access
- radiusGroupAttribute (string): Acceptable values are `""` for None, or `"11"` for Group Policies ACL
- accessPolicyType (string): Access Type of the policy. Automatically 'Hybrid authentication' when hostMode is 'Multi-Domain'.
Expand All @@ -440,7 +441,7 @@ def createNetworkSwitchAccessPolicy(self, networkId: str, name: str, radiusServe
}
resource = f'/networks/{networkId}/switch/accessPolicies'

body_params = ['name', 'radiusServers', 'radius', 'radiusTestingEnabled', 'radiusCoaSupportEnabled', 'radiusAccountingEnabled', 'radiusAccountingServers', 'radiusGroupAttribute', 'hostMode', 'accessPolicyType', 'increaseAccessSpeed', 'guestVlanId', 'dot1x', 'voiceVlanClients', 'urlRedirectWalledGardenEnabled', 'urlRedirectWalledGardenRanges', ]
body_params = ['name', 'radiusServers', 'radius', 'guestPortBouncing', 'radiusTestingEnabled', 'radiusCoaSupportEnabled', 'radiusAccountingEnabled', 'radiusAccountingServers', 'radiusGroupAttribute', 'hostMode', 'accessPolicyType', 'increaseAccessSpeed', 'guestVlanId', 'dot1x', 'voiceVlanClients', 'urlRedirectWalledGardenEnabled', 'urlRedirectWalledGardenRanges', ]
payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
action = {
"resource": resource,
Expand All @@ -464,6 +465,7 @@ def updateNetworkSwitchAccessPolicy(self, networkId: str, accessPolicyNumber: st
- name (string): Name of the access policy
- radiusServers (array): List of RADIUS servers to require connecting devices to authenticate against before granting network access
- radius (object): Object for RADIUS Settings
- guestPortBouncing (boolean): If enabled, Meraki devices will periodically send access-request messages to these RADIUS servers
- radiusTestingEnabled (boolean): If enabled, Meraki devices will periodically send access-request messages to these RADIUS servers
- radiusCoaSupportEnabled (boolean): Change of authentication for RADIUS re-authentication and disconnection
- radiusAccountingEnabled (boolean): Enable to send start, interim-update and stop messages to a configured RADIUS accounting server for tracking connected clients
Expand Down Expand Up @@ -494,7 +496,7 @@ def updateNetworkSwitchAccessPolicy(self, networkId: str, accessPolicyNumber: st
}
resource = f'/networks/{networkId}/switch/accessPolicies/{accessPolicyNumber}'

body_params = ['name', 'radiusServers', 'radius', 'radiusTestingEnabled', 'radiusCoaSupportEnabled', 'radiusAccountingEnabled', 'radiusAccountingServers', 'radiusGroupAttribute', 'hostMode', 'accessPolicyType', 'increaseAccessSpeed', 'guestVlanId', 'dot1x', 'voiceVlanClients', 'urlRedirectWalledGardenEnabled', 'urlRedirectWalledGardenRanges', ]
body_params = ['name', 'radiusServers', 'radius', 'guestPortBouncing', 'radiusTestingEnabled', 'radiusCoaSupportEnabled', 'radiusAccountingEnabled', 'radiusAccountingServers', 'radiusGroupAttribute', 'hostMode', 'accessPolicyType', 'increaseAccessSpeed', 'guestVlanId', 'dot1x', 'voiceVlanClients', 'urlRedirectWalledGardenEnabled', 'urlRedirectWalledGardenRanges', ]
payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
action = {
"resource": resource,
Expand Down
4 changes: 2 additions & 2 deletions meraki/api/batch/wireless.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ def updateNetworkWirelessSsid(self, networkId: str, number: str, **kwargs):
- enterpriseAdminAccess (string): Whether or not an SSID is accessible by 'enterprise' administrators ('access disabled' or 'access enabled')
- encryptionMode (string): The psk encryption mode for the SSID ('wep' or 'wpa'). This param is only valid if the authMode is 'psk'
- psk (string): The passkey for the SSID. This param is only valid if the authMode is 'psk'
- wpaEncryptionMode (string): The types of WPA encryption. ('WPA1 only', 'WPA1 and WPA2', 'WPA2 only', 'WPA3 Transition Mode' or 'WPA3 only')
- wpaEncryptionMode (string): The types of WPA encryption. ('WPA1 only', 'WPA1 and WPA2', 'WPA2 only', 'WPA3 Transition Mode', 'WPA3 only' or 'WPA3 192-bit Security')
- dot11w (object): The current setting for Protected Management Frames (802.11w).
- dot11r (object): The current setting for 802.11r
- splashPage (string): The type of splash page for the SSID ('None', 'Click-through splash page', 'Billing', 'Password-protected with Meraki RADIUS', 'Password-protected with custom RADIUS', 'Password-protected with Active Directory', 'Password-protected with LDAP', 'SMS authentication', 'Systems Manager Sentry', 'Facebook Wi-Fi', 'Google OAuth', 'Sponsored guest', 'Cisco ISE' or 'Google Apps domain'). This attribute is not supported for template children.
Expand Down Expand Up @@ -376,7 +376,7 @@ def updateNetworkWirelessSsid(self, networkId: str, number: str, **kwargs):
options = ['wep', 'wpa']
assert kwargs['encryptionMode'] in options, f'''"encryptionMode" cannot be "{kwargs['encryptionMode']}", & must be set to one of: {options}'''
if 'wpaEncryptionMode' in kwargs:
options = ['WPA1 and WPA2', 'WPA1 only', 'WPA2 only', 'WPA3 Transition Mode', 'WPA3 only']
options = ['WPA1 and WPA2', 'WPA1 only', 'WPA2 only', 'WPA3 192-bit Security', 'WPA3 Transition Mode', 'WPA3 only']
assert kwargs['wpaEncryptionMode'] in options, f'''"wpaEncryptionMode" cannot be "{kwargs['wpaEncryptionMode']}", & must be set to one of: {options}'''
if 'splashPage' in kwargs:
options = ['Billing', 'Cisco ISE', 'Click-through splash page', 'Facebook Wi-Fi', 'Google Apps domain', 'Google OAuth', 'None', 'Password-protected with Active Directory', 'Password-protected with LDAP', 'Password-protected with Meraki RADIUS', 'Password-protected with custom RADIUS', 'SMS authentication', 'Sponsored guest', 'Systems Manager Sentry']
Expand Down
2 changes: 1 addition & 1 deletion meraki/api/networks.py
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ def createNetworkFirmwareUpgradesStagedEvent(self, networkId: str, stages: list,
- networkId (string): (required)
- stages (array): All firmware upgrade stages in the network with their start time.
- products (object): Contains information about the network to update
- products (object): Contains firmware upgrade version information
"""

kwargs.update(locals())
Expand Down
8 changes: 0 additions & 8 deletions meraki/api/organizations.py
Original file line number Diff line number Diff line change
Expand Up @@ -531,13 +531,9 @@ def createOrganizationAdaptivePolicyPolicy(self, organizationId: str, sourceGrou
- organizationId (string): (required)
- sourceGroup (object): The source adaptive policy group (requires one unique attribute)
- destinationGroup (object): The destination adaptive policy group (requires one unique attribute)
- acls (array): An ordered array of adaptive policy ACLs (each requires one unique attribute) that apply to this policy (default: [])
- lastEntryRule (string): The rule to apply if there is no matching ACL (default: "default")
"""

kwargs.update(locals())
Expand Down Expand Up @@ -589,13 +585,9 @@ def updateOrganizationAdaptivePolicyPolicy(self, organizationId: str, id: str, *
- organizationId (string): (required)
- id (string): (required)
- sourceGroup (object): The source adaptive policy group (requires one unique attribute)
- destinationGroup (object): The destination adaptive policy group (requires one unique attribute)
- acls (array): An ordered array of adaptive policy ACLs (each requires one unique attribute) that apply to this policy
- lastEntryRule (string): The rule to apply if there is no matching ACL
"""

kwargs.update(locals())
Expand Down
Loading

0 comments on commit f2287de

Please sign in to comment.