Merge pull request #196 from Azure/build

Merge late changes build -> ignite

Author: stankovski

src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

@@ -146,16 +146,11 @@
   <ItemGroup>
     <Compile Include="Common\ComputeTestController.cs" />
     <Compile Include="ScenarioTests\StorageAccountTests.cs" />
-    <Compile Include="ScenarioTests\TestVirtualMachineImageList.cs" />
-    <Compile Include="ScenarioTests\TestVirtualMachineList.cs" />
-    <Compile Include="ScenarioTests\VirtualMachineDataDiskTests.cs" />
-    <Compile Include="ScenarioTests\VirtualMachineCaptureTests.cs" />
     <Compile Include="ScenarioTests\VirtualMachineProfileTests.cs" />
     <Compile Include="ScenarioTests\AvailabilitySetTests.cs" />
     <Compile Include="ScenarioTests\VirtualMachineExtensionTests.cs" />
     <Compile Include="ScenarioTests\VirtualMachineNetworkInterfaceTests.cs" />
-    <Compile Include="ScenarioTests\TestVirtualMachineSizeAndUsage.cs" />
-    <Compile Include="ScenarioTests\VirtualMachinePIRv2Tests.cs" />
+    <Compile Include="ScenarioTests\UtilityFunctionTests.cs" />
     <Compile Include="ScenarioTests\VirtualMachineTests.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -288,6 +283,12 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachinePIRv2.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachinePlan.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachinePlan2.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineSizeAndUsage.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeTestCommon.ps1

@@ -28,7 +28,28 @@ function Get-ComputeTestResourceName
         }
     }
 
-    $assetName = [Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::GetAssetName($testName, "pstestrg")
+    $oldErrorActionPreferenceValue = $ErrorActionPreference;
+    $ErrorActionPreference = "SilentlyContinue";
+    
+    try
+    {
+        $assetName = [Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::GetAssetName($testName, "pstestrg");
+    }
+    catch
+    {
+        if (($Error.Count -gt 0) -and ($Error[0].Exception.Message -like '*Unable to find type*'))
+        {
+            $assetName = Get-RandomItemName;
+        }
+        else
+        {
+            throw;
+        }
+    }
+    finally
+    {
+        $ErrorActionPreference = $oldErrorActionPreferenceValue;
+    }
 
     return $assetName
 }
@@ -144,7 +165,7 @@ function Get-DefaultRDFEImage
 
 <#
 .SYNOPSIS
-Gets default RDFE Image
+Gets default CRP Image
 #>
 function Get-DefaultCRPImage
 {
@@ -195,6 +216,19 @@ function Get-DefaultCRPImage
     return $vmimg;
 }
 
+<#
+.SYNOPSIS
+Gets VMM Images
+#>
+function Get-MarketplaceImage
+{
+    param([string] $location = "eastasia", [string] $pubFilter = '*', [string] $offerFilter = '*')
+
+    $imgs = Get-AzureVMImagePublisher -Location $location | where { $_.PublisherName -like $pubFilter } | Get-AzureVMImageOffer | where { $_.Offer -like $offerFilter } | Get-AzureVMImageSku | Get-AzureVMImage | Get-AzureVMImageDetail | where { $_.PurchasePlan -ne $null };
+
+    return $imgs;
+}
+
 <#
 .SYNOPSIS
 Gets default VM config object

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/TestVirtualMachineSizeAndUsage.cs

@@ -13,17 +13,36 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using Microsoft.Azure.Commands.Compute.Models;
+using System;
 using Xunit;
 
 namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
 {
-    public partial class VirtualMachineTests
+    public class UtilityFunctionTests
     {
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestVirtualMachineImageList()
+        public void TestLocationStringExtension()
         {
-            ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineImageList");
+            string[] locations = new string[]
+            {
+                "West US",
+                "eastus",
+                "East Asia 2"
+            };
+
+            Func<string, string> normalize = delegate(string s)
+            {
+                return string.IsNullOrEmpty(s) ? s : s.Replace(" ", string.Empty).ToLower();
+            };
+
+            foreach (var loc in locations)
+            {
+                var s1 = loc.Canonicalize();
+                var s2 = normalize(loc);
+                Assert.True(string.Equals(s1, s2));
+            }
         }
     }
 }

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/TestVirtualMachineImageList.cs renamed to src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/UtilityFunctionTests.cs

@@ -102,7 +102,7 @@ function Test-SingleNetworkInterface
         # Image Reference;
         $p.StorageProfile.SourceImage = $null;
         $imgRef = Get-DefaultCRPImage;
-        $p = Set-AzureVMSourceImage -VM $p -ImageReference $imgRef;
+        $p = ($imgRef | Set-AzureVMSourceImage -VM $p);
         Assert-NotNull $p.StorageProfile.ImageReference;
         Assert-Null $p.StorageProfile.SourceImageId;
 
@@ -208,7 +208,7 @@ function Test-SingleNetworkInterfaceDnsSettings
         # Image Reference;
         $p.StorageProfile.SourceImage = $null;
         $imgRef = Get-DefaultCRPImage;
-        $p = Set-AzureVMSourceImage -VM $p -ImageReference $imgRef;
+        $p = ($imgRef | Set-AzureVMSourceImage -VM $p);
         Assert-NotNull $p.StorageProfile.ImageReference;
         Assert-Null $p.StorageProfile.SourceImageId;
 
@@ -318,7 +318,7 @@ function Test-MultipleNetworkInterface
         # Image Reference;
         $p.StorageProfile.SourceImage = $null;
         $imgRef = Get-DefaultCRPImage;
-        $p = Set-AzureVMSourceImage -VM $p -ImageReference $imgRef;
+        $p = ($imgRef | Set-AzureVMSourceImage -VM $p);
         Assert-NotNull $p.StorageProfile.ImageReference;
         Assert-Null $p.StorageProfile.SourceImageId;
 

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineCaptureTests.cs

@@ -25,5 +25,61 @@ public void TestVirtualMachine()
         {
             ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachine");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachineImageList()
+        {
+            ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineImageList");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachineList()
+        {
+            ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineList");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachineSizeAndUsage()
+        {
+            ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineSizeAndUsage");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachineCapture()
+        {
+            ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineCapture");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachineDataDisk()
+        {
+            ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineDataDisk");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachinePIRv2()
+        {
+            ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachinePIRv2");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachinePlan()
+        {
+            ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachinePlan");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachinePlan2()
+        {
+            ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachinePlan2");
+        }
     }
 }