updated w/ release 1.2.0

Author: Shiyue Cheng

meraki/__init__.py

@@ -20,7 +20,7 @@
     SUPPRESS_LOGGING, SIMULATE_API_CALLS, BE_GEO_ID, MERAKI_PYTHON_SDK_CALLER
 )
 
-__version__ = '1.1.0b4'
+__version__ = '1.2.0'
 
 class DashboardAPI(object):
     """

meraki/aio/api/organizations.py

@@ -993,6 +993,55 @@ def updateOrganizationLicense(self, organizationId: str, licenseId: str, **kwarg
 
         return self._session.put(metadata, resource, payload)
 
+    def getOrganizationLoginSecurity(self, organizationId: str):
+        """
+        **Returns the login security settings for an organization.**
+        https://developer.cisco.com/meraki/api-v1/#!get-organization-login-security
+
+        - organizationId (string): (required)
+        """
+
+        metadata = {
+            'tags': ['organizations', 'configure', 'loginSecurity'],
+            'operation': 'getOrganizationLoginSecurity'
+        }
+        resource = f'/organizations/{organizationId}/loginSecurity'
+
+        return self._session.get(metadata, resource)
+
+    def updateOrganizationLoginSecurity(self, organizationId: str, **kwargs):
+        """
+        **Update the login security settings for an organization**
+        https://developer.cisco.com/meraki/api-v1/#!update-organization-login-security
+
+        - organizationId (string): (required)
+        - enforcePasswordExpiration (boolean): Boolean indicating whether users are forced to change their password every X number of days.
+        - passwordExpirationDays (integer): Number of days after which users will be forced to change their password.
+        - enforceDifferentPasswords (boolean): Boolean indicating whether users, when setting a new password, are forced to choose a new password that is different from any past passwords.
+        - numDifferentPasswords (integer): Number of recent passwords that new password must be distinct from.
+        - enforceStrongPasswords (boolean): Boolean indicating whether users will be forced to choose strong passwords for their accounts. Strong passwords are at least 8 characters that contain 3 of the following: number, uppercase letter, lowercase letter, and symbol
+        - enforceAccountLockout (boolean): Boolean indicating whether users' Dashboard accounts will be locked out after a specified number of consecutive failed login attempts.
+        - accountLockoutAttempts (integer): Number of consecutive failed login attempts after which users' accounts will be locked.
+        - enforceIdleTimeout (boolean): Boolean indicating whether users will be logged out after being idle for the specified number of minutes.
+        - idleTimeoutMinutes (integer): Number of minutes users can remain idle before being logged out of their accounts.
+        - enforceTwoFactorAuth (boolean): Boolean indicating whether users in this organization will be required to use an extra verification code when logging in to Dashboard. This code will be sent to their mobile phone via SMS, or can be generated by the Google Authenticator application.
+        - enforceLoginIpRanges (boolean): Boolean indicating whether organization will restrict access to Dashboard (including the API) from certain IP addresses.
+        - loginIpRanges (array): List of acceptable IP ranges. Entries can be single IP addresses, IP address ranges, and CIDR subnets.
+        """
+
+        kwargs.update(locals())
+
+        metadata = {
+            'tags': ['organizations', 'configure', 'loginSecurity'],
+            'operation': 'updateOrganizationLoginSecurity'
+        }
+        resource = f'/organizations/{organizationId}/loginSecurity'
+
+        body_params = ['enforcePasswordExpiration', 'passwordExpirationDays', 'enforceDifferentPasswords', 'numDifferentPasswords', 'enforceStrongPasswords', 'enforceAccountLockout', 'accountLockoutAttempts', 'enforceIdleTimeout', 'idleTimeoutMinutes', 'enforceTwoFactorAuth', 'enforceLoginIpRanges', 'loginIpRanges', ]
+        payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
+
+        return self._session.put(metadata, resource, payload)
+
     def getOrganizationNetworks(self, organizationId: str, total_pages=1, direction='next', **kwargs):
         """
         **List the networks that the user has privileges on in an organization**

meraki/aio/api/switch.py

@@ -514,6 +514,139 @@ def updateNetworkSwitchAccessControlLists(self, networkId: str, rules: list):
 
         return self._session.put(metadata, resource, payload)
 
+    def getNetworkSwitchAccessPolicies(self, networkId: str):
+        """
+        **List the access policies for a switch network**
+        https://developer.cisco.com/meraki/api-v1/#!get-network-switch-access-policies
+
+        - networkId (string): (required)
+        """
+
+        metadata = {
+            'tags': ['switch', 'configure', 'accessPolicies'],
+            'operation': 'getNetworkSwitchAccessPolicies'
+        }
+        resource = f'/networks/{networkId}/switch/accessPolicies'
+
+        return self._session.get(metadata, resource)
+
+    def createNetworkSwitchAccessPolicy(self, networkId: str, name: str, radiusServers: list, radiusTestingEnabled: bool, radiusCoaSupportEnabled: bool, radiusAccountingEnabled: bool, hostMode: str, urlRedirectWalledGardenEnabled: bool, **kwargs):
+        """
+        **Create an access policy for a switch network**
+        https://developer.cisco.com/meraki/api-v1/#!create-network-switch-access-policy
+
+        - networkId (string): (required)
+        - name (string): Name of the access policy
+        - radiusServers (array): List of RADIUS servers to require connecting devices to authenticate against before granting network access
+        - 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
+        - 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
+        - radiusAccountingServers (array): List of RADIUS accounting servers to require connecting devices to authenticate against before granting network access
+        - accessPolicyType (string): Access Type of the policy. Automatically 'Hybrid authentication' when hostMode is 'Multi-Domain'.
+        - increaseAccessSpeed (boolean): Enabling this option will make switches execute 802.1X and MAC-bypass authentication simultaneously so that clients authenticate faster. Only required when accessPolicyType is 'Hybrid Authentication.
+        - guestVlanId (integer): ID for the guest VLAN allow unauthorized devices access to limited network resources
+        - voiceVlanClients (boolean): CDP/LLDP capable voice clients will be able to use this VLAN. Automatically true when hostMode is 'Multi-Domain'.
+        - urlRedirectWalledGardenRanges (array): IP address ranges, in CIDR notation, to restrict access for clients to a specific set of IP addresses or hostnames prior to authentication
+        """
+
+        kwargs.update(locals())
+
+        if 'hostMode' in kwargs:
+            options = ['Single-Host', 'Multi-Domain', 'Multi-Host', 'Multi-Auth']
+            assert kwargs['hostMode'] in options, f'''"hostMode" cannot be "{kwargs['hostMode']}", & must be set to one of: {options}'''
+        if 'accessPolicyType' in kwargs:
+            options = ['802.1x', 'MAC authentication bypass', 'Hybrid authentication']
+            assert kwargs['accessPolicyType'] in options, f'''"accessPolicyType" cannot be "{kwargs['accessPolicyType']}", & must be set to one of: {options}'''
+
+        metadata = {
+            'tags': ['switch', 'configure', 'accessPolicies'],
+            'operation': 'createNetworkSwitchAccessPolicy'
+        }
+        resource = f'/networks/{networkId}/switch/accessPolicies'
+
+        body_params = ['name', 'radiusServers', 'radiusTestingEnabled', 'radiusCoaSupportEnabled', 'radiusAccountingEnabled', 'radiusAccountingServers', 'hostMode', 'accessPolicyType', 'increaseAccessSpeed', 'guestVlanId', '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)
+
+    def getNetworkSwitchAccessPolicy(self, networkId: str, accessPolicyNumber: str):
+        """
+        **Return a specific access policy for a switch network**
+        https://developer.cisco.com/meraki/api-v1/#!get-network-switch-access-policy
+
+        - networkId (string): (required)
+        - accessPolicyNumber (string): (required)
+        """
+
+        metadata = {
+            'tags': ['switch', 'configure', 'accessPolicies'],
+            'operation': 'getNetworkSwitchAccessPolicy'
+        }
+        resource = f'/networks/{networkId}/switch/accessPolicies/{accessPolicyNumber}'
+
+        return self._session.get(metadata, resource)
+
+    def updateNetworkSwitchAccessPolicy(self, networkId: str, accessPolicyNumber: str, **kwargs):
+        """
+        **Update an access policy for a switch network**
+        https://developer.cisco.com/meraki/api-v1/#!update-network-switch-access-policy
+
+        - networkId (string): (required)
+        - accessPolicyNumber (string): (required)
+        - name (string): Name of the access policy
+        - radiusServers (array): List of RADIUS servers to require connecting devices to authenticate against before granting network access
+        - 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
+        - radiusAccountingServers (array): List of RADIUS accounting servers to require connecting devices to authenticate against before granting network access
+        - hostMode (string): Choose the Host Mode for the access policy.
+        - accessPolicyType (string): Access Type of the policy. Automatically 'Hybrid authentication' when hostMode is 'Multi-Domain'.
+        - increaseAccessSpeed (boolean): Enabling this option will make switches execute 802.1X and MAC-bypass authentication simultaneously so that clients authenticate faster. Only required when accessPolicyType is 'Hybrid Authentication.
+        - guestVlanId (integer): ID for the guest VLAN allow unauthorized devices access to limited network resources
+        - voiceVlanClients (boolean): CDP/LLDP capable voice clients will be able to use this VLAN. Automatically true when hostMode is 'Multi-Domain'.
+        - urlRedirectWalledGardenEnabled (boolean): Enable to restrict access for clients to a specific set of IP addresses or hostnames prior to authentication
+        - urlRedirectWalledGardenRanges (array): IP address ranges, in CIDR notation, to restrict access for clients to a specific set of IP addresses or hostnames prior to authentication
+        """
+
+        kwargs.update(locals())
+
+        if 'hostMode' in kwargs:
+            options = ['Single-Host', 'Multi-Domain', 'Multi-Host', 'Multi-Auth']
+            assert kwargs['hostMode'] in options, f'''"hostMode" cannot be "{kwargs['hostMode']}", & must be set to one of: {options}'''
+        if 'accessPolicyType' in kwargs:
+            options = ['802.1x', 'MAC authentication bypass', 'Hybrid authentication']
+            assert kwargs['accessPolicyType'] in options, f'''"accessPolicyType" cannot be "{kwargs['accessPolicyType']}", & must be set to one of: {options}'''
+
+        metadata = {
+            'tags': ['switch', 'configure', 'accessPolicies'],
+            'operation': 'updateNetworkSwitchAccessPolicy'
+        }
+        resource = f'/networks/{networkId}/switch/accessPolicies/{accessPolicyNumber}'
+
+        body_params = ['name', 'radiusServers', 'radiusTestingEnabled', 'radiusCoaSupportEnabled', 'radiusAccountingEnabled', 'radiusAccountingServers', 'hostMode', 'accessPolicyType', 'increaseAccessSpeed', 'guestVlanId', '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)
+
+    def deleteNetworkSwitchAccessPolicy(self, networkId: str, accessPolicyNumber: str):
+        """
+        **Delete an access policy for a switch network**
+        https://developer.cisco.com/meraki/api-v1/#!delete-network-switch-access-policy
+
+        - networkId (string): (required)
+        - accessPolicyNumber (string): (required)
+        """
+
+        metadata = {
+            'tags': ['switch', 'configure', 'accessPolicies'],
+            'operation': 'deleteNetworkSwitchAccessPolicy'
+        }
+        resource = f'/networks/{networkId}/switch/accessPolicies/{accessPolicyNumber}'
+
+        return self._session.delete(metadata, resource)
+
     def getNetworkSwitchDhcpServerPolicy(self, networkId: str):
         """
         **Return the DHCP server policy**

meraki/api/organizations.py

@@ -993,6 +993,55 @@ def updateOrganizationLicense(self, organizationId: str, licenseId: str, **kwarg
 
         return self._session.put(metadata, resource, payload)
 
+    def getOrganizationLoginSecurity(self, organizationId: str):
+        """
+        **Returns the login security settings for an organization.**
+        https://developer.cisco.com/meraki/api-v1/#!get-organization-login-security
+
+        - organizationId (string): (required)
+        """
+
+        metadata = {
+            'tags': ['organizations', 'configure', 'loginSecurity'],
+            'operation': 'getOrganizationLoginSecurity'
+        }
+        resource = f'/organizations/{organizationId}/loginSecurity'
+
+        return self._session.get(metadata, resource)
+
+    def updateOrganizationLoginSecurity(self, organizationId: str, **kwargs):
+        """
+        **Update the login security settings for an organization**
+        https://developer.cisco.com/meraki/api-v1/#!update-organization-login-security
+
+        - organizationId (string): (required)
+        - enforcePasswordExpiration (boolean): Boolean indicating whether users are forced to change their password every X number of days.
+        - passwordExpirationDays (integer): Number of days after which users will be forced to change their password.
+        - enforceDifferentPasswords (boolean): Boolean indicating whether users, when setting a new password, are forced to choose a new password that is different from any past passwords.
+        - numDifferentPasswords (integer): Number of recent passwords that new password must be distinct from.
+        - enforceStrongPasswords (boolean): Boolean indicating whether users will be forced to choose strong passwords for their accounts. Strong passwords are at least 8 characters that contain 3 of the following: number, uppercase letter, lowercase letter, and symbol
+        - enforceAccountLockout (boolean): Boolean indicating whether users' Dashboard accounts will be locked out after a specified number of consecutive failed login attempts.
+        - accountLockoutAttempts (integer): Number of consecutive failed login attempts after which users' accounts will be locked.
+        - enforceIdleTimeout (boolean): Boolean indicating whether users will be logged out after being idle for the specified number of minutes.
+        - idleTimeoutMinutes (integer): Number of minutes users can remain idle before being logged out of their accounts.
+        - enforceTwoFactorAuth (boolean): Boolean indicating whether users in this organization will be required to use an extra verification code when logging in to Dashboard. This code will be sent to their mobile phone via SMS, or can be generated by the Google Authenticator application.
+        - enforceLoginIpRanges (boolean): Boolean indicating whether organization will restrict access to Dashboard (including the API) from certain IP addresses.
+        - loginIpRanges (array): List of acceptable IP ranges. Entries can be single IP addresses, IP address ranges, and CIDR subnets.
+        """
+
+        kwargs.update(locals())
+
+        metadata = {
+            'tags': ['organizations', 'configure', 'loginSecurity'],
+            'operation': 'updateOrganizationLoginSecurity'
+        }
+        resource = f'/organizations/{organizationId}/loginSecurity'
+
+        body_params = ['enforcePasswordExpiration', 'passwordExpirationDays', 'enforceDifferentPasswords', 'numDifferentPasswords', 'enforceStrongPasswords', 'enforceAccountLockout', 'accountLockoutAttempts', 'enforceIdleTimeout', 'idleTimeoutMinutes', 'enforceTwoFactorAuth', 'enforceLoginIpRanges', 'loginIpRanges', ]
+        payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
+
+        return self._session.put(metadata, resource, payload)
+
     def getOrganizationNetworks(self, organizationId: str, total_pages=1, direction='next', **kwargs):
         """
         **List the networks that the user has privileges on in an organization**