Merge pull request #19 from Azure/build

u

Author: huangpf

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

@@ -87,19 +87,19 @@ function Test-VirtualMachineProfile
     $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;
+    $p = Add-AzureVMSecret -VM $p -SourceVaultId $referenceUri -CertificateStore $certStore -CertificateUrl $certUrl;
 
 	$referenceUri2 = "/subscriptions/" + $subid + "/resourceGroups/RgTest1/providers/Microsoft.KeyVault/vaults/TestVault456";
-    $p = Add-AzureVMSecretConfig -VM $p -ReferenceUri $referenceUri2 -CertificateStore $certStore -CertificateUrl $certUrl;
+    $p = Add-AzureVMSecret -VM $p -SourceVaultId $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;
+	$p = Add-AzureVMSecret -VM $p -SourceVaultId $referenceUri -CertificateStore $certStore2 -CertificateUrl $certUrl2;
 
 	$aucSetting = "AutoLogon";
     $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;
+    $p = Add-AzureVMAdditionalUnattendContent -VM $p -Content $aucContent -SettingName $aucSetting;
+    $p = Add-AzureVMAdditionalUnattendContent -VM $p -Content $aucContent -SettingName $aucSetting;
 
     Assert-AreEqual $p.OSProfile.AdminUsername $user;
     Assert-AreEqual $p.OSProfile.ComputerName $computerName;
@@ -145,9 +145,9 @@ function Test-VirtualMachineProfile
 
 	$sshPath = "/home/pstestuser/.ssh/authorized_keys";
     $sshPublicKey = "MIIDszCCApugAwIBAgIJALBV9YJCF/tAMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV";
-    $p = Add-AzureVMSshPublicKeyConfig -VM $p -KeyData $sshPublicKey -Path $sshPath;
-	$p = Add-AzureVMSshPublicKeyConfig -VM $p -KeyData $sshPublicKey -Path $sshPath;
-    $p = Add-AzureVMSecretConfig -VM $p -ReferenceUri $referenceUri -CertificateStore $certStore -CertificateUrl $certUrl;
+    $p = Add-AzureVMSshPublicKey -VM $p -KeyData $sshPublicKey -Path $sshPath;
+	$p = Add-AzureVMSshPublicKey -VM $p -KeyData $sshPublicKey -Path $sshPath;
+    $p = Add-AzureVMSecret -VM $p -SourceVaultId $referenceUri -CertificateStore $certStore -CertificateUrl $certUrl;
 
     Assert-AreEqual $p.OSProfile.AdminUsername $user;
     Assert-AreEqual $p.OSProfile.ComputerName $computerName;

src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

@@ -199,9 +199,9 @@
     <Compile Include="VirtualMachineSizes\VirtualMachineSizeBaseCmdlet.cs" />
     <Compile Include="VirtualMachine\Action\SaveAzureVMImageCommand.cs" />
     <Compile Include="VirtualMachine\Action\SetAzureVMCommand.cs" />
-    <Compile Include="VirtualMachine\Config\AddAzureVMAdditionalUnattendContentConfigCommand.cs" />
-    <Compile Include="VirtualMachine\Config\AddAzureVMSshPublicKeyConfigCommand.cs" />
-    <Compile Include="VirtualMachine\Config\AddAzureVMSecretConfigCommand.cs" />
+    <Compile Include="VirtualMachine\Config\AddAzureVMAdditionalUnattendContentCommand.cs" />
+    <Compile Include="VirtualMachine\Config\AddAzureVMSshPublicKeyCommand.cs" />
+    <Compile Include="VirtualMachine\Config\AddAzureVMSecretCommand.cs" />
     <Compile Include="VirtualMachine\Config\RemoveAzureVMNetworkInterfaceCommand.cs" />
     <Compile Include="VirtualMachine\Config\RemoveAzureVMDataDiskCommand.cs" />
     <Compile Include="VirtualMachine\Config\SetAzureVMSourceImage.cs" />

src/ResourceManager/Compute/Commands.Compute/Common/ConstantStringTypes.cs

@@ -89,10 +89,9 @@ public static class ProfileNouns
 
         public const string VirtualMachineUsage = "AzureVMUsage";
 
+        public const string SshPublicKey = "AzureVMSshPublicKey";
+        public const string AdditionalUnattendContent = "AzureVMAdditionalUnattendContent";
+        public const string VaultSecretGroup = "AzureVMSecret";
         public const string RemoteDesktopFile = "AzureRemoteDesktopFile";
-        public const string SshPublicKey = "AzureVMSshPublicKeyConfig";
-        public const string AdditionalUnattendContent = "AzureVMAdditionalUnattendContentConfig";
-        public const string VaultCertificate = "AzureVMVaultCertificateConfig";
-        public const string VaultSecretGroup = "AzureVMSecretConfig";
     }
 }

…dditionalUnattendContentConfigCommand.cs …ureVMAdditionalUnattendContentCommand.cssrc/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/AddAzureVMAdditionalUnattendContentConfigCommand.cs renamed to src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/AddAzureVMAdditionalUnattendContentCommand.cs src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/AddAzureVMAdditionalUnattendContentConfigCommand.cs renamed to src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/AddAzureVMAdditionalUnattendContentCommand.cs

@@ -42,12 +42,13 @@ public class NewAzureVaultSecretGroupCommand : AzurePSCmdlet
         [ValidateNotNullOrEmpty]
         public PSVirtualMachine VM { get; set; }
 
+        [Alias("Id")]
         [Parameter(
             Position = 1,
             ValueFromPipelineByPropertyName = true,
-            HelpMessage = "the relative URL")]
+            HelpMessage = "The ID for Source Vault")]
         [ValidateNotNullOrEmpty]
-        public string ReferenceUri { get; set; }
+        public string SourceVaultId { get; set; }
 
         [Parameter(
             Position = 2,
@@ -82,7 +83,7 @@ public override void ExecuteCmdlet()
                 if (i == this.VM.OSProfile.Secrets.Count)
                 {
                     var sourceVault = new SourceVaultReference {
-                        ReferenceUri = this.ReferenceUri
+                        ReferenceUri = this.SourceVaultId
                     };
 
                     var vaultCertificates = new List<VaultCertificate>{
@@ -103,7 +104,7 @@ public override void ExecuteCmdlet()
                     break;
                 }
 
-                if (this.VM.OSProfile.Secrets[i].SourceVault != null && this.VM.OSProfile.Secrets[i].SourceVault.ReferenceUri.Equals(this.ReferenceUri))
+                if (this.VM.OSProfile.Secrets[i].SourceVault != null && this.VM.OSProfile.Secrets[i].SourceVault.ReferenceUri.Equals(this.SourceVaultId))
                 {
                     if (this.VM.OSProfile.Secrets[i].VaultCertificates == null)
                     {