Enrollment group creation based on device ModelId instead of ModelName

CGI-FR · Mar 11, 2022 · 618cbe4 · 618cbe4
1 parent 3d549a0
commit 618cbe4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/AzureIoTHub.Portal.Server.Tests.Unit/Managers/DeviceProvisioningServiceManagerTests.cs b/src/AzureIoTHub.Portal.Server.Tests.Unit/Managers/DeviceProvisioningServiceManagerTests.cs
@@ -121,11 +121,11 @@ public async Task WhenEnrollmentGroupAlreadyExistCreateEnrollmentGroupAsyncShoul
         [TestCase("aaa", "aaa")]
         [TestCase("AAA", "aaa")]
         [TestCase("AAA AAA", "aaa-aaa")]
-        public async Task CreateEnrollmentGroupFormModelAsyncShouldCreateANewEnrollmentGroup(string modelName, string enrollmentGroupName)
+        public async Task CreateEnrollmentGroupFromModelAsyncShouldCreateANewEnrollmentGroup(string modelId, string enrollmentGroupName)
         {
             // Arrange
             var manager = this.CreateManager();
-            var modelId = "bbb";
+            var modelName = "bbb";
             var desiredProperties = new TwinCollection();
             EnrollmentGroup enrollmentGroup = null;
 
@@ -163,11 +163,11 @@ public async Task CreateEnrollmentGroupFormModelAsyncShouldCreateANewEnrollmentG
         [TestCase("aaa", "aaa")]
         [TestCase("AAA", "aaa")]
         [TestCase("AAA AAA", "aaa-aaa")]
-        public async Task WhenEnrollmentGroupExistCreateEnrollmentGroupFormModelAsyncShouldUpdate(string modelName, string enrollmentGroupName)
+        public async Task WhenEnrollmentGroupExistCreateEnrollmentGroupFromModelAsyncShouldUpdate(string modelId, string enrollmentGroupName)
         {
             // Arrange
             var manager = this.CreateManager();
-            var modelId = "bbb";
+            var modelName = "bbb";
             var desiredProperties = new TwinCollection();
             EnrollmentGroup enrollmentGroup = null;
 

diff --git a/src/AzureIoTHub.Portal/Server/Managers/DeviceProvisioningServiceManager.cs b/src/AzureIoTHub.Portal/Server/Managers/DeviceProvisioningServiceManager.cs
@@ -40,7 +40,7 @@ public async Task<EnrollmentGroup> CreateEnrollmentGroupFromModelAsync(string mo
                 tags: new TwinCollection($"{{ \"modelId\":\"{modelId}\" }}"),
                 desiredProperties: new TwinCollection());
 
-            return await this.CreateNewEnrollmentGroup(modelName, false, twinState);
+            return await this.CreateNewEnrollmentGroup(modelId, false, twinState);
         }
 
         private async Task<EnrollmentGroup> CreateNewEnrollmentGroup(string name, bool iotEdge, TwinState initialTwinState)