IoT Hub SDK upgrade and test updates

src/DeviceProvisioningServices/DeviceProvisioningServices.Test/DeviceProvisioningServices.Test.csproj

@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Devices" Version="1.22.0" />
     <PackageReference Include="Microsoft.Azure.Management.DeviceProvisioningServices" Version="0.10.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.IotHub" Version="2.10.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.IotHub" Version="3.0.0" />
   </ItemGroup>
 
 </Project>

src/IotHub/IotHub.Test/IotHub.Test.csproj

@@ -13,7 +13,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Devices" Version="1.22.0" />
     <PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.7.0" />
-    <PackageReference Include="Microsoft.Azure.Management.IotHub" Version="2.10.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.IotHub" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="19.0.0" />
   </ItemGroup>
 
 </Project>

src/IotHub/IotHub.Test/ScenarioTests/IotHubController.cs

@@ -14,6 +14,7 @@
 
 using System.Diagnostics;
 using Microsoft.Azure.Management.EventHub;
+using Microsoft.Azure.Management.Storage;
 using Microsoft.Azure.Management.Internal.Resources;
 using System;
 using System.Collections.Generic;
@@ -36,6 +37,8 @@ public sealed class IotHubController
 
         public IotHubClient IotHubClient { get; private set; }
 
+        public StorageManagementClient StorageClient { get; private set; }
+
         public EventHubManagementClient EHClient { get; private set; }
 
         public string UserDomain { get; private set; }
@@ -75,6 +78,7 @@ public void RunPsTestWorkflow(
             {
                 {"Microsoft.Resources", null},
                 {"Microsoft.Features", null},
+                {"Microsoft.Storage", null },
                 {"Microsoft.Authorization", null}
             };
             var providersToIgnore = new Dictionary<string, string>
@@ -98,6 +102,7 @@ public void RunPsTestWorkflow(
                     _helper.RMProfileModule,
                     _helper.GetRMModulePath(@"AzureRM.IotHub.psd1"),
                     _helper.GetRMModulePath(@"AzureRM.EventHub.psd1"),
+                    _helper.GetRMModulePath(@"AzureRM.Storage.psd1"),
                     "AzureRM.Resources.ps1");
 
                 try
@@ -120,10 +125,12 @@ private void SetupManagementClients(MockContext context)
         {
             ResourceManagementClient = GetResourceManagementClient(context);
             IotHubClient = GetIotHubClient(context);
+            StorageClient = GetStorageManagementClient(context);
             EHClient = GetEHClient(context);
 
             _helper.SetupManagementClients(ResourceManagementClient,
                 IotHubClient,
+                StorageClient,
                 EHClient);
         }
 
@@ -136,6 +143,10 @@ private static IotHubClient GetIotHubClient(MockContext context)
         {
             return context.GetServiceClient<IotHubClient>(Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory.GetTestEnvironment());
         }
+        private static StorageManagementClient GetStorageManagementClient(MockContext context)
+        {
+            return context.GetServiceClient<StorageManagementClient>(Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory.GetTestEnvironment());
+        }
 
         private static EventHubManagementClient GetEHClient(MockContext context)
         {

src/IotHub/IotHub.Test/ScenarioTests/IotHubDPModuleTests.ps1

@@ -132,7 +132,7 @@ function Test-AzureRmIotHubModuleLifecycle
 	Assert-True { $module.Authentication.Type -eq 'SelfSigned' }
 
 	# Invoke direct method on device module
-	$errorMessage = 'Timed out waiting for device to connect.'
+	$errorMessage = "The operation failed because the requested device isn't online or hasn't registered the direct method callback."
 	Assert-ThrowsContains { Invoke-AzIotHubModuleMethod -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device1 -ModuleId $module1 -Name "SetTelemetryInterval" } $errorMessage
 
 	# Update Module

src/IotHub/IotHub.Test/ScenarioTests/IotHubRoutingTests.ps1

@@ -23,15 +23,6 @@ Test all iothub routing cmdlets
 #>
 function Test-AzureRmIotHubRoutingLifecycle
 {
-	##############################################################
-	# Set these to the proper azure storage account information.
-	$azureStorageResourceGroupName = 'pshardcodedrg1234'
-	$azureStorageSubscriptionId = '91d12660-3dec-467a-be2a-213b5544ddc0'
-	$ascConnectionString = 'DefaultEndpointsProtocol=https;AccountName=pshardcodedstorage1234;AccountKey=W1ujKNLtPmMtaNqZfOCUU5cnYMI8bQeF9ODce4riISyT2RSXiIxcwuwQhzCmIuwPWi82ParLfbq1bOF5ypUnPw==;EndpointSuffix=core.windows.net'
-	$containerName1 = 'container1'
-	$containerName2 = 'container2'
-	##############################################################
-
 	$Location = Get-Location "Microsoft.Devices" "IotHubs" "WEST US 2"
 	$IotHubName = getAssetName
 	$ResourceGroupName = getAssetName
@@ -56,7 +47,31 @@ function Test-AzureRmIotHubRoutingLifecycle
 	$resourceGroup = New-AzResourceGroup -Name $ResourceGroupName -Location $Location 
 
 	# Create Iot Hub
-	$iothub = New-AzIotHub -Name $IotHubName -ResourceGroupName $ResourceGroupName -Location $Location -SkuName $Sku -Units 1 
+	$iothub = New-AzIotHub -Name $IotHubName -ResourceGroupName $ResourceGroupName -Location $Location -SkuName $Sku -Units 1
+	$subscriptionId = $iothub.SubscriptionId
+
+	# Setup storage account
+	$azureStorageResourceGroupName = $ResourceGroupName
+	$azureStorageSubscriptionId = $subscriptionId
+	$azureStorageAccountName = getAssetName
+	$containerName1 = 'container1'
+	$containerName2 = 'container2'
+
+	# Create storage account
+	$storageAccount = New-AzStorageAccount -ResourceGroupName $azureStorageResourceGroupName -AccountName $azureStorageAccountName -Location westus -SkuName Standard_GRS
+	$key = Get-AzStorageAccountKey -ResourceGroupName $azureStorageResourceGroupName -Name $azureStorageAccountName;
+	$context = New-AzStorageContext -StorageAccountName $azureStorageAccountName -StorageAccountKey $key.Value[0];
+
+
+	# Create containers
+	if ([Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode]::Playback)
+    {
+		New-AzStorageContainer -Name $containerName1 -Context $context
+		New-AzStorageContainer -Name $containerName2 -Context $context
+	}
+
+	# Get connection string
+	$ascConnectionString = $context.ConnectionString
 
 	# Create new eventHub namespace  
     $eventHubNamespace = New-AzEventHubNamespace -ResourceGroup $ResourceGroupName -NamespaceName $namespaceName -Location $Location

src/IotHub/IotHub.Test/ScenarioTests/IotHubTests.ps1

@@ -29,7 +29,6 @@ function Test-AzureRmIotHubLifecycle
 	$Location = Get-Location "Microsoft.Devices" "IotHub" 
 	$IotHubName = getAssetName 
 	$ResourceGroupName = getAssetName 
-	$SubscriptionId = '91d12660-3dec-467a-be2a-213b5544ddc0'
 	$Sku = "B1"
 	$namespaceName = getAssetName 'eventHub'
 	$eventHubName = getAssetName
@@ -105,7 +104,6 @@ function Test-AzureRmIotHubLifecycle
 	Assert-True { $allIotHubsInResourceGroup.Count -eq 1 }
 	Assert-True { $iotHub.Name -eq $IotHubName }
 	Assert-True { $iotHub.Resourcegroup -eq $ResourceGroupName }
-	Assert-True { $iotHub.Subscriptionid -eq $SubscriptionId }
 	Assert-True { $iotHub.Properties.Routing.Routes.Count -eq 1}
     Assert-True { $iotHub.Properties.Routing.Routes[0].Name -eq "route"}
     Assert-True { $iotHub.Properties.Routing.Endpoints.EventHubs[0].Name -eq "eh1"}