Merge pull request #4036 from skomarag/preview

iptag changes for reservedip

Author: markcowl

src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj

@@ -119,8 +119,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.14.0.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Management.Network, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.8.0.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
+    <Reference Include="Microsoft.WindowsAzure.Management.Network, Version=8.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.8.2.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Management.Storage">
@@ -334,6 +334,9 @@
     <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\RunStartAndStopMultipleVirtualMachinesTest.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <EmbeddedResource Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\TestAzureReservedIPWithIPTags.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
     <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\TestGetAzureLocation.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ServiceManagement/Common/Commands.ScenarioTest/Resources/ServiceManagement/ServiceManagementTests.ps1

@@ -912,6 +912,30 @@ function Test-MigrationAzureReservedIP
     Assert-AreEqual $removeReservedIP.OperationStatus "Succeeded"
 }
 
+<#
+.SYNOPSIS
+Tests New-AzureReservedIPWithTags
+#>
+function Test-AzureReservedIPWithIPTags
+{
+    # Setu
+    $name = getAssetName
+    $location = "West Central US"
+    $iptag  = New-AzureIPTag -IPTagType "FirstPartyUsage" -Value "/tagTypes/SystemService/operators/Microsoft/platforms/Azure/services/Microsoft.AzureAD"
+    # Test Create Reserved IP
+    New-AzureReservedIP -ReservedIPName $name -Location $location -IPTagList $iptag
+    $reservedIP = Get-AzureReservedIP -ReservedIPName $name 
+    #-IPTags $iptag
+    # Assert
+    Assert-NotNull($reservedIP)
+    Assert-AreEqual $reservedIP.Location $location
+    Assert-NotNull($reservedIP.IPTags)
+   
+    #Test Remove reserved IP
+    $removeReservedIP = Remove-AzureReservedIP -ReservedIPName $name -Force
+    Assert-AreEqual $removeReservedIP.OperationStatus "Succeeded"
+}
+
 function Test-NewAzureVMWithBYOL
 {
     # Setup

src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ScenarioTests.cs

@@ -196,6 +196,13 @@ public void TestMigrationAzureReservedIP()
             this.RunPowerShellTest("Test-MigrationAzureReservedIP");
         }
 
+        [Fact]        
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestAzureReservedIPWithIPTags()
+        {
+            this.RunPowerShellTest("Test-AzureReservedIPWithIPTags");
+        }
+
         [Fact]
         [Trait(Category.Service, Category.ServiceManagement)]
         [Trait(Category.AcceptanceType, Category.CheckIn)]