Merge pull request #5867 from sergey-shandar/sergey-win10

New-AzureRmVM/VMSS: simple parameter set: Win10 image

Author: Maddie Clayton

src/ResourceManager/Compute/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* `New-AzureRmVm` and `New-AzureRmVmss` (simple parameter set) support a `Win10` image.
 * `Repair-AzureRmVmssServiceFabricUpdateDomain` cmdlet is added.
 * Set minimum dependency of module to PowerShell 5.0
 

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

@@ -38,6 +38,13 @@ public void TestSimpleNewVm()
             ComputeTestController.NewInstance.RunPsTest("Test-SimpleNewVm");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
+        public void TestNewVmWin10()
+        {
+            ComputeTestController.NewInstance.RunPsTest("Test-NewVmWin10");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSimpleNewVmWithAvailabilitySet()

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

@@ -40,6 +40,41 @@ function Test-SimpleNewVm
     }
 }
 
+<#
+.SYNOPSIS
+Test Simple Paremeter Set for New Vm win Win10 and data disks
+#>
+function Test-NewVmWin10
+{
+    # Setup
+    $vmname = Get-ResourceName
+
+    try
+    {
+        $username = "admin01"
+		$passwordSuffix = Get-ResourceName
+        $password = "werWER345#%^$passwordSuffix" | ConvertTo-SecureString -AsPlainText -Force
+        $cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
+		[string]$domainNameLabel = "$vmname-$vmname".tolower();
+
+        # Common
+		$x = New-AzureRmVM `
+			-Name $vmname `
+			-Credential $cred `
+			-DomainNameLabel $domainNameLabel `
+			-ImageName "Win10" `
+			-DataDiskSizeInGb 32,64
+
+		Assert-AreEqual 2 $x.StorageProfile.DataDisks.Count
+        Assert-AreEqual $vmname $x.Name;        
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $vmname
+    }
+}
+
 <#
 .SYNOPSIS
 Test Simple Paremeter Set for New Vm

src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.StrategiesVirtualMachineTests/TestNewVmWin10.json

@@ -47,7 +47,8 @@ public partial class NewAzureRmVmss : ComputeAutomationBaseCmdlet
             "Win2016Datacenter",
             "Win2012R2Datacenter",
             "Win2012Datacenter",
-            "Win2008R2SP1")]
+            "Win2008R2SP1",
+            "Win10")]
         public string ImageName { get; set; } = "Win2016Datacenter";
 
         [Parameter(ParameterSetName = SimpleParameterSet, Mandatory = true)]

src/ResourceManager/Compute/Commands.Compute/Manual/VirtualMachineScaleSetCreateOrUpdateMethod.cs

@@ -142,6 +142,16 @@ static class Images
                                 Sku = "2008-R2-SP1",
                                 Version = "latest",
                             }
+                        },
+                        {
+                            "Win10",
+                            new ImageReference
+                            {
+                                Publisher = "MicrosoftVisualStudio",
+                                Offer = "Windows",
+                                Sku = "Windows-10-N-x64",
+                                Version = "latest"
+                            }
                         }
                     }
                 }

src/ResourceManager/Compute/Commands.Compute/Strategies/ComputeRp/Images.cs

@@ -18,7 +18,6 @@
 using Microsoft.Azure.Management.Internal.Network.Version2017_10_01.Models;
 using Microsoft.Azure.Commands.Common.Strategies;
 using System.Collections.Generic;
-using Microsoft.Azure.Commands.Compute.Models;
 
 namespace Microsoft.Azure.Commands.Compute.Strategies.ComputeRp
 {

src/ResourceManager/Compute/Commands.Compute/Strategies/ComputeRp/VirtualMachineStrategy.cs

@@ -190,7 +190,8 @@ public class NewAzureVMCommand : VirtualMachineBaseCmdlet
             "Win2016Datacenter",
             "Win2012R2Datacenter",
             "Win2012Datacenter",
-            "Win2008R2SP1")]
+            "Win2008R2SP1",
+            "Win10")]
         public string ImageName { get; set; } = "Win2016Datacenter";
 
         [Parameter(ParameterSetName = DiskFileParameterSet, Mandatory = true)]