updated w/ release 1.0.0b17

Author: Shiyue Cheng

meraki/__init__.py

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

meraki/aio/api/appliance.py

@@ -944,7 +944,7 @@ def deleteNetworkApplianceTrafficShapingCustomPerformanceClass(self, networkId:
 
     def updateNetworkApplianceTrafficShapingRules(self, networkId: str, **kwargs):
         """
-        **Update the traffic shaping settings for an MX network**
+        **Update the traffic shaping settings rules for an MX network**
         https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-traffic-shaping-rules
 
         - networkId (string): (required)
@@ -974,7 +974,7 @@ def updateNetworkApplianceTrafficShapingRules(self, networkId: str, **kwargs):
 
     def getNetworkApplianceTrafficShapingRules(self, networkId: str):
         """
-        **Display the traffic shaping settings for an MX network**
+        **Display the traffic shaping settings rules for an MX network**
         https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-traffic-shaping-rules
 
         - networkId (string): (required)

meraki/aio/api/organizations.py

@@ -792,6 +792,23 @@ def getOrganizationInventoryDevices(self, organizationId: str, total_pages=1, di
 
         return self._session.get_pages(metadata, resource, params, total_pages, direction)
 
+    def getOrganizationInventoryDevice(self, organizationId: str, serial: str):
+        """
+        **Return a single device from the inventory of an organization**
+        https://developer.cisco.com/meraki/api-v1/#!get-organization-inventory-device
+
+        - organizationId (string): (required)
+        - serial (string): (required)
+        """
+
+        metadata = {
+            'tags': ['organizations', 'configure', 'inventoryDevices'],
+            'operation': 'getOrganizationInventoryDevice'
+        }
+        resource = f'/organizations/{organizationId}/inventoryDevices/{serial}'
+
+        return self._session.get(metadata, resource)
+
     def getOrganizationLicenses(self, organizationId: str, total_pages=1, direction='next', **kwargs):
         """
         **List the licenses for an organization**

meraki/aio/api/wireless.py

@@ -1102,6 +1102,7 @@ def updateNetworkWirelessSsid(self, networkId: str, number: str, **kwargs):
         - visible (boolean): Boolean indicating whether APs should advertise or hide this SSID. APs will only broadcast this SSID if set to true
         - availableOnAllAps (boolean): Boolean indicating whether all APs should broadcast the SSID or if it should be restricted to APs matching any availability tags. Can only be false if the SSID has availability tags.
         - availabilityTags (array): Accepts a list of tags for this SSID. If availableOnAllAps is false, then the SSID will only be broadcast by APs with tags matching any of the tags in this list.
+        - mandatoryDhcpEnabled (boolean): If true, Mandatory DHCP will enforce that clients connecting to this SSID must use the IP address assigned by the DHCP server. Clients who use a static IP address won’t be able to associate.
         """
 
         kwargs.update(locals())
@@ -1137,7 +1138,7 @@ def updateNetworkWirelessSsid(self, networkId: str, number: str, **kwargs):
         }
         resource = f'/networks/{networkId}/wireless/ssids/{number}'
 
-        body_params = ['name', 'enabled', 'authMode', 'enterpriseAdminAccess', 'encryptionMode', 'psk', 'wpaEncryptionMode', 'splashPage', 'radiusServers', 'radiusProxyEnabled', 'radiusCoaEnabled', 'radiusFailoverPolicy', 'radiusLoadBalancingPolicy', 'radiusAccountingEnabled', 'radiusAccountingServers', 'radiusAttributeForGroupPolicies', 'ipAssignmentMode', 'useVlanTagging', 'concentratorNetworkId', 'vlanId', 'defaultVlanId', 'apTagsAndVlanIds', 'walledGardenEnabled', 'walledGardenRanges', 'radiusOverride', 'radiusGuestVlanEnabled', 'radiusGuestVlanId', 'minBitrate', 'bandSelection', 'perClientBandwidthLimitUp', 'perClientBandwidthLimitDown', 'perSsidBandwidthLimitUp', 'perSsidBandwidthLimitDown', 'lanIsolationEnabled', 'visible', 'availableOnAllAps', 'availabilityTags', ]
+        body_params = ['name', 'enabled', 'authMode', 'enterpriseAdminAccess', 'encryptionMode', 'psk', 'wpaEncryptionMode', 'splashPage', 'radiusServers', 'radiusProxyEnabled', 'radiusCoaEnabled', 'radiusFailoverPolicy', 'radiusLoadBalancingPolicy', 'radiusAccountingEnabled', 'radiusAccountingServers', 'radiusAttributeForGroupPolicies', 'ipAssignmentMode', 'useVlanTagging', 'concentratorNetworkId', 'vlanId', 'defaultVlanId', 'apTagsAndVlanIds', 'walledGardenEnabled', 'walledGardenRanges', 'radiusOverride', 'radiusGuestVlanEnabled', 'radiusGuestVlanId', 'minBitrate', 'bandSelection', 'perClientBandwidthLimitUp', 'perClientBandwidthLimitDown', 'perSsidBandwidthLimitUp', 'perSsidBandwidthLimitDown', 'lanIsolationEnabled', 'visible', 'availableOnAllAps', 'availabilityTags', 'mandatoryDhcpEnabled', ]
         payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
 
         return self._session.put(metadata, resource, payload)

meraki/api/appliance.py

@@ -944,7 +944,7 @@ def deleteNetworkApplianceTrafficShapingCustomPerformanceClass(self, networkId:
 
     def updateNetworkApplianceTrafficShapingRules(self, networkId: str, **kwargs):
         """
-        **Update the traffic shaping settings for an MX network**
+        **Update the traffic shaping settings rules for an MX network**
         https://developer.cisco.com/meraki/api-v1/#!update-network-appliance-traffic-shaping-rules
 
         - networkId (string): (required)
@@ -974,7 +974,7 @@ def updateNetworkApplianceTrafficShapingRules(self, networkId: str, **kwargs):
 
     def getNetworkApplianceTrafficShapingRules(self, networkId: str):
         """
-        **Display the traffic shaping settings for an MX network**
+        **Display the traffic shaping settings rules for an MX network**
         https://developer.cisco.com/meraki/api-v1/#!get-network-appliance-traffic-shaping-rules
 
         - networkId (string): (required)

meraki/api/organizations.py

@@ -792,6 +792,23 @@ def getOrganizationInventoryDevices(self, organizationId: str, total_pages=1, di
 
         return self._session.get_pages(metadata, resource, params, total_pages, direction)
 
+    def getOrganizationInventoryDevice(self, organizationId: str, serial: str):
+        """
+        **Return a single device from the inventory of an organization**
+        https://developer.cisco.com/meraki/api-v1/#!get-organization-inventory-device
+
+        - organizationId (string): (required)
+        - serial (string): (required)
+        """
+
+        metadata = {
+            'tags': ['organizations', 'configure', 'inventoryDevices'],
+            'operation': 'getOrganizationInventoryDevice'
+        }
+        resource = f'/organizations/{organizationId}/inventoryDevices/{serial}'
+
+        return self._session.get(metadata, resource)
+
     def getOrganizationLicenses(self, organizationId: str, total_pages=1, direction='next', **kwargs):
         """
         **List the licenses for an organization**

meraki/api/wireless.py

@@ -1102,6 +1102,7 @@ def updateNetworkWirelessSsid(self, networkId: str, number: str, **kwargs):
         - visible (boolean): Boolean indicating whether APs should advertise or hide this SSID. APs will only broadcast this SSID if set to true
         - availableOnAllAps (boolean): Boolean indicating whether all APs should broadcast the SSID or if it should be restricted to APs matching any availability tags. Can only be false if the SSID has availability tags.
         - availabilityTags (array): Accepts a list of tags for this SSID. If availableOnAllAps is false, then the SSID will only be broadcast by APs with tags matching any of the tags in this list.
+        - mandatoryDhcpEnabled (boolean): If true, Mandatory DHCP will enforce that clients connecting to this SSID must use the IP address assigned by the DHCP server. Clients who use a static IP address won’t be able to associate.
         """
 
         kwargs.update(locals())
@@ -1137,7 +1138,7 @@ def updateNetworkWirelessSsid(self, networkId: str, number: str, **kwargs):
         }
         resource = f'/networks/{networkId}/wireless/ssids/{number}'
 
-        body_params = ['name', 'enabled', 'authMode', 'enterpriseAdminAccess', 'encryptionMode', 'psk', 'wpaEncryptionMode', 'splashPage', 'radiusServers', 'radiusProxyEnabled', 'radiusCoaEnabled', 'radiusFailoverPolicy', 'radiusLoadBalancingPolicy', 'radiusAccountingEnabled', 'radiusAccountingServers', 'radiusAttributeForGroupPolicies', 'ipAssignmentMode', 'useVlanTagging', 'concentratorNetworkId', 'vlanId', 'defaultVlanId', 'apTagsAndVlanIds', 'walledGardenEnabled', 'walledGardenRanges', 'radiusOverride', 'radiusGuestVlanEnabled', 'radiusGuestVlanId', 'minBitrate', 'bandSelection', 'perClientBandwidthLimitUp', 'perClientBandwidthLimitDown', 'perSsidBandwidthLimitUp', 'perSsidBandwidthLimitDown', 'lanIsolationEnabled', 'visible', 'availableOnAllAps', 'availabilityTags', ]
+        body_params = ['name', 'enabled', 'authMode', 'enterpriseAdminAccess', 'encryptionMode', 'psk', 'wpaEncryptionMode', 'splashPage', 'radiusServers', 'radiusProxyEnabled', 'radiusCoaEnabled', 'radiusFailoverPolicy', 'radiusLoadBalancingPolicy', 'radiusAccountingEnabled', 'radiusAccountingServers', 'radiusAttributeForGroupPolicies', 'ipAssignmentMode', 'useVlanTagging', 'concentratorNetworkId', 'vlanId', 'defaultVlanId', 'apTagsAndVlanIds', 'walledGardenEnabled', 'walledGardenRanges', 'radiusOverride', 'radiusGuestVlanEnabled', 'radiusGuestVlanId', 'minBitrate', 'bandSelection', 'perClientBandwidthLimitUp', 'perClientBandwidthLimitDown', 'perSsidBandwidthLimitUp', 'perSsidBandwidthLimitDown', 'lanIsolationEnabled', 'visible', 'availableOnAllAps', 'availabilityTags', 'mandatoryDhcpEnabled', ]
         payload = {k.strip(): v for k, v in kwargs.items() if k.strip() in body_params}
 
         return self._session.put(metadata, resource, payload)