Merge pull request Azure#6024 from anusapan/preview-IotHub

Add Basic Sku and Tag to IotHub

Author: Maddie Clayton

src/ResourceManager/IotHub/AzureRM.IotHub.psd1

@@ -80,7 +80,7 @@ CmdletsToExport = 'Add-AzureRmIotHubKey', 'Get-AzureRmIotHubEventHubConsumerGrou
                'Add-AzureRmIotHubEventHubConsumerGroup', 'New-AzureRmIotHub', 
                'New-AzureRmIotHubExportDevices', 'New-AzureRmIotHubImportDevices', 
                'Remove-AzureRmIotHub', 'Remove-AzureRmIotHubEventHubConsumerGroup', 
-               'Remove-AzureRmIotHubKey', 'Set-AzureRmIotHub', 
+               'Remove-AzureRmIotHubKey', 'Set-AzureRmIotHub', 'Update-AzureRmIotHub',
                'Add-AzureRmIotHubCertificate', 'Get-AzureRmIotHubCertificate', 
                'Get-AzureRmIotHubCertificateVerificationCode', 
                'Set-AzureRmIotHubVerifiedCertificate', 

src/ResourceManager/IotHub/ChangeLog.md

@@ -19,6 +19,7 @@
 -->
 ## Current Release
 * Set minimum dependency of module to PowerShell 5.0
+* Enable tags and Basic Sku to the IotHub
 
 ## Version 3.1.2
 * Updated to the latest version of the Azure ClientRuntime

src/ResourceManager/IotHub/Commands.IotHub.Test/Commands.IotHub.Test.csproj

@@ -49,8 +49,8 @@
     <Reference Include="Microsoft.Azure.Common.NetFramework">
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.IotHub, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.IotHub.1.1.3\lib\net452\Microsoft.Azure.Management.IotHub.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.IotHub, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.IotHub.2.0.0\lib\net452\Microsoft.Azure.Management.IotHub.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Test.Framework">
@@ -233,4 +233,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/ResourceManager/IotHub/Commands.IotHub.Test/ScenarioTests/IotHubTests.cs

@@ -28,20 +28,20 @@ public IotHubTests(ITestOutputHelper output)
             XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
-        [Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait("Re-record", "ClientRuntime changes")]
         public void TestAzureIotHubLifeCycle()
         {
             IotHubController.NewInstance.RunPsTestWorkflow(
-                () => { return new[] { string.Format("{0} {1} {2} {3} {4}", "Test-AzureRmIotHubLifecycle", "northeurope", "powershelliothub", "powershellrg", "S1") }; },
+                () => { return new[] { "Test-AzureRmIotHubLifecycle" }; },
                 null,
                 null,
                 TestUtilities.GetCallingClass(),
                 TestUtilities.GetCurrentMethodName());
         }
 
-        [Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait("Re-record", "ClientRuntime changes")]
         public void TestAzureIotHubCertificateLifeCycle()

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

@@ -26,7 +26,17 @@ Test Get-AzureRmIotHub for listing all iothubs in a subscription
 
 function Test-AzureRmIotHubLifecycle
 {
-	Param($Location, $IotHubName, $ResourceGroupName, $Sku)
+	$Location = Get-Location "Microsoft.Devices" "IotHub" 
+	$IotHubName = getAssetName 
+	$ResourceGroupName = getAssetName 
+	$Sku = "B1"
+	$namespaceName = getAssetName
+	$eventHubName = getAssetName
+	$authRuleName = getAssetName
+	$Tag1Key = "key1"
+	$Tag2Key = "key2"
+	$Tag1Value = "value1"
+	$Tag2Value = "value2"
 
 	# Get all Iot hubs in the subscription
 	$allIotHubs = Get-AzureRmIotHub
@@ -38,7 +48,6 @@ function Test-AzureRmIotHubLifecycle
 	$resourceGroup = New-AzureRmResourceGroup -Name $ResourceGroupName -Location $Location 
 
 	Write-Debug " Create new eventHub " 
-	$namespaceName = "IotHubPSEHNamespaceTest"
     $result = New-AzureRmEventHubNamespace -ResourceGroup $ResourceGroupName -NamespaceName $namespaceName -Location $Location
 
 	Wait-Seconds 15
@@ -47,13 +56,11 @@ function Test-AzureRmIotHubLifecycle
 	Assert-True {$result.ProvisioningState -eq "Succeeded"}
 
     Write-Debug " Create new eventHub "    
-	$eventHubName = "IotHubPSEHTest"
 	$msgRetentionInDays = 3
 	$partionCount = 2
     $result = New-AzureRmEventHub -ResourceGroup $ResourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName -MessageRetentionInDays $msgRetentionInDays -PartitionCount $partionCount
 
 	# Create AuthRule
-	$authRuleName = "IotHubPSEHAuthRule"
 	$rights = "Listen","Send"
 	$authRule = New-AzureRmEventHubAuthorizationRule -ResourceGroup $ResourceGroupName -NamespaceName $namespaceName  -EventHubName $eventHubName -AuthorizationRuleName $authRuleName -Rights $rights
 	$keys = Get-AzureRmEventHubKey -ResourceGroup $ResourceGroupName -NamespaceName $namespaceName  -EventHubName $eventHubName -AuthorizationRuleName $authRuleName
@@ -226,13 +233,34 @@ function Test-AzureRmIotHubLifecycle
 	$iotHubUpdated = Set-AzureRmIotHub -ResourceGroupName $ResourceGroupName -Name $IotHubName -FallbackRoute $iothub.Properties.Routing.FallbackRoute	
     Assert-True { $iotHubUpdated.Properties.Routing.FallbackRoute.IsEnabled -eq 1}
 
+	# Add Tags to Iot Hub
+	$tags = @{}
+	$tags.Add($Tag1Key, $Tag1Value)
+	$updatedIotHub = Update-AzureRmIotHub -ResourceGroupName $ResourceGroupName -Name $IotHubName -Tag $tags
+	Assert-True { $updatedIotHub.Tags.Count -eq 1 }
+	Assert-True { $updatedIotHub.Tags.Item($Tag1Key) -eq $Tag1Value }
+
+	# Add more Tags to Iot Hub
+	$tags.Clear()
+	$tags.Add($Tag2Key, $Tag2Value)
+	$updatedIotHub = Update-AzureRmIotHub -ResourceGroupName $ResourceGroupName -Name $IotHubName -Tag $tags
+	Assert-True { $updatedIotHub.Tags.Count -eq 2 }
+	Assert-True { $updatedIotHub.Tags.Item($Tag1Key) -eq $Tag1Value }
+	Assert-True { $updatedIotHub.Tags.Item($Tag2Key) -eq $Tag2Value }
+
+	# Add Tags to Iot Hub with Reset option
+	$tags.Clear()
+	$tags.Add($Tag1Key, $Tag1Value)
+	$updatedIotHub = Update-AzureRmIotHub -ResourceGroupName $ResourceGroupName -Name $IotHubName -Tag $tags -Reset
+	Assert-True { $updatedIotHub.Tags.Count -eq 1 }
+	Assert-True { $updatedIotHub.Tags.Item($Tag1Key) -eq $Tag1Value }
+
 	# Remove IotHub
 	Remove-AzureRmIotHub -ResourceGroupName $ResourceGroupName -Name $IotHubName
 }
 
 function Test-AzureRmIotHubCertificateLifecycle
 {
-	#Param($Location, $IotHubName, $ResourceGroupName, $Sku)
 	$Location = Get-Location "Microsoft.Devices" "IotHub" 
 	$IotHubName = getAssetName 
 	$ResourceGroupName = getAssetName