Add authentication method to device structure

Azure · Jan 17, 2017 · 6728716 · 6728716
1 parent 34e63e4
commit 6728716
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 7 deletions.
diff --git a/build_all/linux/release_device_client/build/lib.linux-x86_64-2.7/iothub_client/__init__.py b/build_all/linux/release_device_client/build/lib.linux-x86_64-2.7/iothub_client/__init__.py
@@ -0,0 +1 @@
+from .iothub_client import *
diff --git a/build_all/linux/release_device_client/build/lib/iothub_client/__init__.py b/build_all/linux/release_device_client/build/lib/iothub_client/__init__.py
@@ -0,0 +1 @@
+from .iothub_client import *
diff --git a/...linux/release_service_client/build/lib.linux-x86_64-2.7/iothub_service_client/__init__.py b/...linux/release_service_client/build/lib.linux-x86_64-2.7/iothub_service_client/__init__.py
@@ -0,0 +1 @@
+from .iothub_service_client import *
diff --git a/build_all/linux/release_service_client/build/lib/iothub_service_client/__init__.py b/build_all/linux/release_service_client/build/lib/iothub_service_client/__init__.py
@@ -0,0 +1 @@
+from .iothub_service_client import *
diff --git a/c b/c
diff --git a/service/samples/iothub_registrymanager_sample.py b/service/samples/iothub_registrymanager_sample.py
@@ -27,6 +27,12 @@ def printDeviceInfo(title, iothubDevice):
     print("iothubDevice.statusReason                = {0}".format(iothubDevice.statusReason))
     print("iothubDevice.statusUpdatedTime           = {0}".format(iothubDevice.statusUpdatedTime))
     print("iothubDevice.lastActivityTime            = {0}".format(iothubDevice.lastActivityTime))
+    print("iothubDevice.cloudToDeviceMessageCount   = {0}".format(iothubDevice.cloudToDeviceMessageCount))
+    print("iothubDevice.isManaged                   = {0}".format(iothubDevice.isManaged))
+    print("iothubDevice.configuration               = {0}".format(iothubDevice.configuration))
+    print("iothubDevice.deviceProperties            = {0}".format(iothubDevice.deviceProperties))
+    print("iothubDevice.serviceProperties           = {0}".format(iothubDevice.serviceProperties))
+    print("iothubDevice.authMethod                  = {0}".format(iothubDevice.authMethod))
     print("")
 
 def iothub_registrymanager_sample_run():
@@ -38,7 +44,8 @@ def iothub_registrymanager_sample_run():
         # CreateDevice
         primaryKey = "aaabbbcccdddeeefffggghhhiiijjjkkklllmmmnnnoo"
         secondaryKey = "111222333444555666777888999000aaabbbcccdddee"
-        newDevice = iothubRegistryManager.create_device(device_id, primaryKey, secondaryKey)
+        authMethod = IoTHubRegistryManagerAuthMethod.SHARED_PRIVATE_KEY;
+        newDevice = iothubRegistryManager.create_device(device_id, primaryKey, secondaryKey, authMethod)
         printDeviceInfo("CreateDevice", newDevice)
 
         # GetDevice
@@ -49,7 +56,8 @@ def iothub_registrymanager_sample_run():
         primaryKey = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
         secondaryKey = "yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy"
         status = IoTHubDeviceStatus.DISABLED
-        iothubRegistryManager.update_device(device_id, primaryKey, secondaryKey, status)
+        authMethod = IoTHubRegistryManagerAuthMethod.SHARED_PRIVATE_KEY;
+        iothubRegistryManager.update_device(device_id, primaryKey, secondaryKey, status, authMethod)
         updatedDevice = iothubRegistryManager.get_device(device_id)
         printDeviceInfo("UpdateDevice", updatedDevice)
 

diff --git a/service/src/iothub_service_client_python.cpp b/service/src/iothub_service_client_python.cpp
@@ -869,7 +869,8 @@ class IoTHubRegistryManager
     IOTHUB_DEVICE CreateDevice(
         std::string deviceId,
         std::string primaryKey,
-        std::string secondaryKey
+        std::string secondaryKey,
+        IOTHUB_REGISTRYMANAGER_AUTH_METHOD authMethod
         )
     {
         IOTHUB_DEVICE iothubDevice;
@@ -879,6 +880,7 @@ class IoTHubRegistryManager
         deviceCreate.deviceId = deviceId.c_str();
         deviceCreate.primaryKey = primaryKey.c_str();
         deviceCreate.secondaryKey = secondaryKey.c_str();
+        deviceCreate.authMethod = authMethod;
 
         ScopedGILRelease release;
         result = IoTHubRegistryManager_CreateDevice(_iothubRegistryManagerHandle, &deviceCreate, &iothubDevice);
@@ -911,7 +913,8 @@ class IoTHubRegistryManager
         std::string deviceId,
         std::string primaryKey,
         std::string secondaryKey,
-        IOTHUB_DEVICE_STATUS status
+        IOTHUB_DEVICE_STATUS status,
+        IOTHUB_REGISTRYMANAGER_AUTH_METHOD authMethod
         )
     {
         IOTHUB_REGISTRYMANAGER_RESULT result = IOTHUB_REGISTRYMANAGER_OK;
@@ -921,6 +924,7 @@ class IoTHubRegistryManager
         deviceUpdate.primaryKey = primaryKey.c_str();
         deviceUpdate.secondaryKey = secondaryKey.c_str();
         deviceUpdate.status = status;
+        deviceUpdate.authMethod = authMethod;
 
         ScopedGILRelease release;
         result = IoTHubRegistryManager_UpdateDevice(_iothubRegistryManagerHandle, &deviceUpdate);
@@ -1772,6 +1776,11 @@ BOOST_PYTHON_MODULE(IMPORT_NAME)
         .value("CALLBACK_NOT_SET", IOTHUB_REGISTRYMANAGER_CALLBACK_NOT_SET)
         ;
 
+    enum_<IOTHUB_REGISTRYMANAGER_AUTH_METHOD>("IoTHubRegistryManagerAuthMethod")
+        .value("SHARED_PRIVATE_KEY", IOTHUB_REGISTRYMANAGER_AUTH_SPK)
+        .value("X509_THUMBPRINT", IOTHUB_REGISTRYMANAGER_AUTH_X509_THUMBPRINT)
+        ;
+
     enum_<IOTHUB_MESSAGING_RESULT>("IoTHubMessagingResult")
         .value("OK", IOTHUB_MESSAGING_OK)
         .value("INVALID_ARG", IOTHUB_MESSAGING_INVALID_ARG)
@@ -1849,6 +1858,12 @@ BOOST_PYTHON_MODULE(IMPORT_NAME)
         .add_property("statusReason", &IOTHUB_DEVICE::statusReason)
         .add_property("statusUpdatedTime", &IOTHUB_DEVICE::statusUpdatedTime)
         .add_property("lastActivityTime", &IOTHUB_DEVICE::lastActivityTime)
+        .add_property("cloudToDeviceMessageCount", &IOTHUB_DEVICE::cloudToDeviceMessageCount)
+        .add_property("isManaged", &IOTHUB_DEVICE::isManaged)
+        .add_property("configuration", &IOTHUB_DEVICE::configuration)
+        .add_property("deviceProperties", &IOTHUB_DEVICE::deviceProperties)
+        .add_property("serviceProperties", &IOTHUB_DEVICE::serviceProperties)
+        .add_property("authMethod", &IOTHUB_DEVICE::authMethod)
         ;
 
     class_<IOTHUB_REGISTRY_STATISTICS>("IoTHubRegistryStatistics", no_init)

diff --git a/service/tests/iothub_service_client_ut.py b/service/tests/iothub_service_client_ut.py
@@ -621,6 +621,7 @@ def test_IoTHubRegistryManager(self):
         deviceId = "deviceId"
         primaryKey = "primaryKey"
         secondaryKey = "secondaryKey"
+        authMethod = IoTHubRegistryManagerAuthMethod.SHARED_PRIVATE_KEY;
         with self.assertRaises(AttributeError):
             regManClient.CreateDevice()
         with self.assertRaises(Exception):
@@ -629,7 +630,9 @@ def test_IoTHubRegistryManager(self):
             regManClient.create_device(deviceId)
         with self.assertRaises(Exception):
             regManClient.create_device(deviceId, primaryKey)
-        result = regManClient.create_device(deviceId, primaryKey, secondaryKey)
+        with self.assertRaises(Exception):
+            regManClient.create_device(deviceId, primaryKey, secondaryKey)
+        result = regManClient.create_device(deviceId, primaryKey, secondaryKey, authMethod)
         self.assertIsInstance(result, IoTHubDevice)
 
         # get_device
@@ -646,6 +649,7 @@ def test_IoTHubRegistryManager(self):
         primaryKey = "primaryKey"
         secondaryKey = "secondaryKey"
         status = IoTHubDeviceStatus.ENABLED
+        authMethod = IoTHubRegistryManagerAuthMethod.SHARED_PRIVATE_KEY;
         with self.assertRaises(AttributeError):
             regManClient.UpdateDevice()
         with self.assertRaises(Exception):
@@ -656,7 +660,9 @@ def test_IoTHubRegistryManager(self):
             regManClient.update_device(deviceId, primaryKey)
         with self.assertRaises(Exception):
             regManClient.update_device(deviceId, primaryKey, secondaryKey)
-        regManClient.update_device(deviceId, primaryKey, secondaryKey, status)
+        with self.assertRaises(Exception):
+            regManClient.create_device(deviceId, primaryKey, secondaryKey, status)
+        regManClient.update_device(deviceId, primaryKey, secondaryKey, status, authMethod)
 
         # delete_device
         deviceId = "deviceId"