Merge pull request #10 from AsrOneSdk/devsri-dev

Vault Credential bug fixes.

Author: sriramvu

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/PSRecoveryServicesClient/PSRecoveryServicesVaultClient.cs

@@ -29,7 +29,7 @@ public partial class PSRecoveryServicesClient
         /// <param name="vaultName">name of the vault</param>
         /// <param name="vaultCreateInput">vault creation input object</param>
         /// <returns>creation response object.</returns>
-        public VaultCreateResponse CreateVault(string cloudServiceName, string vaultName, VaultCreateArgs vaultCreateInput)
+        public RecoveryServicesOperationStatusResponse CreateVault(string cloudServiceName, string vaultName, VaultCreateArgs vaultCreateInput)
         {
             return this.GetRecoveryServicesClient.Vaults.Create(cloudServiceName, vaultName, vaultCreateInput);
         }

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Properties/Resources.Designer.cs

@@ -203,4 +203,7 @@ ClientRequestId: {3}</value>
   <data name="VaultCredentialGenerationUnSupported" xml:space="preserve">
     <value>Cannot generate vault credentials for this vault. Download it from the Azure Portal.</value>
   </data>
+  <data name="VaultCreationSuccessMessage" xml:space="preserve">
+    <value>Vault has been created</value>
+  </data>
 </root>

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Properties/Resources.resx

@@ -14,8 +14,9 @@
 
 using System;
 using System.Management.Automation;
+using System.Net;
+using Microsoft.Azure.Commands.RecoveryServices.Properties;
 using Microsoft.Azure.Commands.RecoveryServices.SiteRecovery;
-using Microsoft.Azure.Portal.RecoveryServices.Models.Common;
 using Microsoft.WindowsAzure.Management.RecoveryServices.Models;
 
 namespace Microsoft.Azure.Commands.RecoveryServices
@@ -32,14 +33,14 @@ public class CreateAzureSiteRecoveryVault : RecoveryServicesCmdletBase
         /// <summary>
         /// Gets or sets the vault name
         /// </summary>
-        [Parameter(ParameterSetName = ASRParameterSets.ByParam, HelpMessage = "Vault Name for which the cred file to be generated")]
+        [Parameter(ParameterSetName = ASRParameterSets.ByParam, Mandatory = true, HelpMessage = "Vault Name for which the cred file to be generated")]
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the location of the vault
         /// </summary>
-        [Parameter(ParameterSetName = ASRParameterSets.ByParam, HelpMessage = "Geo Location Name")]
+        [Parameter(ParameterSetName = ASRParameterSets.ByParam, Mandatory = true, HelpMessage = "Geo Location Name")]
         [ValidateNotNullOrEmpty]
         public string Location { get; set; }
 
@@ -75,11 +76,11 @@ public override void ExecuteCmdlet()
                     SchemaVersion = Constants.RpSchemaVersion
                 };
 
-                VaultCreateResponse response = RecoveryServicesClient.CreateVault(cloudServiceName, this.Name, vaultCreateArgs);
+                RecoveryServicesOperationStatusResponse response = RecoveryServicesClient.CreateVault(cloudServiceName, this.Name, vaultCreateArgs);
 
                 VaultOperationOutput output = new VaultOperationOutput()
                 {
-                    OperationTrackingId = response.RequestId
+                    Response = response.StatusCode == HttpStatusCode.OK ? Resources.VaultCreationSuccessMessage : response.StatusCode.ToString()
                 };
 
                 this.WriteObject(output, true);

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/CreateAzureSiteRecoveryVault.cs

@@ -28,7 +28,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices
     /// <summary>
     /// Retrieves Azure Site Recovery Server.
     /// </summary>
-    [Cmdlet(VerbsCommon.Get, "AzureSiteRecoveryVaultCredential", DefaultParameterSetName = ASRParameterSets.Default)]
+    [Cmdlet(VerbsCommon.Get, "AzureSiteRecoveryVaultCredential", DefaultParameterSetName = ASRParameterSets.ByObject)]
     [OutputType(typeof(VaultCredentialOutput))]
     public class GetVaultCredentialsFile : RecoveryServicesCmdletBase
     {
@@ -42,14 +42,14 @@ public class GetVaultCredentialsFile : RecoveryServicesCmdletBase
         /// <summary>
         /// Gets or sets the vault name
         /// </summary>
-        [Parameter(ParameterSetName = ASRParameterSets.ByParam, HelpMessage = "Vault Name for which the cred file to be generated")]
+        [Parameter(ParameterSetName = ASRParameterSets.ByParam, Mandatory = true, HelpMessage = "Vault Name for which the cred file to be generated")]
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the location of the vault
         /// </summary>
-        [Parameter(ParameterSetName = ASRParameterSets.ByParam, HelpMessage = "Geo Location Name to which the vault belongs")]
+        [Parameter(ParameterSetName = ASRParameterSets.ByParam, Mandatory = true, HelpMessage = "Geo Location Name to which the vault belongs")]
         [ValidateNotNullOrEmpty]
         public string Location { get; set; }
 

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/GetAzureSiteRecoveryVaultCredential.cs

@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices
     /// <summary>
     /// Retrieves Azure Site Recovery Server.
     /// </summary>
-    [Cmdlet(VerbsCommon.Get, "AzureSiteRecoveryVaults", DefaultParameterSetName = ASRParameterSets.Default)]
+    [Cmdlet(VerbsCommon.Get, "AzureSiteRecoveryVaults")]
     [OutputType(typeof(List<ASRVault>))]
     public class GetAzureSiteRecoveryVaults : RecoveryServicesCmdletBase
     {

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/GetAzureSiteRecoveryVaults.cs

@@ -1249,7 +1249,7 @@ public VaultOperationOutput()
         /// <summary>
         /// Gets or sets the operation tracking id of the operation performed.
         /// </summary>
-        public string OperationTrackingId { get; set; }
+        public string Response { get; set; }
 
         #endregion
     }