Update Tests

Author: huangpf

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

@@ -94,6 +94,18 @@ function Get-ComputeTestLocation
     return $env:AZURE_COMPUTE_TEST_LOCATION;
 }
 
+# Get Compute Default Test Location
+function Get-ComputeDefaultLocation
+{
+    $test_location = Get-ComputeTestLocation;
+    if ($test_location -eq '' -or $test_location -eq $null)
+    {
+        $test_location = 'westus';
+    }
+
+    return $test_location;
+}
+
 # Cleans the created resource group
 function Clean-ResourceGroup($rgname)
 {
@@ -197,6 +209,36 @@ function Get-DefaultVMSize
     return $vmSizes[0].Name;
 }
 
+
+<#
+.SYNOPSIS
+Gets default RDFE Image
+#>
+function Get-DefaultRDFEImage
+{
+    param([string] $loca = "East Asia", [string] $query = '*Windows*Data*Center*')
+
+    $d = (Azure\Get-AzureVMImage | where {$_.ImageName -like $query -and ($_.Location -like "*;$loca;*" -or $_.Location -like "$loca;*" -or $_.Location -like "*;$loca" -or $_.Location -eq "$loca")});
+
+    if ($d -eq $null)
+    {
+        return $null;
+    }
+    else
+    {
+        return $d[-1].ImageName;
+    }
+}
+
+<#
+.SYNOPSIS
+Gets default storage type string
+#>
+function Get-DefaultStorageType
+{
+    return 'Standard_GRS';
+}
+
 <#
 .SYNOPSIS
 Gets default CRP Image

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

@@ -961,11 +961,12 @@ function Test-VirtualMachinePlan2
     try
     {
         # Common
-        $loc = 'westus';
+        $loc = Get-ComputeDefaultLocation;
+        
         New-AzureResourceGroup -Name $rgname -Location $loc -Force;
 
         # VM Profile & Hardware
-        $vmsize = 'Standard_A0';
+        $vmsize = Get-DefaultVMSize;
         $vmname = 'vm' + $rgname;
         $p = New-AzureVMConfig -VMName $vmname -VMSize $vmsize;
         # NRP
@@ -984,7 +985,7 @@ function Test-VirtualMachinePlan2
 
         # Storage Account (SA)
         $stoname = 'sto' + $rgname;
-        $stotype = 'Standard_GRS';
+        $stotype = Get-DefaultStorageType;
         New-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
         $stoaccount = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
 
@@ -1001,18 +1002,13 @@ function Test-VirtualMachinePlan2
         $cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
         $computerName = 'test';
         $vhdContainer = "https://$stoname.blob.core.windows.net/test";
-        $img = 'a699494373c04fc0bc8f2bb1389d6106__Windows-Server-2012-Datacenter-201503.01-en.us-127GB.vhd';
 
         # $p.StorageProfile.OSDisk = $null;
         $p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred;
 
         # Image Reference
         # Pick a VMM Image
-        $vmmImgPubName = 'a10networks';
-        $vmmImgOfferName = 'a10-vthunder-adc';
-        $vmmImgSkusName = 'vthunder_byol';
-        $vmmImgVerName = '1.0.0';
-        $imgRef = Get-AzureVMImage -PublisherName $vmmImgPubName -Location $loc -Offer $vmmImgOfferName -Skus $vmmImgSkusName -Version $vmmImgVerName;
+        $imgRef = (Get-MarketplaceImage)[0];
         $plan = $imgRef.PurchasePlan;
         $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;
@@ -1321,11 +1317,12 @@ function Test-LinuxVirtualMachine
 # Test Image Cmdlet Output Format
 function Test-VMImageCmdletOutputFormat
 {
-    $locStr = 'westus';
-    $publisher = 'MicrosoftWindowsServer';
-    $offer = 'WindowsServer';
-    $sku = '2008-R2-SP1';
-    $ver = '2.0.201503';
+    $locStr = Get-ComputeDefaultLocation;
+    $imgRef = Get-DefaultCRPImage -loc $locStr;
+    $publisher = $imgRef.PublisherName;
+    $offer = $imgRef.Offer;
+    $sku = $imgRef.Skus;
+    $ver = $imgRef.Version;
 
     Assert-OutputContains " Get-AzureVMImagePublisher -Location $locStr" @('Id', 'Location', 'PublisherName');