Merge branch 'release-2019-10-15' into isra-fel-patch-2

Author: erich-wang

src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="6.0.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.15.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
   </ItemGroup>
 
 </Project>

src/Compute/Compute.Test/Compute.Test.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="29.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.15.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/Compute/Compute.Test/ScenarioTests/StrategiesVirtualMachineTests.cs

@@ -169,5 +169,12 @@ public void TestSimpleNewVmPpgId()
         {
             TestRunner.RunTestScript("Test-SimpleNewVmPpgId");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestSimpleNewVmBilling()
+        {
+            TestRunner.RunTestScript("Test-SimpleNewVmBilling");
+        }
     }
 }

src/Compute/Compute.Test/ScenarioTests/StrategiesVirtualMachineTests.ps1

@@ -53,10 +53,10 @@ Test Simple Paremeter Set for New Vm
 function Test-SimpleNewVmFromSIGImage
 {
     #This test needs to be run form the following subscription in record mode :
-	# 9e223dbe-3399-4e19-88eb-0975f02ac87f
-	#The vm needs to be created in the one of the following regions :
-	# "South Central US", "East US 2" and "Central US"
-	#To see more information on the steps to create a new SIG image go here: https://aka.ms/AA37jbt
+    # 9e223dbe-3399-4e19-88eb-0975f02ac87f
+    #The vm needs to be created in the one of the following regions :
+    # "South Central US", "East US 2" and "Central US"
+    #To see more information on the steps to create a new SIG image go here: https://aka.ms/AA37jbt
     # Setup
     $vmname = Get-ResourceName
 
@@ -102,14 +102,14 @@ function Test-SimpleNewVmWithUltraSSD
         [string]$domainNameLabel = "$vmname-$vmname".tolower();
 
         # Common
-		#As of now the ultrasd feature is only supported in east us 2 and in the size Standard_D2s_v3, on the features GA the restriction will be lifted
-		#Use the follwing command to figure out the one to use 
-		#Get-AzComputeResourceSku | where {$_.ResourceType -eq "disks" -and $_.Name -eq "UltraSSD_LRS" }
+        #As of now the ultrasd feature is only supported in east us 2 and in the size Standard_D2s_v3, on the features GA the restriction will be lifted
+        #Use the follwing command to figure out the one to use 
+        #Get-AzComputeResourceSku | where {$_.ResourceType -eq "disks" -and $_.Name -eq "UltraSSD_LRS" }
         $x = New-AzVM -Name $vmname -Credential $cred -DomainNameLabel $domainNameLabel -Location "eastus2" -EnableUltraSSD -Zone 2 -Size "Standard_D2s_v3"
 
         Assert-AreEqual $vmname $x.Name;
         Assert-Null $x.Identity
-		Assert-True { $x.AdditionalCapabilities.UltraSSDEnabled };
+        Assert-True { $x.AdditionalCapabilities.UltraSSDEnabled };
 
         $nic = Get-AzNetworkInterface -ResourceGroupName $vmname  -Name $vmname
         Assert-NotNull $nic
@@ -434,7 +434,6 @@ function Test-SimpleNewVmWithAvailabilitySet2
     }
 }
 
-
 <#
 .SYNOPSIS
 Test Simple Paremeter Set for New Vm
@@ -452,9 +451,8 @@ function Test-SimpleNewVmImageName
         [string]$domainNameLabel = "$vmname-$vmname".tolower()
 
         # Common
-        $imgversion = Get-VMImageVersion -publisher "MicrosoftWindowsServer" `
-							-offer "WindowsServer" -sku "2016-Datacenter"
-		$x = New-AzVM `
+        $imgversion = Get-VMImageVersion -publisher "MicrosoftWindowsServer" -offer "WindowsServer" -sku "2016-Datacenter"
+        $x = New-AzVM `
             -Name $vmname `
             -Credential $cred `
             -DomainNameLabel $domainNameLabel `
@@ -469,7 +467,6 @@ function Test-SimpleNewVmImageName
     }
 }
 
-
 <#
 .SYNOPSIS
 Test Simple Paremeter Set for New Vm
@@ -571,4 +568,35 @@ function Test-SimpleNewVmPpgId
         Clean-ResourceGroup $rgname
         Clean-ResourceGroup $vmname
     }
-}
+}
+
+<#
+.SYNOPSIS
+Test Simple Paremeter Set for New VM with eviction policy, priority and max price.
+#>
+function Test-SimpleNewVmBilling
+{
+    # Setup
+    $vmname = Get-ResourceName
+
+    try
+    {
+        $username = "admin01"
+        $password = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force
+        $cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
+        [string]$domainNameLabel = "$vmname-$vmname".tolower();
+
+        # Common
+        $vm = New-AzVM -Name $vmname -Credential $cred -DomainNameLabel $domainNameLabel -EvictionPolicy 'Deallocate' -Priority 'Low' -MaxPrice 0.2;
+
+        Assert-AreEqual $vmname $vm.Name;
+        Assert-AreEqual 'Deallocate' $vm.EvictionPolicy;
+        Assert-AreEqual 'Low' $vm.Priority;     
+        Assert-AreEqual 0.2 $vm.BillingProfile.MaxPrice;
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $vmname
+    }
+}

src/Compute/Compute.Test/ScenarioTests/StrategiesVmssTests.cs

@@ -109,5 +109,12 @@ public void TestSimpleNewVmssPpg()
         {
             TestRunner.RunTestScript("Test-SimpleNewVmssPpg");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestSimpleNewVmssBilling()
+        {
+            TestRunner.RunTestScript("Test-SimpleNewVmssBilling");
+        }
     }
 }

src/Compute/Compute.Test/ScenarioTests/StrategiesVmssTests.ps1

@@ -63,10 +63,10 @@ Test Simple Paremeter Set for New Vm
 function Test-SimpleNewVmssFromSIGImage
 {
     #This test needs to be run form the following subscription in record mode :
-	# 9e223dbe-3399-4e19-88eb-0975f02ac87f
-	#The vm needs to be created in the one of the following regions :
-	# "South Central US", "East US 2" and "Central US"
-	#To see more information on the steps to create a new SIG image go here: https://aka.ms/AA37jbt
+    # 9e223dbe-3399-4e19-88eb-0975f02ac87f
+    #The vm needs to be created in the one of the following regions :
+    # "South Central US", "East US 2" and "Central US"
+    #To see more information on the steps to create a new SIG image go here: https://aka.ms/AA37jbt
     # Setup
     $vmssname = Get-ResourceName
 
@@ -124,9 +124,9 @@ function Test-SimpleNewVmssWithUltraSSD
         [string]$domainNameLabel = "$vmssname$vmssname".tolower();
 
         # Common
-		#As of now the ultrasd feature is only supported in east us 2 and in the size Standard_D2s_v3, on the features GA the restriction will be lifted
-		#Use the follwing command to figure out the one to use 
-		#Get-AzComputeResourceSku | where {$_.ResourceType -eq "disks" -and $_.Name -eq "UltraSSD_LRS" }
+        #As of now the ultrasd feature is only supported in east us 2 and in the size Standard_D2s_v3, on the features GA the restriction will be lifted
+        #Use the follwing command to figure out the one to use 
+        #Get-AzComputeResourceSku | where {$_.ResourceType -eq "disks" -and $_.Name -eq "UltraSSD_LRS" }
         $x = New-AzVmss -Name $vmssname -Credential $cred -DomainNameLabel $domainNameLabel -LoadBalancerName $lbName -Location "east us 2" -EnableUltraSSD -Zone 3 -VmSize "Standard_D2s_v3"
 
         Assert-AreEqual $vmssname $x.Name;
@@ -403,4 +403,35 @@ function Test-SimpleNewVmssPpg
         # Cleanup
         Clean-ResourceGroup $rgname
     }
+}
+
+<#
+.SYNOPSIS
+Test Simple Paremeter Set for New Vmss with eviction policy, priority, and max price.
+#>
+function Test-SimpleNewVmssBilling
+{
+    # Setup
+    $vmssname = Get-ResourceName
+
+    try
+    {
+        $username = "admin01"
+        $password = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force
+        $cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
+        [string]$domainNameLabel = "$vmssname$vmssname".tolower();
+
+        # Common
+        $x = New-AzVmss -Name $vmssname -Location "westus2" -Credential $cred -DomainNameLabel $domainNameLabel `
+                        -EvictionPolicy 'Deallocate' -Priority 'Low' -MaxPrice 0.2;
+    }
+    catch
+    {
+        Assert-True { $Error[0].ToString().Contains("OS provisioning failure"); }
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $vmssname
+    }
 }