add params to New-Azvm

src/Compute/Compute.Test/ScenarioTests/VirtualMachineTests.cs

@@ -430,5 +430,13 @@ public void TestCapacityReservation()
         {
             TestRunner.RunTestScript("Test-CapacityReservation");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVMwithSSHKey()
+        {
+            TestRunner.RunTestScript("Test-VMwithSSHKey");
+        }
+
     }
 }

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

@@ -5134,6 +5134,42 @@ function Test-CapacityReservation
         $CRG = Get-AzCapacityReservationGroup -ResourceGroupName $rgname
         Assert-AreEqual 0 $CRG.count
 
+    }
+    finally 
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname;
+    }
+} 
+
+function Test-VMwithSSHKey
+{
+    # Setup
+    $rgname = Get-ComputeTestResourceName;
+    $loc = Get-ComputeVMLocation;
+
+    try
+    {
+        New-AzResourceGroup -Name $rgname -Location $loc -Force;
+
+
+        # create credential 
+        $securePassword = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force;  
+        $user = "admin01";
+        $cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
+
+        # Add one VM from creation 
+        $vmname = '1' + $rgname;
+        $domainNameLabel = "d1" + $rgname;
+        $sshKeyName = "s" + $rgname
+        $vm = New-AzVM -ResourceGroupName $rgname -Name $vmname -Credential $cred -Image CentOS -DomainNameLabel $domainNameLabel -SshKeyname $sshKeyName -generateSshkey 
+
+        $vm = Get-AzVm -ResourceGroupName $rgname -Name $vmname
+        $sshKey = Get-AzSshKey -ResourceGroupName $rgname -Name $sshKeyName
+
+        #assert compare 
+        Assert-AreEqual $vm.OSProfile.LinuxConfiguration.Ssh.PublicKeys[0].KeyData $sshKey.publickey
+
     }
     finally 
     {

src/Compute/Compute/ChangeLog.md

@@ -20,6 +20,7 @@
 
 -->
 ## Upcoming Release
+* Added new parameters `-SshKeyName` and `-GenerateSshKey` to `New-AzVM` to create a VM with SSH Key
 
 ## Version 4.16.0
 * Fixed the warning in `New-AzVM` cmdlet stating the sku of the VM is being defaulted even if a sku size is provided by the user. Now it only occurs when the user does not provide a sku size.

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

@@ -61,6 +61,7 @@ public static ResourceConfig<VirtualMachine> CreateVirtualMachineConfig(
             string evictionPolicy,
             double? maxPrice,
             bool encryptionAtHostPresent,
+            List<SshPublicKey> sshPublicKeys,
             string networkInterfaceDeleteOption = null,
             string osDiskDeleteOption = null,
             string dataDiskDeleteOption = null)
@@ -73,8 +74,11 @@ public static ResourceConfig<VirtualMachine> CreateVirtualMachineConfig(
                     OsProfile = new OSProfile
                     {
                         ComputerName = name,
-                        WindowsConfiguration = imageAndOsType.CreateWindowsConfiguration(),
-                        LinuxConfiguration = imageAndOsType.CreateLinuxConfiguration(),
+                        WindowsConfiguration = imageAndOsType?.CreateWindowsConfiguration(),
+                        LinuxConfiguration = (imageAndOsType?.OsType != OperatingSystemTypes.Linux) ? null : new LinuxConfiguration
+                        {
+                            Ssh = new SshConfiguration(sshPublicKeys)
+                        },
                         AdminUsername = adminUsername,
                         AdminPassword = adminPassword,
                     },

src/Compute/Compute/Usage/NewAzureSshKey.cs

@@ -42,28 +42,29 @@ public override void ExecuteCmdlet()
             base.ExecuteCmdlet();
             ExecuteClientAction(() =>
             {
-            string resourceGroupName = this.ResourceGroupName;
-            string sshKeyName = this.Name;
-            SshPublicKeyResource result;
-            SshPublicKeyResource sshkey = new SshPublicKeyResource();
-            ResourceGroup rg = ArmClient.ResourceGroups.Get(resourceGroupName);
-            sshkey.Location = rg.Location;
+                string resourceGroupName = this.ResourceGroupName;
+                string sshKeyName = this.Name;
+                SshPublicKeyResource result;
+                SshPublicKeyResource sshkey = new SshPublicKeyResource();
+                ResourceGroup rg = ArmClient.ResourceGroups.Get(resourceGroupName);
+                sshkey.Location = rg.Location;
 
-            if (this.IsParameterBound(c => c.PublicKey))
-            {
 
-                sshkey.PublicKey = this.PublicKey;
-                result = SshPublicKeyClient.Create(resourceGroupName, sshKeyName, sshkey);
-            }
-            else
-            {
-                WriteDebug("No public key is provided. A key pair is being generated for you.");
+                if (this.IsParameterBound(c => c.PublicKey))
+                {
 
-                result = SshPublicKeyClient.Create(resourceGroupName, sshKeyName, sshkey);
-                SshPublicKeyGenerateKeyPairResult keypair = SshPublicKeyClient.GenerateKeyPair(resourceGroupName, sshKeyName);
-                result.PublicKey = keypair.PublicKey;
+                    sshkey.PublicKey = this.PublicKey;
+                    result = SshPublicKeyClient.Create(resourceGroupName, sshKeyName, sshkey);
+                }
+                else
+                {
+                    WriteDebug("No public key is provided. A key pair is being generated for you.");
+
+                    result = SshPublicKeyClient.Create(resourceGroupName, sshKeyName, sshkey);
+                    SshPublicKeyGenerateKeyPairResult keypair = SshPublicKeyClient.GenerateKeyPair(resourceGroupName, sshKeyName);
+                    result.PublicKey = keypair.PublicKey;
 
-                string sshFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".ssh" );
+                    string sshFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".ssh" );
                     if (!Directory.Exists(sshFolder))
                     {
                         Directory.CreateDirectory(sshFolder);
@@ -72,8 +73,8 @@ public override void ExecuteCmdlet()
                     DateTimeOffset now = DateTimeOffset.UtcNow;
                     string privateKeyFileName = now.ToUnixTimeSeconds().ToString();
                     string publicKeyFileName = now.ToUnixTimeSeconds().ToString() + ".pub";
-                    string privateKeyFilePath = Path.Combine(sshFolder + privateKeyFileName);
-                    string publicKeyFilePath = Path.Combine(sshFolder + publicKeyFileName);
+                    string privateKeyFilePath = Path.Combine(sshFolder, privateKeyFileName);
+                    string publicKeyFilePath = Path.Combine(sshFolder, publicKeyFileName);
                     using (StreamWriter writer = new StreamWriter(privateKeyFilePath))
                     {
                         writer.WriteLine(keypair.PrivateKey);