Merge pull request Azure#187 from huangpf/crp2

[P0] Fix #1: Location & VM Plan
jtlibing · Apr 28, 2015 · 284befe · 284befe
2 parents c91d6c5 + b671845
commit 284befe
Show file tree

Hide file tree

Showing 25 changed files with 265 additions and 396 deletions.
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj b/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj
@@ -146,17 +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\VirtualMachinePlanTests.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>

diff --git a/...esourceManager/Compute/Commands.Compute.Test/ScenarioTests/TestVirtualMachineImageList.cs b/...esourceManager/Compute/Commands.Compute.Test/ScenarioTests/TestVirtualMachineImageList.cs
diff --git a/...urceManager/Compute/Commands.Compute.Test/ScenarioTests/TestVirtualMachineSizeAndUsage.cs b/...urceManager/Compute/Commands.Compute.Test/ScenarioTests/TestVirtualMachineSizeAndUsage.cs
diff --git a/.../ScenarioTests/VirtualMachinePlanTests.cs → ...est/ScenarioTests/UtilityFunctionTests.cs b/.../ScenarioTests/VirtualMachinePlanTests.cs → ...est/ScenarioTests/UtilityFunctionTests.cs
@@ -13,24 +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 TestVirtualMachinePlan()
+        public void TestLocationStringExtension()
         {
-            ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachinePlan");
-        }
+            string[] locations = new string[]
+            {
+                "West US",
+                "eastus",
+                "East Asia 2"
+            };
 
-        [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestVirtualMachinePlan2()
-        {
-            ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachinePlan2");
+            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));
+            }
         }
     }
 }
diff --git a/...ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineCaptureTests.cs b/...ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineCaptureTests.cs
diff --git a/...esourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineDataDiskTests.cs b/...esourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineDataDiskTests.cs
diff --git a/...nager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineNetworkInterfaceTests.ps1 b/...nager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineNetworkInterfaceTests.ps1
@@ -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;
 

diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachinePIRv2Tests.cs b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachinePIRv2Tests.cs
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.cs b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.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");
+        }
     }
 }
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1
@@ -454,7 +454,7 @@ function Test-VirtualMachineSizeAndUsage
         # Image Reference;
         $p.StorageProfile.SourceImage = $null;
         $imgRef = Get-DefaultCRPImage;
-        $p = Set-AzureVMSourceImage -VM $p -ImageReference $imgRef;
+        $p = Set-AzureVMSourceImage -VM $p -PublisherName $imgRef.PublisherName -Offer $imgRef.Offer -Skus $imgRef.Skus -Version $imgRef.Version;
         Assert-NotNull $p.StorageProfile.ImageReference;
         Assert-Null $p.StorageProfile.SourceImageId;
 
@@ -620,7 +620,7 @@ function Test-VirtualMachinePIRv2
         # 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;
 
@@ -730,7 +730,7 @@ function Test-VirtualMachineCapture
         # Image Reference;
         $p.StorageProfile.SourceImage = $null;
         $imgRef = Get-DefaultCRPImage;
-        $p = Set-AzureVMSourceImage -VM $p -ImageReference $imgRef;
+        $p = ($imgRef | Set-AzureVMSourceImage -VM $p);
 
         # TODO: Remove Data Disks for now
         $p.StorageProfile.DataDisks = $null;
@@ -825,7 +825,7 @@ function Test-VirtualMachineDataDisk
         # Image Reference;
         $p.StorageProfile.SourceImage = $null;
         $imgRef = Get-DefaultCRPImage;
-        $p = Set-AzureVMSourceImage -VM $p -ImageReference $imgRef;
+        $p = ($imgRef | Set-AzureVMSourceImage -VM $p);
 
         # Negative Tests on A0 Size + 2 Data Disks
         Assert-ThrowsContains { New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $p; } "The maximum number of data disks allowed to be attached to a VM is 1.";
@@ -901,10 +901,14 @@ function Test-VirtualMachinePlan
         # Image Reference;
         $p.StorageProfile.SourceImage = $null;
         $imgRef = Get-DefaultCRPImage;
-        $p = Set-AzureVMSourceImage -VM $p -ImageReference $imgRef;
+        $p = ($imgRef | Set-AzureVMSourceImage -VM $p);
 
         $plan = Get-ComputeTestResourceName;
-        $p = Set-AzureVMPlan -VM $p -PlanName $plan -Publisher $plan -Product $plan -PromotionCode $plan;
+        $p.Plan = New-Object Microsoft.Azure.Management.Compute.Models.Plan;
+        $p.Plan.Name = $plan;
+        $p.Plan.Publisher = $plan;
+        $p.Plan.Product = $plan;
+        $p.Plan.PromotionCode = $plan;
 
         # Negative Tests on non-existing Plan
         Assert-ThrowsContains { New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $p; } "User failed validation to purchase resources";
@@ -985,8 +989,12 @@ function Test-VirtualMachinePlan2
         $vmmImgVerName = '1.0.0';
         $imgRef = Get-AzureVMImageDetail -PublisherName $vmmImgPubName -Location $loc -Offer $vmmImgOfferName -Skus $vmmImgSkusName -Version $vmmImgVerName;
         $plan = $imgRef.PurchasePlan;
-        $p = Set-AzureVMSourceImage -VM $p -ImageReference $imgRef;
-        $p = Set-AzureVMPlan -VM $p -PlanName $plan.Name -Publisher $plan.Publisher -Product $plan.Product;
+        $p = Set-AzureVMSourceImage -VM $p -PublisherName $imgRef.PublisherName -Offer $imgRef.Offer -Skus $imgRef.Skus -Version $imgRef.Version;
+        $p.Plan = New-Object Microsoft.Azure.Management.Compute.Models.Plan;
+        $p.Plan.Name = $plan.Name;
+        $p.Plan.Publisher = $plan.Publisher;
+        $p.Plan.Product = $plan.Product;
+        $p.Plan.PromotionCode = $null;
         $p.OSProfile.WindowsConfiguration = $null;
 
         New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $p;