updated w/ release 0.110.6

Author: Shiyue Cheng

meraki/__init__.py meraki_v0/__init__.pymeraki/__init__.py renamed to meraki_v0/__init__.py

@@ -22,7 +22,7 @@
 from .api.devices import Devices
 from .api.events import Events
 from .api.firewalled_services import FirewalledServices
-from .api.floorplans import Floorplans
+from .api.floor_plans import FloorPlans
 from .api.group_policies import GroupPolicies
 from .api.http_servers import HTTPServers
 from .api.intrusion_settings import IntrusionSettings
@@ -88,7 +88,7 @@
 )
 
 
-__version__ = '0.110.5'
+__version__ = '0.110.6'
 
 
 class DashboardAPI(object):
@@ -199,7 +199,7 @@ def __init__(self, api_key=None, base_url=DEFAULT_BASE_URL, single_request_timeo
         self.devices = Devices(self._session)
         self.events = Events(self._session)
         self.firewalled_services = FirewalledServices(self._session)
-        self.floorplans = Floorplans(self._session)
+        self.floor_plans = FloorPlans(self._session)
         self.group_policies = GroupPolicies(self._session)
         self.http_servers = HTTPServers(self._session)
         self.intrusion_settings = IntrusionSettings(self._session)

meraki/aio/__init__.py meraki_v0/aio/__init__.pymeraki/aio/__init__.py renamed to meraki_v0/aio/__init__.py

@@ -21,7 +21,7 @@
 from .api.devices import AsyncDevices
 from .api.events import AsyncEvents
 from .api.firewalled_services import AsyncFirewalledServices
-from .api.floorplans import AsyncFloorplans
+from .api.floor_plans import AsyncFloorPlans
 from .api.group_policies import AsyncGroupPolicies
 from .api.http_servers import AsyncHTTPServers
 from .api.intrusion_settings import AsyncIntrusionSettings
@@ -197,7 +197,7 @@ def __init__(self, api_key=None, base_url=DEFAULT_BASE_URL, single_request_timeo
         self.devices = AsyncDevices(self._session)
         self.events = AsyncEvents(self._session)
         self.firewalled_services = AsyncFirewalledServices(self._session)
-        self.floorplans = AsyncFloorplans(self._session)
+        self.floor_plans = AsyncFloorPlans(self._session)
         self.group_policies = AsyncGroupPolicies(self._session)
         self.http_servers = AsyncHTTPServers(self._session)
         self.intrusion_settings = AsyncIntrusionSettings(self._session)

meraki/aio/api/__init__.py meraki_v0/aio/api/__init__.pymeraki/aio/api/__init__.py renamed to meraki_v0/aio/api/__init__.py

@@ -23,25 +23,35 @@ async def createOrganizationActionBatch(self, organizationId: str, actions: list
         resource = f'/organizations/{organizationId}/actionBatches'
 
         body_params = ['confirmed', 'synchronous', 'actions']
-        payload = {k: v for (k, v) in kwargs.items() if k in body_params}
+        payload = {k.strip(): v for (k, v) in kwargs.items() if k.strip() in body_params}
 
         return await self._session.post(metadata, resource, payload)
 
-    async def getOrganizationActionBatches(self, organizationId: str):
+    async def getOrganizationActionBatches(self, organizationId: str, **kwargs):
         """
         **Return the list of action batches in the organization**
         https://developer.cisco.com/meraki/api/#!get-organization-action-batches
         
         - organizationId (string)
+        - status (string): Filter batches by status. Valid types are pending, completed, and failed.
         """
 
+        kwargs.update(locals())
+
+        if 'status' in kwargs:
+            options = ['pending', 'completed', 'failed']
+            assert kwargs['status'] in options, f'''"status" cannot be "{kwargs['status']}", & must be set to one of: {options}'''
+
         metadata = {
             'tags': ['Action batches'],
             'operation': 'getOrganizationActionBatches',
         }
         resource = f'/organizations/{organizationId}/actionBatches'
 
-        return await self._session.get(metadata, resource)
+        query_params = ['status']
+        params = {k.strip(): v for (k, v) in kwargs.items() if k.strip() in query_params}
+
+        return await self._session.get(metadata, resource, params)
 
     async def getOrganizationActionBatch(self, organizationId: str, actionBatchId: str):
         """
@@ -97,7 +107,7 @@ async def updateOrganizationActionBatch(self, organizationId: str, actionBatchId
         resource = f'/organizations/{organizationId}/actionBatches/{actionBatchId}'
 
         body_params = ['confirmed', 'synchronous']
-        payload = {k: v for (k, v) in kwargs.items() if k in body_params}
+        payload = {k.strip(): v for (k, v) in kwargs.items() if k.strip() in body_params}
 
         return await self._session.put(metadata, resource, payload)
 

meraki/aio/api/action_batches.py meraki_v0/aio/api/action_batches.pymeraki/aio/api/action_batches.py renamed to meraki_v0/aio/api/action_batches.py

@@ -30,32 +30,36 @@ async def createOrganizationAdmin(self, organizationId: str, email: str, name: s
         - orgAccess (string): The privilege of the dashboard administrator on the organization. Can be one of 'full', 'read-only', 'enterprise' or 'none'
         - tags (array): The list of tags that the dashboard administrator has privileges on
         - networks (array): The list of networks that the dashboard administrator has privileges on
+        - authenticationMethod (string): The method of authentication the user will use to sign in to the Meraki dashboard. Can be one of 'Email' or 'Cisco SecureX Sign-On'. The default is Email authentication
         """
 
         kwargs.update(locals())
 
         if 'orgAccess' in kwargs:
             options = ['full', 'read-only', 'enterprise', 'none']
             assert kwargs['orgAccess'] in options, f'''"orgAccess" cannot be "{kwargs['orgAccess']}", & must be set to one of: {options}'''
+        if 'authenticationMethod' in kwargs:
+            options = ['Email', 'Cisco SecureX Sign-On']
+            assert kwargs['authenticationMethod'] in options, f'''"authenticationMethod" cannot be "{kwargs['authenticationMethod']}", & must be set to one of: {options}'''
 
         metadata = {
             'tags': ['Admins'],
             'operation': 'createOrganizationAdmin',
         }
         resource = f'/organizations/{organizationId}/admins'
 
-        body_params = ['email', 'name', 'orgAccess', 'tags', 'networks']
-        payload = {k: v for (k, v) in kwargs.items() if k in body_params}
+        body_params = ['email', 'name', 'orgAccess', 'tags', 'networks', 'authenticationMethod']
+        payload = {k.strip(): v for (k, v) in kwargs.items() if k.strip() in body_params}
 
         return await self._session.post(metadata, resource, payload)
 
-    async def updateOrganizationAdmin(self, organizationId: str, id: str, **kwargs):
+    async def updateOrganizationAdmin(self, organizationId: str, adminId: str, **kwargs):
         """
         **Update an administrator**
         https://developer.cisco.com/meraki/api/#!update-organization-admin
         
         - organizationId (string)
-        - id (string)
+        - adminId (string)
         - name (string): The name of the dashboard administrator
         - orgAccess (string): The privilege of the dashboard administrator on the organization. Can be one of 'full', 'read-only', 'enterprise' or 'none'
         - tags (array): The list of tags that the dashboard administrator has privileges on
@@ -72,27 +76,27 @@ async def updateOrganizationAdmin(self, organizationId: str, id: str, **kwargs):
             'tags': ['Admins'],
             'operation': 'updateOrganizationAdmin',
         }
-        resource = f'/organizations/{organizationId}/admins/{id}'
+        resource = f'/organizations/{organizationId}/admins/{adminId}'
 
         body_params = ['name', 'orgAccess', 'tags', 'networks']
-        payload = {k: v for (k, v) in kwargs.items() if k in body_params}
+        payload = {k.strip(): v for (k, v) in kwargs.items() if k.strip() in body_params}
 
         return await self._session.put(metadata, resource, payload)
 
-    async def deleteOrganizationAdmin(self, organizationId: str, id: str):
+    async def deleteOrganizationAdmin(self, organizationId: str, adminId: str):
         """
         **Revoke all access for a dashboard administrator within this organization**
         https://developer.cisco.com/meraki/api/#!delete-organization-admin
         
         - organizationId (string)
-        - id (string)
+        - adminId (string)
         """
 
         metadata = {
             'tags': ['Admins'],
             'operation': 'deleteOrganizationAdmin',
         }
-        resource = f'/organizations/{organizationId}/admins/{id}'
+        resource = f'/organizations/{organizationId}/admins/{adminId}'
 
         return await self._session.delete(metadata, resource)
 

meraki/aio/api/admins.py meraki_v0/aio/api/admins.pymeraki/aio/api/admins.py renamed to meraki_v0/aio/api/admins.py

@@ -38,7 +38,7 @@ async def updateNetworkAlertSettings(self, networkId: str, **kwargs):
         resource = f'/networks/{networkId}/alertSettings'
 
         body_params = ['defaultDestinations', 'alerts']
-        payload = {k: v for (k, v) in kwargs.items() if k in body_params}
+        payload = {k.strip(): v for (k, v) in kwargs.items() if k.strip() in body_params}
 
         return await self._session.put(metadata, resource, payload)
 

meraki/aio/api/alert_settings.py meraki_v0/aio/api/alert_settings.pymeraki/aio/api/alert_settings.py renamed to meraki_v0/aio/api/alert_settings.py

@@ -33,7 +33,7 @@ async def getOrganizationApiRequests(self, organizationId: str, total_pages=1, d
         resource = f'/organizations/{organizationId}/apiRequests'
 
         query_params = ['t0', 't1', 'timespan', 'perPage', 'startingAfter', 'endingBefore', 'adminId', 'path', 'method', 'responseCode', 'sourceIp']
-        params = {k: v for (k, v) in kwargs.items() if k in query_params}
+        params = {k.strip(): v for (k, v) in kwargs.items() if k.strip() in query_params}
 
         return await self._session.get_pages(metadata, resource, params, total_pages, direction)
 
@@ -58,7 +58,7 @@ async def getOrganizationApiRequestsOverview(self, organizationId: str, **kwargs
         resource = f'/organizations/{organizationId}/apiRequests/overview'
 
         query_params = ['t0', 't1', 'timespan']
-        params = {k: v for (k, v) in kwargs.items() if k in query_params}
+        params = {k.strip(): v for (k, v) in kwargs.items() if k.strip() in query_params}
 
         return await self._session.get(metadata, resource, params)
 

meraki/aio/api/api_usage.py meraki_v0/aio/api/api_usage.pymeraki/aio/api/api_usage.py renamed to meraki_v0/aio/api/api_usage.py

@@ -28,7 +28,7 @@ async def getNetworkBluetoothClients(self, networkId: str, total_pages=1, direct
         resource = f'/networks/{networkId}/bluetoothClients'
 
         query_params = ['t0', 'timespan', 'perPage', 'startingAfter', 'endingBefore', 'includeConnectivityHistory']
-        params = {k: v for (k, v) in kwargs.items() if k in query_params}
+        params = {k.strip(): v for (k, v) in kwargs.items() if k.strip() in query_params}
 
         return await self._session.get_pages(metadata, resource, params, total_pages, direction)
 
@@ -53,7 +53,7 @@ async def getNetworkBluetoothClient(self, networkId: str, bluetoothClientId: str
         resource = f'/networks/{networkId}/bluetoothClients/{bluetoothClientId}'
 
         query_params = ['includeConnectivityHistory', 'connectivityHistoryTimespan']
-        params = {k: v for (k, v) in kwargs.items() if k in query_params}
+        params = {k.strip(): v for (k, v) in kwargs.items() if k.strip() in query_params}
 
         return await self._session.get(metadata, resource, params)
 

meraki/aio/api/bluetooth_clients.py meraki_v0/aio/api/bluetooth_clients.pymeraki/aio/api/bluetooth_clients.py renamed to meraki_v0/aio/api/bluetooth_clients.py

@@ -39,7 +39,7 @@ async def updateDeviceWirelessBluetoothSettings(self, serial: str, **kwargs):
         resource = f'/devices/{serial}/wireless/bluetooth/settings'
 
         body_params = ['uuid', 'major', 'minor']
-        payload = {k: v for (k, v) in kwargs.items() if k in body_params}
+        payload = {k.strip(): v for (k, v) in kwargs.items() if k.strip() in body_params}
 
         return await self._session.put(metadata, resource, payload)
 
@@ -86,7 +86,7 @@ async def updateNetworkBluetoothSettings(self, networkId: str, **kwargs):
         resource = f'/networks/{networkId}/bluetoothSettings'
 
         body_params = ['scanningEnabled', 'advertisingEnabled', 'uuid', 'majorMinorAssignmentMode', 'major', 'minor']
-        payload = {k: v for (k, v) in kwargs.items() if k in body_params}
+        payload = {k.strip(): v for (k, v) in kwargs.items() if k.strip() in body_params}
 
         return await self._session.put(metadata, resource, payload)
 

meraki/aio/api/bluetooth_settings.py meraki_v0/aio/api/bluetooth_settings.pymeraki/aio/api/bluetooth_settings.py renamed to meraki_v0/aio/api/bluetooth_settings.py

@@ -45,7 +45,7 @@ async def createNetworkCameraQualityRetentionProfile(self, networkId: str, name:
         resource = f'/networks/{networkId}/camera/qualityRetentionProfiles'
 
         body_params = ['name', 'motionBasedRetentionEnabled', 'restrictedBandwidthModeEnabled', 'audioRecordingEnabled', 'cloudArchiveEnabled', 'motionDetectorVersion', 'scheduleId', 'maxRetentionDays', 'videoSettings']
-        payload = {k: v for (k, v) in kwargs.items() if k in body_params}
+        payload = {k.strip(): v for (k, v) in kwargs.items() if k.strip() in body_params}
 
         return await self._session.post(metadata, resource, payload)
 
@@ -93,7 +93,7 @@ async def updateNetworkCameraQualityRetentionProfile(self, networkId: str, quali
         resource = f'/networks/{networkId}/camera/qualityRetentionProfiles/{qualityRetentionProfileId}'
 
         body_params = ['name', 'motionBasedRetentionEnabled', 'restrictedBandwidthModeEnabled', 'audioRecordingEnabled', 'cloudArchiveEnabled', 'motionDetectorVersion', 'scheduleId', 'maxRetentionDays', 'videoSettings']
-        payload = {k: v for (k, v) in kwargs.items() if k in body_params}
+        payload = {k.strip(): v for (k, v) in kwargs.items() if k.strip() in body_params}
 
         return await self._session.put(metadata, resource, payload)