Update according to comments

Author: unknown

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

@@ -82,32 +82,33 @@ function Test-VirtualMachineProfile
 
     $p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred -CustomData $custom -WinRMHttp -WinRMHttps -WinRMCertUrl $winRMCertUrl -ProvisionVMAgent -EnableAutoUpdate -TimeZone $timeZone;
     $p = Set-AzureVMSourceImage -VM $p -Name $img;
+	$subid = (Get-AzureSubscription -Current).SubscriptionId;
 
-	$referenceUri = "/subscriptions/" + (Get-AzureSubscription -Current).SubscriptionId + "/resourceGroups/RgTest1/providers/Microsoft.KeyVault/vaults/TestVault123";
+    $referenceUri = "/subscriptions/" + $subid + "/resourceGroups/RgTest1/providers/Microsoft.KeyVault/vaults/TestVault123";
     $certStore = "My";
     $certUrl =  "https://testvault123.vault.azure.net/secrets/Test1/514ceb769c984379a7e0230bdd703272";
     $p = Add-AzureVMSecretConfig -VM $p -ReferenceUri $referenceUri -CertificateStore $certStore -CertificateUrl $certUrl;
 
-	$referenceUri2 = "/subscriptions/" + (Get-AzureSubscription -Current).SubscriptionId + "/resourceGroups/RgTest1/providers/Microsoft.KeyVault/vaults/TestVault456";    
+	$referenceUri2 = "/subscriptions/" + $subid + "/resourceGroups/RgTest1/providers/Microsoft.KeyVault/vaults/TestVault456";
     $p = Add-AzureVMSecretConfig -VM $p -ReferenceUri $referenceUri2 -CertificateStore $certStore -CertificateUrl $certUrl;
 
 	$certStore2 = "My2";
     $certUrl2 =  "https://testvault123.vault.azure.net/secrets/Test1/514ceb769c984379a7e0230bddaaaaaa";
 	$p = Add-AzureVMSecretConfig -VM $p -ReferenceUri $referenceUri -CertificateStore $certStore2 -CertificateUrl $certUrl2;
 
 	$aucSetting = "AutoLogon";
-    $aucContent = "<UserAccounts><AdministratorPassword><Value>p@ssw0rd</Value><PlainText>true</PlainText></AdministratorPassword></UserAccounts>";
+    $aucContent = "<UserAccounts><AdministratorPassword><Value>" + $password + "</Value><PlainText>true</PlainText></AdministratorPassword></UserAccounts>";
     $p = Add-AzureVMAdditionalUnattendContentConfig -VM $p -Content $aucContent -SettingName $aucSetting;
     $p = Add-AzureVMAdditionalUnattendContentConfig -VM $p -Content $aucContent -SettingName $aucSetting;
 
     Assert-AreEqual $p.OSProfile.AdminUsername $user;
     Assert-AreEqual $p.OSProfile.ComputerName $computerName;
     Assert-AreEqual $p.OSProfile.AdminPassword $password;
-    Assert-AreEqual $p.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
+    Assert-AreEqual $p.StorageProfile.SourceImage.ReferenceUri ('/' + $subid + '/services/images/' + $img);
     Assert-AreEqual $p.OSProfile.Secrets[0].SourceVault.ReferenceUri $referenceUri;
     Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[0].CertificateStore $certStore;
     Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[0].CertificateUrl $certUrl;
-	Assert-AreEqual $p.OSProfile.Secrets[0].SourceVault.ReferenceUri $referenceUri;
+    Assert-AreEqual $p.OSProfile.Secrets[0].SourceVault.ReferenceUri $referenceUri;
     Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[1].CertificateStore $certStore2;
     Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[1].CertificateUrl $certUrl2;
 	Assert-AreEqual $p.OSProfile.Secrets[1].SourceVault.ReferenceUri $referenceUri2;
@@ -151,7 +152,7 @@ function Test-VirtualMachineProfile
     Assert-AreEqual $p.OSProfile.AdminUsername $user;
     Assert-AreEqual $p.OSProfile.ComputerName $computerName;
     Assert-AreEqual $p.OSProfile.AdminPassword $password;
-    Assert-AreEqual $p.StorageProfile.SourceImage.ReferenceUri ('/' + (Get-AzureSubscription -Current).SubscriptionId + '/services/images/' + $img);
+    Assert-AreEqual $p.StorageProfile.SourceImage.ReferenceUri ('/' + $subid + '/services/images/' + $img);
     Assert-AreEqual $p.OSProfile.Secrets[0].SourceVault.ReferenceUri $referenceUri;
     Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[0].CertificateStore $certStore;
     Assert-AreEqual $p.OSProfile.Secrets[0].VaultCertificates[0].CertificateUrl $certUrl;

src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/AddAzureVMAdditionalUnattendContentConfigCommand.cs

@@ -46,30 +46,14 @@ public class NewAzureAdditionalUnattendContentCommand : AzurePSCmdlet
         public PSVirtualMachine VM { get; set; }
 
         [Parameter(
-            DontShow = true, // Currently, the only allowable value is 'Microsoft-Windows-Shell-Setup'.
             Position = 1,
             ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Component Name.")]
-        [ValidateNotNullOrEmpty]
-        public string ComponentName { get; set; }
-
-        [Parameter(
-            Position = 2,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "XML Formatted Content.")]
         [ValidateNotNullOrEmpty]
         public string Content { get; set; }
 
         [Parameter(
-            DontShow = true, // Currently, the only allowable value is 'oobeSystem'.
-            Position = 3,
-            ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Pass name")]
-        [ValidateNotNullOrEmpty]
-        public string PassName { get; set; }
-
-        [Parameter(
-            Position = 4,
+            Position = 2,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Setting Name.")]
         [ValidateNotNullOrEmpty]

src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/AddAzureVMSecretConfigCommand.cs

@@ -103,7 +103,7 @@ public override void ExecuteCmdlet()
                     break;
                 }
 
-                if (this.VM.OSProfile.Secrets[i].SourceVault != null && this.VM.OSProfile.Secrets[i].SourceVault.ReferenceUri == this.ReferenceUri)
+                if (this.VM.OSProfile.Secrets[i].SourceVault != null && this.VM.OSProfile.Secrets[i].SourceVault.ReferenceUri.Equals(this.ReferenceUri))
                 {
                     if (this.VM.OSProfile.Secrets[i].VaultCertificates == null)
                     {