taking hydra spec namespace change for SiteRecovery Vault management...

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesClient.cs

@@ -64,7 +64,7 @@ public RecoveryServicesManagementClient GetRecoveryServicesClient
         "Microsoft.StyleCop.CSharp.MaintainabilityRules",
         "SA1401:FieldsMustBePrivate",
         Justification = "For Resource Credentials.")]
-        public static ASRVaultCreds asrVaultCreds = new ASRVaultCreds();
+        public static ARSVaultCreds arsVaultCreds = new ARSVaultCreds();
 
         /// <summary>
         /// Recovery Services client.
@@ -86,7 +86,7 @@ public PSRecoveryServicesClient(IAzureProfile azureProfile)
             string resourceType = string.Empty;
 
             // Get Resource provider namespace from config if needed to communicate with internal deployments
-            if (string.IsNullOrEmpty(asrVaultCreds.ResourceNamespace))
+            if (string.IsNullOrEmpty(arsVaultCreds.ResourceNamespace))
             {
                 if (appSettings.Settings.Count == 0)
                 {
@@ -100,7 +100,7 @@ public PSRecoveryServicesClient(IAzureProfile azureProfile)
                         : appSettings.Settings["ProviderNamespace"].Value;
                 }
 
-                Utilities.UpdateCurrentVaultContext(new ASRVaultCreds()
+                Utilities.UpdateCurrentVaultContext(new ARSVaultCreds()
                 {
                     ResourceNamespace = resourceNamespace,
                     ARMResourceType = resourceType
@@ -109,7 +109,7 @@ public PSRecoveryServicesClient(IAzureProfile azureProfile)
 
             this.recoveryServicesClient =
             AzureSession.ClientFactory.CreateCustomClient<RecoveryServicesManagementClient>(
-                asrVaultCreds.ResourceNamespace,
+                arsVaultCreds.ResourceNamespace,
                 AzureSession.AuthenticationFactory.GetSubscriptionCloudCredentials(azureProfile.Context),
                 azureProfile.Context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager));
         }

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesVaultExtendedInfoClient.cs

@@ -39,8 +39,8 @@ public async Task<ResourceExtendedInformation> GetExtendedInfo()
         {
             ResourceExtendedInformationResponse response =
                 await this.recoveryServicesClient.VaultExtendedInfo.GetExtendedInfoAsync(
-                asrVaultCreds.ResourceGroupName,
-                asrVaultCreds.ResourceName,
+                arsVaultCreds.ResourceGroupName,
+                arsVaultCreds.ResourceName,
                 this.GetRequestHeaders());
 
             return response.ResourceExtendedInformation;
@@ -54,8 +54,8 @@ await this.recoveryServicesClient.VaultExtendedInfo.GetExtendedInfoAsync(
         public AzureOperationResponse CreateExtendedInfo(ResourceExtendedInformationArgs extendedInfoArgs)
         {
             return this.recoveryServicesClient.VaultExtendedInfo.CreateExtendedInfo(
-                asrVaultCreds.ResourceGroupName,
-                asrVaultCreds.ResourceName,
+                arsVaultCreds.ResourceGroupName,
+                arsVaultCreds.ResourceName,
                 extendedInfoArgs,
                 this.GetRequestHeaders());
         }
@@ -68,8 +68,8 @@ public AzureOperationResponse CreateExtendedInfo(ResourceExtendedInformationArgs
         public async Task<UploadCertificateResponse> UpdateVaultCertificate(CertificateArgs args, string certFriendlyName)
         {
             return await this.recoveryServicesClient.VaultExtendedInfo.UploadCertificateAsync(
-                asrVaultCreds.ResourceGroupName, 
-                asrVaultCreds.ResourceName,
+                arsVaultCreds.ResourceGroupName, 
+                arsVaultCreds.ResourceName,
                 args, certFriendlyName, 
                 this.GetRequestHeaders());
         }
@@ -80,15 +80,15 @@ public async Task<UploadCertificateResponse> UpdateVaultCertificate(CertificateA
         /// <param name="managementCert">certificate to be uploaded</param>
         /// <param name="vault">vault object</param>
         /// <returns>credential object</returns>
-        public ASRVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, ARSVault vault, ASRSite site)
+        public ARSVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, ARSVault vault, ASRSite site)
         {
-            ASRVaultCreds currentVaultContext = PSRecoveryServicesClient.asrVaultCreds;
+            ARSVaultCreds currentVaultContext = PSRecoveryServicesClient.arsVaultCreds;
 
             string resourceProviderNamespace = string.Empty;
             string resourceType = string.Empty;
             Utilities.GetResourceProviderNamespaceAndType(vault.ID, out resourceProviderNamespace, out resourceType);
             // Update vault settings with the working vault to generate file
-            Utilities.UpdateCurrentVaultContext(new ASRVaultCreds()
+            Utilities.UpdateCurrentVaultContext(new ARSVaultCreds()
             {
                 ResourceGroupName = vault.ResouceGroupName,
                 ResourceName = vault.Name,
@@ -112,7 +112,7 @@ public ASRVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, AR
             acsDetails = uploadCertificate.Result;
             channelIntegrityKey = getChannelIntegrityKey.Result;
 
-            ASRVaultCreds asrVaultCreds = this.GenerateCredentialObject(
+            ARSVaultCreds arsVaultCreds = this.GenerateCredentialObject(
                                                 managementCert,
                                                 acsDetails,
                                                 channelIntegrityKey,
@@ -122,20 +122,20 @@ public ASRVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, AR
             // Update back the original vault settings
             Utilities.UpdateCurrentVaultContext(currentVaultContext);
 
-            return asrVaultCreds;
+            return arsVaultCreds;
         }
 
         /// <summary>
         /// Changes the Vault context
         /// </summary>
         /// <param name="vault">vault object</param>
         /// <returns>credential object</returns>
-        public ASRVaultCreds ChangeVaultContext(ARSVault vault)
+        public ARSVaultCreds ChangeVaultContext(ARSVault vault)
         {
             string resourceProviderNamespace = string.Empty;
             string resourceType = string.Empty;
             Utilities.GetResourceProviderNamespaceAndType(vault.ID, out resourceProviderNamespace, out resourceType);
-            Utilities.UpdateCurrentVaultContext(new ASRVaultCreds()
+            Utilities.UpdateCurrentVaultContext(new ARSVaultCreds()
             {
                 ResourceGroupName = vault.ResouceGroupName,
                 ResourceName = vault.Name,
@@ -148,7 +148,7 @@ public ASRVaultCreds ChangeVaultContext(ARSVault vault)
             getChannelIntegrityKey.Wait();
 
             // Update vault settings along with Channel integrity key
-            Utilities.UpdateCurrentVaultContext(new ASRVaultCreds()
+            Utilities.UpdateCurrentVaultContext(new ARSVaultCreds()
             {
                 ResourceGroupName = vault.ResouceGroupName,
                 ResourceName = vault.Name,
@@ -157,7 +157,7 @@ public ASRVaultCreds ChangeVaultContext(ARSVault vault)
                 ARMResourceType = resourceType
             });
 
-            return asrVaultCreds;
+            return arsVaultCreds;
         }
 
         /// <summary>
@@ -253,7 +253,7 @@ private ResourceExtendedInformation CreateVaultExtendedInformation()
         /// <param name="vault">vault object</param>
         /// <param name="site">site object</param>
         /// <returns>vault credential object</returns>
-        private ASRVaultCreds GenerateCredentialObject(X509Certificate2 managementCert, UploadCertificateResponse acsDetails, string channelIntegrityKey, ARSVault vault, ASRSite site)
+        private ARSVaultCreds GenerateCredentialObject(X509Certificate2 managementCert, UploadCertificateResponse acsDetails, string channelIntegrityKey, ARSVault vault, ASRSite site)
         {
             string serializedCertifivate = Convert.ToBase64String(managementCert.Export(X509ContentType.Pfx));
 
@@ -262,7 +262,7 @@ private ASRVaultCreds GenerateCredentialObject(X509Certificate2 managementCert,
             string resourceProviderNamespace = string.Empty;
             string resourceType = string.Empty;
             Utilities.GetResourceProviderNamespaceAndType(vault.ID, out resourceProviderNamespace, out resourceType);
-            ASRVaultCreds vaultCreds = new ASRVaultCreds(
+            ARSVaultCreds vaultCreds = new ARSVaultCreds(
                                             vault.SubscriptionId,
                                             vault.Name,
                                             serializedCertifivate,

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSContracts.cs

@@ -190,54 +190,6 @@ public class ARMExceptionDetails
         public string Target { get; private set; }
     }
 
-    /// <summary>
-    /// Error contract returned when some exception occurs in ASR REST API.
-    /// </summary>
-    [SuppressMessage(
-        "Microsoft.StyleCop.CSharp.MaintainabilityRules",
-        "SA1402:FileMayOnlyContainASingleClass",
-        Justification = "Keeping all contracts together.")]
-    [DataContract(Namespace = "http://schemas.microsoft.com/windowsazure")]
-    public class Error
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Error" /> class.
-        /// </summary>
-        public Error()
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets error code.
-        /// </summary>
-        [DataMember]
-        public string Code { get; set; }
-
-        /// <summary>
-        /// Gets or sets error message.
-        /// </summary>
-        [DataMember]
-        public string Message { get; set; }
-
-        /// <summary>
-        /// Gets or sets possible causes of error.
-        /// </summary>
-        [DataMember]
-        public string PossibleCauses { get; set; }
-
-        /// <summary>
-        /// Gets or sets recommended action to resolve error.
-        /// </summary>
-        [DataMember]
-        public string RecommendedAction { get; set; }
-
-        /// <summary>
-        /// Gets or sets client request Id.
-        /// </summary>
-        [DataMember(Name = "ActivityId")]
-        public string ClientRequestId { get; set; }
-    }
-
     /// <summary>
     /// CIK token details.
     /// </summary>
@@ -361,7 +313,7 @@ public VaultCreds()
         public VaultCreds(string subscriptionId, string resourceName, string managementCert, AcsNamespace acsNamespace)
         {
             this.SubscriptionId = subscriptionId;
-            this.ResourceType = Constants.ASRVaultType;
+            this.ResourceType = Constants.VaultType;
             this.ResourceName = resourceName;
             this.ManagementCert = managementCert;
             this.AcsNamespace = acsNamespace;
@@ -404,25 +356,25 @@ public VaultCreds(string subscriptionId, string resourceName, string managementC
     }
 
     /// <summary>
-    /// Class to define ASR Vault credentials
+    /// Class to define ARS Vault credentials
     /// </summary>
     [SuppressMessage(
         "Microsoft.StyleCop.CSharp.MaintainabilityRules",
         "SA1402:FileMayOnlyContainASingleClass",
         Justification = "Keeping all contracts together.")]
-    public class ASRVaultCreds : VaultCreds
+    public class ARSVaultCreds : VaultCreds
     {
         #region Constructores
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ASRVaultCreds"/> class.
+        /// Initializes a new instance of the <see cref="ARSVaultCreds"/> class.
         /// </summary>
-        public ASRVaultCreds()
+        public ARSVaultCreds()
         {
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ASRVaultCreds"/> class.
+        /// Initializes a new instance of the <see cref="ARSVaultCreds"/> class.
         /// </summary>
         /// <param name="subscriptionId">subscription Id</param>
         /// <param name="resourceName">resource name</param>
@@ -432,7 +384,7 @@ public ASRVaultCreds()
         /// <param name="resourceGroupName">cloud service name</param>
         /// <param name="siteId">custom site Id</param>
         /// <param name="siteName">custom site name</param>
-        public ASRVaultCreds(
+        public ARSVaultCreds(
             string subscriptionId,
             string resourceName,
             string managementCert,

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSObjects.cs

@@ -22,9 +22,9 @@ namespace Microsoft.Azure.Commands.RecoveryServices
     public class Constants
     {
         /// <summary>
-        /// ASR vault type
+        /// Vault type
         /// </summary>
-        public const string ASRVaultType = "HyperVRecoveryManagerVault";
+        public const string VaultType = "HyperVRecoveryManagerVault";
 
         /// <summary>
         /// Vault Credential version.
@@ -68,7 +68,7 @@ public ARSVault(Vault vault)
             this.Location = vault.Location;
             this.ResouceGroupName = PSRecoveryServicesClient.GetResourceGroup(vault.Id);
             this.SubscriptionId = PSRecoveryServicesClient.GetSubscriptionId(vault.Id);
-            this.Properties = new ASRVaultProperties();
+            this.Properties = new ARSVaultProperties();
             this.Properties.ProvisioningState = vault.Properties.ProvisioningState;
         }
 
@@ -84,7 +84,7 @@ public ARSVault(VaultCreateResponse vault)
             this.Location = vault.Location;
             this.ResouceGroupName = PSRecoveryServicesClient.GetResourceGroup(vault.Id);
             this.SubscriptionId = PSRecoveryServicesClient.GetSubscriptionId(vault.Id);
-            this.Properties = new ASRVaultProperties();
+            this.Properties = new ARSVaultProperties();
             this.Properties.ProvisioningState = vault.Properties.ProvisioningState;
         }
 
@@ -124,15 +124,15 @@ public ARSVault(VaultCreateResponse vault)
         /// <summary>
         /// Gets or sets Properties.
         /// </summary>
-        public ASRVaultProperties Properties { get; set; }
+        public ARSVaultProperties Properties { get; set; }
 
         #endregion
     }
 
     /// <summary>
     /// Azure Site Recovery Vault properties.
     /// </summary>
-    public class ASRVaultProperties
+    public class ARSVaultProperties
     {
         #region Properties
 

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSParameterSets.cs

@@ -9,7 +9,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices
    /// <summary>
     /// Parameter Sets used for Azure Site Recovery commands.
     /// </summary>
-    internal static class ASRParameterSets
+    internal static class ARSParameterSets
     {
         /// <summary>
         /// For default parameter set

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Utilities/Utilities.cs

@@ -102,22 +102,22 @@ public static string WriteToFile<T>(T fileContent, string filePath, string fileN
         /// <summary>
         /// Updates current Vault context.
         /// </summary>
-        /// <param name="asrVaultCreds">ASR Vault credentials</param>
-        public static void UpdateCurrentVaultContext(ASRVaultCreds asrVaultCreds)
+        /// <param name="arsVaultCreds">ARS Vault credentials</param>
+        public static void UpdateCurrentVaultContext(ARSVaultCreds arsVaultCreds)
         {
             object updateVaultContextOneAtATime = new object();
             lock (updateVaultContextOneAtATime)
             {
-                PSRecoveryServicesClient.asrVaultCreds.ResourceName =
-                    asrVaultCreds.ResourceName;
-                PSRecoveryServicesClient.asrVaultCreds.ResourceGroupName =
-                    asrVaultCreds.ResourceGroupName;
-                PSRecoveryServicesClient.asrVaultCreds.ChannelIntegrityKey =
-                    asrVaultCreds.ChannelIntegrityKey;
-                PSRecoveryServicesClient.asrVaultCreds.ResourceNamespace =
-                    asrVaultCreds.ResourceNamespace;
-                PSRecoveryServicesClient.asrVaultCreds.ARMResourceType =
-                    asrVaultCreds.ARMResourceType;
+                PSRecoveryServicesClient.arsVaultCreds.ResourceName =
+                    arsVaultCreds.ResourceName;
+                PSRecoveryServicesClient.arsVaultCreds.ResourceGroupName =
+                    arsVaultCreds.ResourceGroupName;
+                PSRecoveryServicesClient.arsVaultCreds.ChannelIntegrityKey =
+                    arsVaultCreds.ChannelIntegrityKey;
+                PSRecoveryServicesClient.arsVaultCreds.ResourceNamespace =
+                    arsVaultCreds.ResourceNamespace;
+                PSRecoveryServicesClient.arsVaultCreds.ARMResourceType =
+                    arsVaultCreds.ARMResourceType;
             }
         }