Skip to content

Commit b1c8676

Browse files
Adding perSsidSettings to the appropriate wireless endpoints.
Also adds Ethernet over GRE where appropriate.
1 parent 3130377 commit b1c8676

4 files changed

Lines changed: 16 additions & 10 deletions

File tree

meraki/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
USE_ITERATOR_FOR_GET_PAGES,
4343
)
4444

45-
__version__ = '1.18.1'
45+
__version__ = '1.18.2'
4646

4747

4848
class DashboardAPI(object):

meraki/aio/api/wireless.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -952,6 +952,7 @@ def createNetworkWirelessRfProfile(self, networkId: str, name: str, bandSelectio
952952
- apBandSettings (object): Settings that will be enabled if selectionType is set to 'ap'.
953953
- twoFourGhzSettings (object): Settings related to 2.4Ghz band
954954
- fiveGhzSettings (object): Settings related to 5Ghz band
955+
- perSsidSettings (object): Per-SSID radio settings by number.
955956
"""
956957

957958
kwargs.update(locals())
@@ -969,7 +970,7 @@ def createNetworkWirelessRfProfile(self, networkId: str, name: str, bandSelectio
969970
}
970971
resource = f'/networks/{networkId}/wireless/rfProfiles'
971972

972-
body_params = ['name', 'clientBalancingEnabled', 'minBitrateType', 'bandSelectionType', 'apBandSettings', 'twoFourGhzSettings', 'fiveGhzSettings', ]
973+
body_params = ['name', 'clientBalancingEnabled', 'minBitrateType', 'bandSelectionType', 'apBandSettings', 'twoFourGhzSettings', 'fiveGhzSettings', 'perSsidSettings', ]
973974
payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
974975

975976
return self._session.post(metadata, resource, payload)
@@ -990,6 +991,7 @@ def updateNetworkWirelessRfProfile(self, networkId: str, rfProfileId: str, **kwa
990991
- apBandSettings (object): Settings that will be enabled if selectionType is set to 'ap'.
991992
- twoFourGhzSettings (object): Settings related to 2.4Ghz band
992993
- fiveGhzSettings (object): Settings related to 5Ghz band
994+
- perSsidSettings (object): Per-SSID radio settings by number.
993995
"""
994996

995997
kwargs.update(locals())
@@ -1007,7 +1009,7 @@ def updateNetworkWirelessRfProfile(self, networkId: str, rfProfileId: str, **kwa
10071009
}
10081010
resource = f'/networks/{networkId}/wireless/rfProfiles/{rfProfileId}'
10091011

1010-
body_params = ['name', 'clientBalancingEnabled', 'minBitrateType', 'bandSelectionType', 'apBandSettings', 'twoFourGhzSettings', 'fiveGhzSettings', ]
1012+
body_params = ['name', 'clientBalancingEnabled', 'minBitrateType', 'bandSelectionType', 'apBandSettings', 'twoFourGhzSettings', 'fiveGhzSettings', 'perSsidSettings', ]
10111013
payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
10121014

10131015
return self._session.put(metadata, resource, payload)
@@ -1213,7 +1215,7 @@ def updateNetworkWirelessSsid(self, networkId: str, number: str, **kwargs):
12131215
- radiusAccountingServers (array): The RADIUS accounting 802.1X servers to be used for authentication. This param is only valid if the authMode is 'open-with-radius', '8021x-radius' or 'ipsk-with-radius' and radiusAccountingEnabled is 'true'
12141216
- radiusAccountingInterimInterval (integer): The interval (in seconds) in which accounting information is updated and sent to the RADIUS accounting server.
12151217
- radiusAttributeForGroupPolicies (string): Specify the RADIUS attribute used to look up group policies ('Filter-Id', 'Reply-Message', 'Airespace-ACL-Name' or 'Aruba-User-Role'). Access points must receive this attribute in the RADIUS Access-Accept message
1216-
- ipAssignmentMode (string): The client IP assignment mode ('NAT mode', 'Bridge mode', 'Layer 3 roaming', 'Layer 3 roaming with a concentrator' or 'VPN')
1218+
- ipAssignmentMode (string): The client IP assignment mode ('NAT mode', 'Bridge mode', 'Layer 3 roaming', 'Ethernet over GRE', 'Layer 3 roaming with a concentrator' or 'VPN')
12171219
- useVlanTagging (boolean): Whether or not traffic should be directed to use specific VLANs. This param is only valid if the ipAssignmentMode is 'Bridge mode' or 'Layer 3 roaming'
12181220
- concentratorNetworkId (string): The concentrator to use when the ipAssignmentMode is 'Layer 3 roaming with a concentrator' or 'VPN'.
12191221
- vlanId (integer): The VLAN ID used for VLAN tagging. This param is only valid when the ipAssignmentMode is 'Layer 3 roaming with a concentrator' or 'VPN'

meraki/api/batch/wireless.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ def createNetworkWirelessRfProfile(self, networkId: str, name: str, bandSelectio
149149
- apBandSettings (object): Settings that will be enabled if selectionType is set to 'ap'.
150150
- twoFourGhzSettings (object): Settings related to 2.4Ghz band
151151
- fiveGhzSettings (object): Settings related to 5Ghz band
152+
- perSsidSettings (object): Per-SSID radio settings by number.
152153
"""
153154

154155
kwargs.update(locals())
@@ -166,7 +167,7 @@ def createNetworkWirelessRfProfile(self, networkId: str, name: str, bandSelectio
166167
}
167168
resource = f'/networks/{networkId}/wireless/rfProfiles'
168169

169-
body_params = ['name', 'clientBalancingEnabled', 'minBitrateType', 'bandSelectionType', 'apBandSettings', 'twoFourGhzSettings', 'fiveGhzSettings', ]
170+
body_params = ['name', 'clientBalancingEnabled', 'minBitrateType', 'bandSelectionType', 'apBandSettings', 'twoFourGhzSettings', 'fiveGhzSettings', 'perSsidSettings', ]
170171
payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
171172
action = {
172173
"resource": resource,
@@ -194,6 +195,7 @@ def updateNetworkWirelessRfProfile(self, networkId: str, rfProfileId: str, **kwa
194195
- apBandSettings (object): Settings that will be enabled if selectionType is set to 'ap'.
195196
- twoFourGhzSettings (object): Settings related to 2.4Ghz band
196197
- fiveGhzSettings (object): Settings related to 5Ghz band
198+
- perSsidSettings (object): Per-SSID radio settings by number.
197199
"""
198200

199201
kwargs.update(locals())
@@ -211,7 +213,7 @@ def updateNetworkWirelessRfProfile(self, networkId: str, rfProfileId: str, **kwa
211213
}
212214
resource = f'/networks/{networkId}/wireless/rfProfiles/{rfProfileId}'
213215

214-
body_params = ['name', 'clientBalancingEnabled', 'minBitrateType', 'bandSelectionType', 'apBandSettings', 'twoFourGhzSettings', 'fiveGhzSettings', ]
216+
body_params = ['name', 'clientBalancingEnabled', 'minBitrateType', 'bandSelectionType', 'apBandSettings', 'twoFourGhzSettings', 'fiveGhzSettings', 'perSsidSettings', ]
215217
payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
216218
action = {
217219
"resource": resource,
@@ -328,7 +330,7 @@ def updateNetworkWirelessSsid(self, networkId: str, number: str, **kwargs):
328330
- radiusAccountingServers (array): The RADIUS accounting 802.1X servers to be used for authentication. This param is only valid if the authMode is 'open-with-radius', '8021x-radius' or 'ipsk-with-radius' and radiusAccountingEnabled is 'true'
329331
- radiusAccountingInterimInterval (integer): The interval (in seconds) in which accounting information is updated and sent to the RADIUS accounting server.
330332
- radiusAttributeForGroupPolicies (string): Specify the RADIUS attribute used to look up group policies ('Filter-Id', 'Reply-Message', 'Airespace-ACL-Name' or 'Aruba-User-Role'). Access points must receive this attribute in the RADIUS Access-Accept message
331-
- ipAssignmentMode (string): The client IP assignment mode ('NAT mode', 'Bridge mode', 'Layer 3 roaming', 'Layer 3 roaming with a concentrator' or 'VPN')
333+
- ipAssignmentMode (string): The client IP assignment mode ('NAT mode', 'Bridge mode', 'Layer 3 roaming', 'Ethernet over GRE', 'Layer 3 roaming with a concentrator' or 'VPN')
332334
- useVlanTagging (boolean): Whether or not traffic should be directed to use specific VLANs. This param is only valid if the ipAssignmentMode is 'Bridge mode' or 'Layer 3 roaming'
333335
- concentratorNetworkId (string): The concentrator to use when the ipAssignmentMode is 'Layer 3 roaming with a concentrator' or 'VPN'.
334336
- vlanId (integer): The VLAN ID used for VLAN tagging. This param is only valid when the ipAssignmentMode is 'Layer 3 roaming with a concentrator' or 'VPN'

meraki/api/wireless.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -952,6 +952,7 @@ def createNetworkWirelessRfProfile(self, networkId: str, name: str, bandSelectio
952952
- apBandSettings (object): Settings that will be enabled if selectionType is set to 'ap'.
953953
- twoFourGhzSettings (object): Settings related to 2.4Ghz band
954954
- fiveGhzSettings (object): Settings related to 5Ghz band
955+
- perSsidSettings (object): Per-SSID radio settings by number.
955956
"""
956957

957958
kwargs.update(locals())
@@ -969,7 +970,7 @@ def createNetworkWirelessRfProfile(self, networkId: str, name: str, bandSelectio
969970
}
970971
resource = f'/networks/{networkId}/wireless/rfProfiles'
971972

972-
body_params = ['name', 'clientBalancingEnabled', 'minBitrateType', 'bandSelectionType', 'apBandSettings', 'twoFourGhzSettings', 'fiveGhzSettings', ]
973+
body_params = ['name', 'clientBalancingEnabled', 'minBitrateType', 'bandSelectionType', 'apBandSettings', 'twoFourGhzSettings', 'fiveGhzSettings', 'perSsidSettings', ]
973974
payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
974975

975976
return self._session.post(metadata, resource, payload)
@@ -990,6 +991,7 @@ def updateNetworkWirelessRfProfile(self, networkId: str, rfProfileId: str, **kwa
990991
- apBandSettings (object): Settings that will be enabled if selectionType is set to 'ap'.
991992
- twoFourGhzSettings (object): Settings related to 2.4Ghz band
992993
- fiveGhzSettings (object): Settings related to 5Ghz band
994+
- perSsidSettings (object): Per-SSID radio settings by number.
993995
"""
994996

995997
kwargs.update(locals())
@@ -1007,7 +1009,7 @@ def updateNetworkWirelessRfProfile(self, networkId: str, rfProfileId: str, **kwa
10071009
}
10081010
resource = f'/networks/{networkId}/wireless/rfProfiles/{rfProfileId}'
10091011

1010-
body_params = ['name', 'clientBalancingEnabled', 'minBitrateType', 'bandSelectionType', 'apBandSettings', 'twoFourGhzSettings', 'fiveGhzSettings', ]
1012+
body_params = ['name', 'clientBalancingEnabled', 'minBitrateType', 'bandSelectionType', 'apBandSettings', 'twoFourGhzSettings', 'fiveGhzSettings', 'perSsidSettings', ]
10111013
payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
10121014

10131015
return self._session.put(metadata, resource, payload)
@@ -1213,7 +1215,7 @@ def updateNetworkWirelessSsid(self, networkId: str, number: str, **kwargs):
12131215
- radiusAccountingServers (array): The RADIUS accounting 802.1X servers to be used for authentication. This param is only valid if the authMode is 'open-with-radius', '8021x-radius' or 'ipsk-with-radius' and radiusAccountingEnabled is 'true'
12141216
- radiusAccountingInterimInterval (integer): The interval (in seconds) in which accounting information is updated and sent to the RADIUS accounting server.
12151217
- radiusAttributeForGroupPolicies (string): Specify the RADIUS attribute used to look up group policies ('Filter-Id', 'Reply-Message', 'Airespace-ACL-Name' or 'Aruba-User-Role'). Access points must receive this attribute in the RADIUS Access-Accept message
1216-
- ipAssignmentMode (string): The client IP assignment mode ('NAT mode', 'Bridge mode', 'Layer 3 roaming', 'Layer 3 roaming with a concentrator' or 'VPN')
1218+
- ipAssignmentMode (string): The client IP assignment mode ('NAT mode', 'Bridge mode', 'Layer 3 roaming', 'Ethernet over GRE', 'Layer 3 roaming with a concentrator' or 'VPN')
12171219
- useVlanTagging (boolean): Whether or not traffic should be directed to use specific VLANs. This param is only valid if the ipAssignmentMode is 'Bridge mode' or 'Layer 3 roaming'
12181220
- concentratorNetworkId (string): The concentrator to use when the ipAssignmentMode is 'Layer 3 roaming with a concentrator' or 'VPN'.
12191221
- vlanId (integer): The VLAN ID used for VLAN tagging. This param is only valid when the ipAssignmentMode is 'Layer 3 roaming with a concentrator' or 'VPN'

0 commit comments

Comments
 (0)