Skip to content

Commit 2696790

Browse files
TKIPisalegacycipherGitHub Action
and
GitHub Action
authored
Automatically regenerated library. (#255)
Co-authored-by: GitHub Action <[email protected]>
1 parent 324b78c commit 2696790

18 files changed

+1701
-82
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.45.0'
46+
__version__ = '1.46.0'
4747

4848

4949
class DashboardAPI(object):

meraki/aio/api/appliance.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -2021,14 +2021,24 @@ def createNetworkApplianceVlan(self, networkId: str, id: str, name: str, **kwarg
20212021
- cidr (string): CIDR of the pool of subnets. Applicable only for template network. Each network bound to the template will automatically pick a subnet from this pool to build its own VLAN.
20222022
- mask (integer): Mask used for the subnet of all bound to the template networks. Applicable only for template network.
20232023
- ipv6 (object): IPv6 configuration on the VLAN
2024+
- dhcpHandling (string): The appliance's handling of DHCP requests on this VLAN. One of: 'Run a DHCP server', 'Relay DHCP to another server' or 'Do not respond to DHCP requests'
2025+
- dhcpLeaseTime (string): The term of DHCP leases if the appliance is running a DHCP server on this VLAN. One of: '30 minutes', '1 hour', '4 hours', '12 hours', '1 day' or '1 week'
20242026
- mandatoryDhcp (object): Mandatory DHCP will enforce that clients connecting to this VLAN must use the IP address assigned by the DHCP server. Clients who use a static IP address won't be able to associate. Only available on firmware versions 17.0 and above
2027+
- dhcpBootOptionsEnabled (boolean): Use DHCP boot options specified in other properties
2028+
- dhcpOptions (array): The list of DHCP options that will be included in DHCP responses. Each object in the list should have "code", "type", and "value" properties.
20252029
"""
20262030

20272031
kwargs.update(locals())
20282032

20292033
if 'templateVlanType' in kwargs:
20302034
options = ['same', 'unique']
20312035
assert kwargs['templateVlanType'] in options, f'''"templateVlanType" cannot be "{kwargs['templateVlanType']}", & must be set to one of: {options}'''
2036+
if 'dhcpHandling' in kwargs:
2037+
options = ['Do not respond to DHCP requests', 'Relay DHCP to another server', 'Run a DHCP server']
2038+
assert kwargs['dhcpHandling'] in options, f'''"dhcpHandling" cannot be "{kwargs['dhcpHandling']}", & must be set to one of: {options}'''
2039+
if 'dhcpLeaseTime' in kwargs:
2040+
options = ['1 day', '1 hour', '1 week', '12 hours', '30 minutes', '4 hours']
2041+
assert kwargs['dhcpLeaseTime'] in options, f'''"dhcpLeaseTime" cannot be "{kwargs['dhcpLeaseTime']}", & must be set to one of: {options}'''
20322042

20332043
metadata = {
20342044
'tags': ['appliance', 'configure', 'vlans'],
@@ -2037,7 +2047,7 @@ def createNetworkApplianceVlan(self, networkId: str, id: str, name: str, **kwarg
20372047
networkId = urllib.parse.quote(str(networkId), safe='')
20382048
resource = f'/networks/{networkId}/appliance/vlans'
20392049

2040-
body_params = ['id', 'name', 'subnet', 'applianceIp', 'groupPolicyId', 'templateVlanType', 'cidr', 'mask', 'ipv6', 'mandatoryDhcp', ]
2050+
body_params = ['id', 'name', 'subnet', 'applianceIp', 'groupPolicyId', 'templateVlanType', 'cidr', 'mask', 'ipv6', 'dhcpHandling', 'dhcpLeaseTime', 'mandatoryDhcp', 'dhcpBootOptionsEnabled', 'dhcpOptions', ]
20412051
payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
20422052

20432053
return self._session.post(metadata, resource, payload)

meraki/aio/api/devices.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ def getDeviceLiveToolsArpTable(self, serial: str, arpTableId: str):
206206

207207
def createDeviceLiveToolsCableTest(self, serial: str, ports: list, **kwargs):
208208
"""
209-
**Enqueue a job to perform a cable test for the device on the specified ports.**
209+
**Enqueue a job to perform a cable test for the device on the specified ports**
210210
https://developer.cisco.com/meraki/api-v1/#!create-device-live-tools-cable-test
211211
212212
- serial (string): Serial

meraki/aio/api/networks.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ def getNetworkEvents(self, networkId: str, total_pages=1, direction='prev', even
730730
- total_pages (integer or string): use with perPage to get total results up to total_pages*perPage; -1 or "all" for all pages
731731
- direction (string): direction to paginate, either "next" or "prev" (default) page
732732
- event_log_end_time (string): ISO8601 Zulu/UTC time, to use in conjunction with startingAfter, to retrieve events within a time window
733-
- productType (string): The product type to fetch events for. This parameter is required for networks with multiple device types. Valid types are wireless, appliance, switch, systemsManager, camera, and cellularGateway
733+
- productType (string): The product type to fetch events for. This parameter is required for networks with multiple device types. Valid types are wireless, appliance, switch, systemsManager, camera, cellularGateway, and secureConnect
734734
- includedEventTypes (array): A list of event types. The returned events will be filtered to only include events with these types.
735735
- excludedEventTypes (array): A list of event types. The returned events will be filtered to exclude events with these types.
736736
- deviceMac (string): The MAC address of the Meraki device which the list of events will be filtered with
@@ -749,7 +749,7 @@ def getNetworkEvents(self, networkId: str, total_pages=1, direction='prev', even
749749
kwargs.update(locals())
750750

751751
if 'productType' in kwargs:
752-
options = ['appliance', 'camera', 'cellularGateway', 'switch', 'systemsManager', 'wireless']
752+
options = ['appliance', 'camera', 'cellularGateway', 'secureConnect', 'switch', 'systemsManager', 'wireless']
753753
assert kwargs['productType'] in options, f'''"productType" cannot be "{kwargs['productType']}", & must be set to one of: {options}'''
754754

755755
metadata = {
@@ -852,7 +852,7 @@ def createNetworkFirmwareUpgradesRollback(self, networkId: str, reasons: list, *
852852
kwargs.update(locals())
853853

854854
if 'product' in kwargs:
855-
options = ['appliance', 'camera', 'cellularGateway', 'switch', 'switchCatalyst', 'wireless']
855+
options = ['appliance', 'camera', 'cellularGateway', 'secureConnect', 'switch', 'switchCatalyst', 'wireless']
856856
assert kwargs['product'] in options, f'''"product" cannot be "{kwargs['product']}", & must be set to one of: {options}'''
857857

858858
metadata = {

0 commit comments

Comments
 (0)