diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesClient.cs b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesClient.cs index ff3fe03ae1ec..e72201db40ce 100644 --- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesClient.cs +++ b/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(); /// /// 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( - asrVaultCreds.ResourceNamespace, + arsVaultCreds.ResourceNamespace, AzureSession.AuthenticationFactory.GetSubscriptionCloudCredentials(azureProfile.Context), azureProfile.Context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager)); } diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesVaultExtendedInfoClient.cs b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesVaultExtendedInfoClient.cs index 1020440f6548..d3a1d50bf63a 100644 --- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesVaultExtendedInfoClient.cs +++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesVaultExtendedInfoClient.cs @@ -39,8 +39,8 @@ public async Task 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 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 UpdateVaultCertificate(CertificateA /// certificate to be uploaded /// vault object /// credential object - 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,7 +122,7 @@ public ASRVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, AR // Update back the original vault settings Utilities.UpdateCurrentVaultContext(currentVaultContext); - return asrVaultCreds; + return arsVaultCreds; } /// @@ -130,12 +130,12 @@ public ASRVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, AR /// /// vault object /// credential object - 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; } /// @@ -253,7 +253,7 @@ private ResourceExtendedInformation CreateVaultExtendedInformation() /// vault object /// site object /// vault credential object - 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, diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSContracts.cs b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSContracts.cs index dacd4704d87e..42376a10c813 100644 --- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSContracts.cs +++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSContracts.cs @@ -190,54 +190,6 @@ public class ARMExceptionDetails public string Target { get; private set; } } - /// - /// Error contract returned when some exception occurs in ASR REST API. - /// - [SuppressMessage( - "Microsoft.StyleCop.CSharp.MaintainabilityRules", - "SA1402:FileMayOnlyContainASingleClass", - Justification = "Keeping all contracts together.")] - [DataContract(Namespace = "http://schemas.microsoft.com/windowsazure")] - public class Error - { - /// - /// Initializes a new instance of the class. - /// - public Error() - { - } - - /// - /// Gets or sets error code. - /// - [DataMember] - public string Code { get; set; } - - /// - /// Gets or sets error message. - /// - [DataMember] - public string Message { get; set; } - - /// - /// Gets or sets possible causes of error. - /// - [DataMember] - public string PossibleCauses { get; set; } - - /// - /// Gets or sets recommended action to resolve error. - /// - [DataMember] - public string RecommendedAction { get; set; } - - /// - /// Gets or sets client request Id. - /// - [DataMember(Name = "ActivityId")] - public string ClientRequestId { get; set; } - } - /// /// CIK token details. /// @@ -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 } /// - /// Class to define ASR Vault credentials + /// Class to define ARS Vault credentials /// [SuppressMessage( "Microsoft.StyleCop.CSharp.MaintainabilityRules", "SA1402:FileMayOnlyContainASingleClass", Justification = "Keeping all contracts together.")] - public class ASRVaultCreds : VaultCreds + public class ARSVaultCreds : VaultCreds { #region Constructores /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public ASRVaultCreds() + public ARSVaultCreds() { } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// subscription Id /// resource name @@ -432,7 +384,7 @@ public ASRVaultCreds() /// cloud service name /// custom site Id /// custom site name - public ASRVaultCreds( + public ARSVaultCreds( string subscriptionId, string resourceName, string managementCert, diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSObjects.cs b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSObjects.cs index d9e62e254fd9..66b3d52b51df 100644 --- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSObjects.cs +++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSObjects.cs @@ -22,9 +22,9 @@ namespace Microsoft.Azure.Commands.RecoveryServices public class Constants { /// - /// ASR vault type + /// Vault type /// - public const string ASRVaultType = "HyperVRecoveryManagerVault"; + public const string VaultType = "HyperVRecoveryManagerVault"; /// /// 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,7 +124,7 @@ public ARSVault(VaultCreateResponse vault) /// /// Gets or sets Properties. /// - public ASRVaultProperties Properties { get; set; } + public ARSVaultProperties Properties { get; set; } #endregion } @@ -132,7 +132,7 @@ public ARSVault(VaultCreateResponse vault) /// /// Azure Site Recovery Vault properties. /// - public class ASRVaultProperties + public class ARSVaultProperties { #region Properties diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSParameterSets.cs b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSParameterSets.cs index d5b944397291..e1cdaabab6c8 100644 --- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSParameterSets.cs +++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSParameterSets.cs @@ -9,7 +9,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices /// /// Parameter Sets used for Azure Site Recovery commands. /// - internal static class ASRParameterSets + internal static class ARSParameterSets { /// /// For default parameter set diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Utilities/Utilities.cs b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Utilities/Utilities.cs index ecdaffeb3c24..5a78f03c45c3 100644 --- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Utilities/Utilities.cs +++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Utilities/Utilities.cs @@ -102,22 +102,22 @@ public static string WriteToFile(T fileContent, string filePath, string fileN /// /// Updates current Vault context. /// - /// ASR Vault credentials - public static void UpdateCurrentVaultContext(ASRVaultCreds asrVaultCreds) + /// ARS Vault credentials + 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; } } diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Vault/GetAzureRMRecoveryServicesVaultSettingsFile.cs b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Vault/GetAzureRMRecoveryServicesVaultSettingsFile.cs index 2c952368f686..6fc228227359 100644 --- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Vault/GetAzureRMRecoveryServicesVaultSettingsFile.cs +++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Vault/GetAzureRMRecoveryServicesVaultSettingsFile.cs @@ -38,22 +38,22 @@ public class GetAzureRmRecoveryServicesVaultSettingsFile : RecoveryServicesCmdle /// /// Gets or sets vault Object. /// - [Parameter(ParameterSetName = ASRParameterSets.ByDefault, Mandatory = true, ValueFromPipeline = true)] - [Parameter(ParameterSetName = ASRParameterSets.ForSite, Mandatory = true, ValueFromPipeline = true)] + [Parameter(ParameterSetName = ARSParameterSets.ByDefault, Mandatory = true, ValueFromPipeline = true)] + [Parameter(ParameterSetName = ARSParameterSets.ForSite, Mandatory = true, ValueFromPipeline = true)] [ValidateNotNullOrEmpty] public ARSVault Vault { get; set; } /// /// Gets or sets Site Identifier. /// - [Parameter(ParameterSetName = ASRParameterSets.ForSite, Mandatory = true)] + [Parameter(ParameterSetName = ARSParameterSets.ForSite, Mandatory = true)] [ValidateNotNullOrEmpty] public String SiteIdentifier { get; set; } /// /// Gets or sets SiteFriendlyName. /// - [Parameter(ParameterSetName = ASRParameterSets.ForSite, Mandatory = true)] + [Parameter(ParameterSetName = ARSParameterSets.ForSite, Mandatory = true)] [ValidateNotNullOrEmpty] public String SiteFriendlyName { get; set; } @@ -63,8 +63,8 @@ public class GetAzureRmRecoveryServicesVaultSettingsFile : RecoveryServicesCmdle /// /// Gets or sets vault Object. /// - [Parameter(ParameterSetName = ASRParameterSets.ByDefault)] - [Parameter(ParameterSetName = ASRParameterSets.ForSite)] + [Parameter(ParameterSetName = ARSParameterSets.ByDefault)] + [Parameter(ParameterSetName = ARSParameterSets.ForSite)] public string Path { get; set; } #endregion Parameters @@ -106,7 +106,7 @@ private void GetVaultSettingsFile() } // Generate file. - ASRVaultCreds vaultCreds = RecoveryServicesClient.GenerateVaultCredential( + ARSVaultCreds vaultCreds = RecoveryServicesClient.GenerateVaultCredential( cert, this.Vault, site); @@ -117,7 +117,7 @@ private void GetVaultSettingsFile() // write the content to a file. VaultSettingsFilePath output = new VaultSettingsFilePath() { - FilePath = Utilities.WriteToFile(vaultCreds, filePath, fileName) + FilePath = Utilities.WriteToFile(vaultCreds, filePath, fileName) }; // print the path to the user. diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/ScenarioTests/SiteRecoveryTestsBase.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/ScenarioTests/SiteRecoveryTestsBase.cs index a35a199af046..e3ac5696866f 100644 --- a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/ScenarioTests/SiteRecoveryTestsBase.cs +++ b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/ScenarioTests/SiteRecoveryTestsBase.cs @@ -20,7 +20,7 @@ using Microsoft.Azure.Test.HttpRecorder; using Microsoft.Azure.Portal.RecoveryServices.Models.Common; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.Azure.Management.RecoveryServices; +using Microsoft.Azure.Management.SiteRecoveryVault; using Microsoft.Azure.Management.SiteRecovery; using Microsoft.Azure.Test; using Microsoft.Azure.Common.Authentication; @@ -39,7 +39,7 @@ public abstract class SiteRecoveryTestsBase : RMTestBase private ASRVaultCreds asrVaultCreds = null; public SiteRecoveryManagementClient SiteRecoveryMgmtClient { get; private set; } - public RecoveryServicesManagementClient RecoveryServicesMgmtClient { get; private set; } + public SiteRecoveryVaultManagementClient RecoveryServicesMgmtClient { get; private set; } protected SiteRecoveryTestsBase() { @@ -81,7 +81,7 @@ protected SiteRecoveryTestsBase() protected void SetupManagementClients() { - RecoveryServicesMgmtClient = GetRecoveryServicesManagementClient(); + RecoveryServicesMgmtClient = GetSiteRecoveryVaultManagementClient(); SiteRecoveryMgmtClient = GetSiteRecoveryManagementClient(); helper.SetupManagementClients(RecoveryServicesMgmtClient, SiteRecoveryMgmtClient); @@ -106,9 +106,9 @@ protected void RunPowerShellTest(params string[] scripts) } } - private RecoveryServicesManagementClient GetRecoveryServicesManagementClient() + private SiteRecoveryVaultManagementClient GetSiteRecoveryVaultManagementClient() { - return GetServiceClient(); + return GetServiceClient(); } private SiteRecoveryManagementClient GetSiteRecoveryManagementClient() @@ -123,13 +123,13 @@ public T GetServiceClient() where T : class ServicePointManager.ServerCertificateValidationCallback = IgnoreCertificateErrorHandler; - if (typeof(T) == typeof(RecoveryServicesManagementClient)) + if (typeof(T) == typeof(SiteRecoveryVaultManagementClient)) { - RecoveryServicesManagementClient client; + SiteRecoveryVaultManagementClient client; if (testEnvironment.UsesCustomUri()) { - client = new RecoveryServicesManagementClient( + client = new SiteRecoveryVaultManagementClient( "Microsoft.RecoveryServicesBVTD2", "vaults", testEnvironment.Credentials as SubscriptionCloudCredentials, @@ -137,7 +137,7 @@ public T GetServiceClient() where T : class } else { - client = new RecoveryServicesManagementClient( + client = new SiteRecoveryVaultManagementClient( "Microsoft.RecoveryServicesBVTD2", "vaults", testEnvironment.Credentials as SubscriptionCloudCredentials); @@ -174,7 +174,7 @@ public T GetServiceClient() where T : class } - public static T GetRSMServiceClient(TestEnvironmentFactory factory, RecoveryServicesManagementClient client) where T : class + public static T GetRSMServiceClient(TestEnvironmentFactory factory, SiteRecoveryVaultManagementClient client) where T : class { TestEnvironment testEnvironment = factory.GetTestEnvironment(); diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryClient.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryClient.cs index d6519926b927..4150fccf977d 100644 --- a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryClient.cs +++ b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryClient.cs @@ -25,8 +25,8 @@ using System.Xml; using Microsoft.Azure.Common.Authentication; using Microsoft.Azure.Common.Authentication.Models; -using Microsoft.Azure.Management.RecoveryServices; -using Microsoft.Azure.Management.RecoveryServices.Models; +using Microsoft.Azure.Management.SiteRecoveryVault; +using Microsoft.Azure.Management.SiteRecoveryVault.Models; using Microsoft.Azure.Management.SiteRecovery; using Microsoft.Azure.Management.SiteRecovery.Models; using Microsoft.Azure.Portal.RecoveryServices.Models.Common; @@ -52,7 +52,7 @@ public partial class PSRecoveryServicesClient /// /// Gets the value of recovery services management client. /// - public RecoveryServicesManagementClient GetRecoveryServicesClient + public SiteRecoveryVaultManagementClient GetRecoveryServicesClient { get { @@ -79,7 +79,7 @@ public RecoveryServicesManagementClient GetRecoveryServicesClient /// /// Recovery Services client. /// - private RecoveryServicesManagementClient recoveryServicesClient; + private SiteRecoveryVaultManagementClient recoveryServicesClient; /// /// End point Uri @@ -163,7 +163,7 @@ public PSRecoveryServicesClient(IAzureProfile azureProfile) cloudCredentials = AzureSession.AuthenticationFactory.GetSubscriptionCloudCredentials(azureProfile.Context); this.recoveryServicesClient = - AzureSession.ClientFactory.CreateCustomClient( + AzureSession.ClientFactory.CreateCustomClient( asrVaultCreds.ResourceNamespace, asrVaultCreds.ARMResourceType, cloudCredentials, diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryVaultClient.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryVaultClient.cs index 724d474d0d05..fba9febf6fd2 100644 --- a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryVaultClient.cs +++ b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryVaultClient.cs @@ -13,8 +13,8 @@ // ---------------------------------------------------------------------------------- using System.Threading.Tasks; -using Microsoft.Azure.Management.RecoveryServices; -using Microsoft.Azure.Management.RecoveryServices.Models; +using Microsoft.Azure.Management.SiteRecoveryVault; +using Microsoft.Azure.Management.SiteRecoveryVault.Models; namespace Microsoft.Azure.Commands.SiteRecovery { diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryVaultExtendedInfoClient.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryVaultExtendedInfoClient.cs index 6e15a1fcffe0..7251d1c31b8d 100644 --- a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryVaultExtendedInfoClient.cs +++ b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryVaultExtendedInfoClient.cs @@ -19,8 +19,8 @@ using System.Web.Script.Serialization; using Hyak.Common; using Microsoft.Azure.Commands.SiteRecovery.Properties; -using Microsoft.Azure.Management.RecoveryServices; -using Microsoft.Azure.Management.RecoveryServices.Models; +using Microsoft.Azure.Management.SiteRecoveryVault; +using Microsoft.Azure.Management.SiteRecoveryVault.Models; using Microsoft.Azure.Management.SiteRecovery; using Microsoft.Azure.Management.SiteRecovery.Models; using Microsoft.Azure.Portal.HybridServicesCore; diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/SiteRecoveryCmdletBase.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/SiteRecoveryCmdletBase.cs index f061599f5620..42a705dc2b7e 100644 --- a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/SiteRecoveryCmdletBase.cs +++ b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/SiteRecoveryCmdletBase.cs @@ -19,8 +19,8 @@ using System.Xml; using Hyak.Common; using Microsoft.Azure.Commands.ResourceManager.Common; -using Microsoft.Azure.Management.RecoveryServices; -using Microsoft.Azure.Management.RecoveryServices.Models; +using Microsoft.Azure.Management.SiteRecoveryVault; +using Microsoft.Azure.Management.SiteRecoveryVault.Models; using Microsoft.Azure.Management.SiteRecovery; using Microsoft.Azure.Management.SiteRecovery.Models; using Microsoft.WindowsAzure.Commands.Utilities.Common; diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Models/PSObjects.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Models/PSObjects.cs index c39a2740d0cd..54cda0343fc8 100644 --- a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Models/PSObjects.cs +++ b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Models/PSObjects.cs @@ -17,7 +17,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Runtime.Serialization; -using Microsoft.Azure.Management.RecoveryServices.Models; +using Microsoft.Azure.Management.SiteRecoveryVault.Models; using Microsoft.Azure.Management.SiteRecovery.Models; using Microsoft.Azure.Portal.RecoveryServices.Models.Common; using System.Web.Script.Serialization; diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/GetAzureSiteRecoveryVault.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/GetAzureSiteRecoveryVault.cs index 8712b1251a4a..3b1148c3d5ad 100644 --- a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/GetAzureSiteRecoveryVault.cs +++ b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/GetAzureSiteRecoveryVault.cs @@ -16,7 +16,7 @@ using System.Collections.Generic; using System.Linq; using System.Management.Automation; -using Microsoft.Azure.Management.RecoveryServices.Models; +using Microsoft.Azure.Management.SiteRecoveryVault.Models; namespace Microsoft.Azure.Commands.SiteRecovery { diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/NewAzureSiteRecoveryVault.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/NewAzureSiteRecoveryVault.cs index 924c652509ca..cdca55ac4012 100644 --- a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/NewAzureSiteRecoveryVault.cs +++ b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/NewAzureSiteRecoveryVault.cs @@ -16,7 +16,7 @@ using System.Management.Automation; using System.Net; using Microsoft.Azure.Commands.SiteRecovery.Properties; -using Microsoft.Azure.Management.RecoveryServices.Models; +using Microsoft.Azure.Management.SiteRecoveryVault.Models; namespace Microsoft.Azure.Commands.SiteRecovery { diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/RemoveAzureSiteRecoveryVault.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/RemoveAzureSiteRecoveryVault.cs index c669b9932b2b..7805663b03bf 100644 --- a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/RemoveAzureSiteRecoveryVault.cs +++ b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/RemoveAzureSiteRecoveryVault.cs @@ -16,7 +16,7 @@ using System.Management.Automation; using System.Net; using Microsoft.Azure.Commands.SiteRecovery.Properties; -using Microsoft.Azure.Management.RecoveryServices.Models; +using Microsoft.Azure.Management.SiteRecoveryVault.Models; namespace Microsoft.Azure.Commands.SiteRecovery {