From 4cbf0fc7c8777f2ecec17afdb99d75de3a8081ce Mon Sep 17 00:00:00 2001 From: dragonfly91 Date: Wed, 27 Apr 2016 10:40:00 +0530 Subject: [PATCH 01/12] Wxi file fix Removed AzureRM.RecoveryServices.psd1 from $(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup as only the module's psd file need to be here. --- setup/azurecmdfiles.wxi | 4 ---- 1 file changed, 4 deletions(-) diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index 9cc07e911733..08a8009a019f 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -2002,9 +2002,6 @@ - - - @@ -5717,7 +5714,6 @@ - From a1a399d4d94f1fc83200a80f560b453de47ef108 Mon Sep 17 00:00:00 2001 From: dragonfly91 Date: Wed, 27 Apr 2016 10:56:28 +0530 Subject: [PATCH 02/12] Removing Commands.RecoveryServices csproj reference from Cmdlets, Providers and Test projects as this is an unnecessary reference. --- .../Commands.RecoveryServices.Backup.Providers.csproj | 4 ---- .../Commands.RecoveryServices.Backup.Test.csproj | 4 ---- .../Commands.RecoveryServices.Backup.Cmdlets.csproj | 4 ---- 3 files changed, 12 deletions(-) diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj index 81a1e9a17e7c..a4ab177b7bae 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj @@ -71,10 +71,6 @@ {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - - {604260dc-b392-4cf4-81ec-34b14591e2d2} - Commands.RecoveryServices - {0e1d3f36-e6c8-4764-8c7d-6f9ee537490c} Commands.RecoveryServices.Backup.Helpers diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj index e9e17b77e65a..f0dd7639c2b7 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj @@ -211,10 +211,6 @@ {3436a126-edc9-4060-8952-9a1be34cdd95} Commands.ScenarioTests.ResourceManager.Common - - {604260dc-b392-4cf4-81ec-34b14591e2d2} - Commands.RecoveryServices - {30b92759-50b3-494e-b9f0-ec9a2ce9d57b} Commands.RecoveryServices.Backup.Models diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj index 2636fb7cde74..44964d6bf62b 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj @@ -124,10 +124,6 @@ {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - - {604260dc-b392-4cf4-81ec-34b14591e2d2} - Commands.RecoveryServices - {0e1d3f36-e6c8-4764-8c7d-6f9ee537490c} Commands.RecoveryServices.Backup.Helpers From 6c49d0dbfb7275bb3b0c22ee51482bfd9da9687e Mon Sep 17 00:00:00 2001 From: dragonfly91 Date: Wed, 27 Apr 2016 11:26:53 +0530 Subject: [PATCH 03/12] Moving cmdlet initialization from ExecuteCmdlet to BeginProcessing --- .../RecoveryServicesBackupCmdletBase.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs index 3b265794c826..36d725c42c9b 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs @@ -121,9 +121,9 @@ private void HandleException(Exception exception) } } - public override void ExecuteCmdlet() + protected override void BeginProcessing() { - base.ExecuteCmdlet(); + base.BeginProcessing(); InitializeAzureBackupCmdlet(); } From 9b6f12eafe0d649c96482d52f5f09f8577851dee Mon Sep 17 00:00:00 2001 From: dragonfly91 Date: Wed, 27 Apr 2016 12:34:58 +0530 Subject: [PATCH 04/12] Added null checks in handle created job method --- .../RecoveryServicesBackupCmdletBase.cs | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs index 36d725c42c9b..11c50a97cd45 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs @@ -152,7 +152,10 @@ public BackUpOperationStatusResponse WaitForOperationCompletionUsingStatusLink( // protected item and policy. BackUpOperationStatusResponse response = hydraFunc(statusUrlLink); - while (response.OperationStatus.Status == OperationStatusValues.InProgress.ToString()) + while ( + response != null && + response.OperationStatus != null && + response.OperationStatus.Status == OperationStatusValues.InProgress.ToString()) { WriteDebug("Tracking operation completion using status link: " + statusUrlLink); TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000); @@ -171,23 +174,27 @@ protected void HandleCreatedJob(BaseRecoveryServicesJobResponse itemResponse, st itemResponse.AzureAsyncOperation, HydraAdapter.GetProtectedItemOperationStatusByURL); - WriteDebug(Resources.FinalOperationStatus + response.OperationStatus.Status); - - if (response.OperationStatus.Properties != null && - ((OperationStatusJobExtendedInfo)response.OperationStatus.Properties).JobId != null) + if (response != null && response.OperationStatus != null) { - var jobStatusResponse = (OperationStatusJobExtendedInfo)response.OperationStatus.Properties; - WriteObject(GetJobObject(jobStatusResponse.JobId)); - } + WriteDebug(Resources.FinalOperationStatus + response.OperationStatus.Status); - if (response.OperationStatus.Status == OperationStatusValues.Failed) - { - var errorMessage = string.Format( - Resources.OperationFailed, - operationName, - response.OperationStatus.OperationStatusError.Code, - response.OperationStatus.OperationStatusError.Message); - throw new Exception(errorMessage); + if (response.OperationStatus.Properties != null && + ((OperationStatusJobExtendedInfo)response.OperationStatus.Properties).JobId != null) + { + var jobStatusResponse = (OperationStatusJobExtendedInfo)response.OperationStatus.Properties; + WriteObject(GetJobObject(jobStatusResponse.JobId)); + } + + if (response.OperationStatus.Status == OperationStatusValues.Failed && + response.OperationStatus.OperationStatusError != null) + { + var errorMessage = string.Format( + Resources.OperationFailed, + operationName, + response.OperationStatus.OperationStatusError.Code, + response.OperationStatus.OperationStatusError.Message); + throw new Exception(errorMessage); + } } } } From 199ef6356721e8ab622de223f25500abfe2c5ff4 Mon Sep 17 00:00:00 2001 From: dragonfly91 Date: Wed, 27 Apr 2016 13:16:23 +0530 Subject: [PATCH 05/12] Renamed all occurences of Hydra to ServiceClient --- ...nds.RecoveryServices.Backup.Helpers.csproj | 6 +- .../Conversions/ConversionHelpers.cs | 36 +-- .../Conversions/JobConversions.cs | 44 ++-- .../Conversions/RetentionPolicyConversions.cs | 242 +++++++++--------- .../Conversions/SchedulePolicyConversions.cs | 26 +- ...ydraHelpers.cs => ServiceClientHelpers.cs} | 28 +- .../Properties/Resources.Designer.cs | 8 +- .../Properties/Resources.resx | 4 +- ...s.RecoveryServices.Backup.Providers.csproj | 8 +- .../IPsBackupProvider.cs | 4 +- .../Providers/DpmPsBackupProvider.cs | 10 +- .../Providers/IaasVmPsBackupProvider.cs | 84 +++--- .../Providers/MabPsBackupProvider.cs | 10 +- .../PsBackupProviderManager.cs | 10 +- .../BMSAPIs/ContainerAPIs.cs | 4 +- .../BMSAPIs/ItemAPIs.cs | 4 +- .../BMSAPIs/JobAPIs.cs | 4 +- .../BMSAPIs/OperationStatusAPIs.cs | 4 +- .../BMSAPIs/PolicyAPIs.cs | 4 +- .../BMSAPIs/ProtectableItemAPI.cs | 6 +- .../BMSAPIs/RecoveryPointsAPIs.cs | 4 +- .../BMSAPIs/RestoreDiskAPIs.cs | 4 +- .../ClientProxy.cs | 2 +- .../ClientProxyBase.cs | 2 +- ...rvices.Backup.ServiceClientAdapter.csproj} | 10 +- .../CommonHelpers.cs | 2 +- .../Properties/AssemblyInfo.cs | 0 .../ServiceClientAdapter.cs} | 6 +- .../packages.config | 0 .../BackupAzureRmRecoveryServicesItem.cs | 2 +- ...tAzureRmRecoveryServicesBackupContainer.cs | 2 +- ...mRecoveryServicesBackupManagementServer.cs | 2 +- ...rAzureRmRecoveryServicesBackupContainer.cs | 2 +- ...mRecoveryServicesBackupManagementServer.cs | 2 +- ...isableAzureRmRecoveryServicesProtection.cs | 4 +- ...EnableAzureRmRecoveryServicesProtection.cs | 4 +- .../Item/GetAzureRmRecoveryServicesItem.cs | 2 +- .../Jobs/GetAzureRmRecoveryServicesJob.cs | 10 +- .../GetAzureRmRecoveryServicesJobDetails.cs | 2 +- .../Jobs/StopAzureRmRecoveryServicesJob.cs | 4 +- .../Jobs/WaitAzureRmRecoveryServicesJob.cs | 2 +- ...veryServicesBackupRetentionPolicyObject.cs | 2 +- .../GetAzureRmRecoveryServicesPolicy.cs | 18 +- ...eRmRecoveryServicesSchedulePolicyObject.cs | 2 +- .../NewAzureRmRecoveryServicesPolicy.cs | 12 +- .../ProtectionPolicy/PolicyCmdletHelpers.cs | 6 +- .../RemoveAzureRmRecoveryServicesPolicy.cs | 2 +- .../SetAzureRmRecoveryServicesPolicy.cs | 8 +- ...GetAzureRMRecoveryServicesRecoveryPoint.cs | 4 +- ...estoreAzureRMRecoveryServicesBackupItem.cs | 2 +- ...nds.RecoveryServices.Backup.Cmdlets.csproj | 8 +- .../RecoveryServicesBackupCmdletBase.cs | 16 +- .../RecoveryServices.Backup.sln | 12 +- 53 files changed, 352 insertions(+), 354 deletions(-) rename src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/{HydraHelpers.cs => ServiceClientHelpers.cs} (78%) rename src/ResourceManager/RecoveryServices.Backup/{Commands.RecoveryServices.Backup.HydraAdapter => Commands.RecoveryServices.Backup.ServiceClientAdapter}/BMSAPIs/ContainerAPIs.cs (98%) rename src/ResourceManager/RecoveryServices.Backup/{Commands.RecoveryServices.Backup.HydraAdapter => Commands.RecoveryServices.Backup.ServiceClientAdapter}/BMSAPIs/ItemAPIs.cs (98%) rename src/ResourceManager/RecoveryServices.Backup/{Commands.RecoveryServices.Backup.HydraAdapter => Commands.RecoveryServices.Backup.ServiceClientAdapter}/BMSAPIs/JobAPIs.cs (98%) rename src/ResourceManager/RecoveryServices.Backup/{Commands.RecoveryServices.Backup.HydraAdapter => Commands.RecoveryServices.Backup.ServiceClientAdapter}/BMSAPIs/OperationStatusAPIs.cs (96%) rename src/ResourceManager/RecoveryServices.Backup/{Commands.RecoveryServices.Backup.HydraAdapter => Commands.RecoveryServices.Backup.ServiceClientAdapter}/BMSAPIs/PolicyAPIs.cs (98%) rename src/ResourceManager/RecoveryServices.Backup/{Commands.RecoveryServices.Backup.HydraAdapter => Commands.RecoveryServices.Backup.ServiceClientAdapter}/BMSAPIs/ProtectableItemAPI.cs (94%) rename src/ResourceManager/RecoveryServices.Backup/{Commands.RecoveryServices.Backup.HydraAdapter => Commands.RecoveryServices.Backup.ServiceClientAdapter}/BMSAPIs/RecoveryPointsAPIs.cs (96%) rename src/ResourceManager/RecoveryServices.Backup/{Commands.RecoveryServices.Backup.HydraAdapter => Commands.RecoveryServices.Backup.ServiceClientAdapter}/BMSAPIs/RestoreDiskAPIs.cs (98%) rename src/ResourceManager/RecoveryServices.Backup/{Commands.RecoveryServices.Backup.HydraAdapter => Commands.RecoveryServices.Backup.ServiceClientAdapter}/ClientProxy.cs (98%) rename src/ResourceManager/RecoveryServices.Backup/{Commands.RecoveryServices.Backup.HydraAdapter => Commands.RecoveryServices.Backup.ServiceClientAdapter}/ClientProxyBase.cs (99%) rename src/ResourceManager/RecoveryServices.Backup/{Commands.RecoveryServices.Backup.HydraAdapter/Commands.RecoveryServices.Backup.HydraAdapter.csproj => Commands.RecoveryServices.Backup.ServiceClientAdapter/Commands.RecoveryServices.Backup.ServiceClientAdapter.csproj} (96%) rename src/ResourceManager/RecoveryServices.Backup/{Commands.RecoveryServices.Backup.HydraAdapter => Commands.RecoveryServices.Backup.ServiceClientAdapter}/CommonHelpers.cs (98%) rename src/ResourceManager/RecoveryServices.Backup/{Commands.RecoveryServices.Backup.HydraAdapter => Commands.RecoveryServices.Backup.ServiceClientAdapter}/Properties/AssemblyInfo.cs (100%) rename src/ResourceManager/RecoveryServices.Backup/{Commands.RecoveryServices.Backup.HydraAdapter/HydraAdapter.cs => Commands.RecoveryServices.Backup.ServiceClientAdapter/ServiceClientAdapter.cs} (94%) rename src/ResourceManager/RecoveryServices.Backup/{Commands.RecoveryServices.Backup.HydraAdapter => Commands.RecoveryServices.Backup.ServiceClientAdapter}/packages.config (100%) diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Commands.RecoveryServices.Backup.Helpers.csproj b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Commands.RecoveryServices.Backup.Helpers.csproj index b38be2e5f402..f6d7c5caedea 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Commands.RecoveryServices.Backup.Helpers.csproj +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Commands.RecoveryServices.Backup.Helpers.csproj @@ -57,7 +57,7 @@ - + @@ -65,10 +65,6 @@ {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common - - {b758fec1-35c1-4f93-a954-66dd33f6e0ec} - Commands.RecoveryServices.Backup.HydraAdapter - {5e675749-6139-464a-904c-59c0ffdfec82} Commands.RecoveryServices.Backup.Logger diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs index 74c582766393..99b455d81b1a 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs @@ -93,32 +93,32 @@ public static List GetBackupEngineModel #endregion #region policy - public static AzureRmRecoveryServicesBackupPolicyBase GetPolicyModel(ProtectionPolicyResource hydraResponse) + public static AzureRmRecoveryServicesBackupPolicyBase GetPolicyModel(ProtectionPolicyResource serviceClientResponse) { AzureRmRecoveryServicesBackupPolicyBase policyModel = null; - if (hydraResponse == null || hydraResponse.Properties == null) + if (serviceClientResponse == null || serviceClientResponse.Properties == null) { - Logger.Instance.WriteDebug("Policy Hydra response is Null/Empty"); - throw new ArgumentException(Resources.EmptyHydraResponseException); + Logger.Instance.WriteDebug("Policy Service Client response is Null/Empty"); + throw new ArgumentException(Resources.EmptyServiceClientResponseException); } - if (hydraResponse.Properties.GetType() == typeof(AzureIaaSVMProtectionPolicy)) + if (serviceClientResponse.Properties.GetType() == typeof(AzureIaaSVMProtectionPolicy)) { - if (((AzureIaaSVMProtectionPolicy)hydraResponse.Properties).RetentionPolicy.GetType() != + if (((AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).RetentionPolicy.GetType() != typeof(LongTermRetentionPolicy)) { Logger.Instance.WriteDebug("Unknown RetentionPolicy object received: " + - ((AzureIaaSVMProtectionPolicy)hydraResponse.Properties).RetentionPolicy.GetType()); + ((AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).RetentionPolicy.GetType()); Logger.Instance.WriteWarning(Resources.UpdateToNewAzurePowershellWarning); return null; } - if (((AzureIaaSVMProtectionPolicy)hydraResponse.Properties).SchedulePolicy.GetType() != + if (((AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).SchedulePolicy.GetType() != typeof(SimpleSchedulePolicy)) { Logger.Instance.WriteDebug("Unknown SchedulePolicy object received: " + - ((AzureIaaSVMProtectionPolicy)hydraResponse.Properties).SchedulePolicy.GetType()); + ((AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).SchedulePolicy.GetType()); Logger.Instance.WriteWarning(Resources.UpdateToNewAzurePowershellWarning); return null; } @@ -128,31 +128,31 @@ public static AzureRmRecoveryServicesBackupPolicyBase GetPolicyModel(ProtectionP iaasPolicyModel.WorkloadType = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureVM; iaasPolicyModel.BackupManagementType = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType.AzureVM; iaasPolicyModel.RetentionPolicy = PolicyHelpers.GetPSLongTermRetentionPolicy((LongTermRetentionPolicy) - ((AzureIaaSVMProtectionPolicy)hydraResponse.Properties).RetentionPolicy); + ((AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).RetentionPolicy); iaasPolicyModel.SchedulePolicy = PolicyHelpers.GetPSSimpleSchedulePolicy((SimpleSchedulePolicy) - ((AzureIaaSVMProtectionPolicy)hydraResponse.Properties).SchedulePolicy); + ((AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).SchedulePolicy); } else { // we will enter this case when service supports new workload and customer // still using old version of azure powershell. Trace warning message, ignore and return Logger.Instance.WriteDebug("Unknown Policy object received: " + - hydraResponse.Properties.GetType()); + serviceClientResponse.Properties.GetType()); Logger.Instance.WriteWarning(Resources.UpdateToNewAzurePowershellWarning); return null; } - policyModel.Name = hydraResponse.Name; - policyModel.Id = hydraResponse.Id; + policyModel.Name = serviceClientResponse.Name; + policyModel.Id = serviceClientResponse.Id; return policyModel; } public static List GetPolicyModelList( - ProtectionPolicyListResponse hydraListResponse) + ProtectionPolicyListResponse serviceClientListResponse) { - if (hydraListResponse == null || hydraListResponse.ItemList == null || - hydraListResponse.ItemList.Value == null || hydraListResponse.ItemList.Value.Count == 0) + if (serviceClientListResponse == null || serviceClientListResponse.ItemList == null || + serviceClientListResponse.ItemList.Value == null || serviceClientListResponse.ItemList.Value.Count == 0) { Logger.Instance.WriteDebug("Received empty list of policies from service"); return null; @@ -161,7 +161,7 @@ public static List GetPolicyModelList( List policyModels = new List(); AzureRmRecoveryServicesBackupPolicyBase policyModel = null; - foreach (ProtectionPolicyResource resource in hydraListResponse.ItemList.Value) + foreach (ProtectionPolicyResource resource in serviceClientListResponse.ItemList.Value) { policyModel = GetPolicyModel(resource); if (policyModel != null) diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/JobConversions.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/JobConversions.cs index 97ce98f5bccb..1c800c40c8af 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/JobConversions.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/JobConversions.cs @@ -22,43 +22,43 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers { public class JobConversions { - #region Hydra to PS convertors + #region ServiceClient to PS convertors /// /// This function returns either job object or job details object based on - /// what hydra object contains. - /// To elaborate, if hydra job's ExtendedInfo is filled then this function will + /// what ServiceClient object contains. + /// To elaborate, if ServiceClient job's ExtendedInfo is filled then this function will /// return a job details object. Otherwise it will return a job object. /// - /// + /// /// - public static CmdletModel.AzureRmRecoveryServicesBackupJobBase GetPSJob(JobResponse hydraJob) + public static CmdletModel.AzureRmRecoveryServicesBackupJobBase GetPSJob(JobResponse serviceClientJob) { - return GetPSJob(hydraJob.Item); + return GetPSJob(serviceClientJob.Item); } - public static CmdletModel.AzureRmRecoveryServicesBackupJobBase GetPSJob(JobResource hydraJob) + public static CmdletModel.AzureRmRecoveryServicesBackupJobBase GetPSJob(JobResource serviceClientJob) { CmdletModel.AzureRmRecoveryServicesBackupJobBase response = null; - // hydra doesn't initialize Properties if the type of job is not known to current version of hydra. - if (hydraJob.Properties == null) + // ServiceClient doesn't initialize Properties if the type of job is not known to current version of ServiceClient. + if (serviceClientJob.Properties == null) { Logger.Instance.WriteWarning(Resources.UnsupportedJobWarning); } - else if (hydraJob.Properties.GetType() == typeof(AzureIaaSVMJob)) + else if (serviceClientJob.Properties.GetType() == typeof(AzureIaaSVMJob)) { - response = GetPSAzureVmJob(hydraJob); + response = GetPSAzureVmJob(serviceClientJob); } return response; } - public static void AddHydraJobsToPSList(JobListResponse hydraJobs, List psJobs, ref int jobsCount) + public static void AddServiceClientJobsToPSList(JobListResponse serviceClientJobs, List psJobs, ref int jobsCount) { - if (hydraJobs.ItemList != null && hydraJobs.ItemList.Value != null) + if (serviceClientJobs.ItemList != null && serviceClientJobs.ItemList.Value != null) { - foreach (var job in hydraJobs.ItemList.Value) + foreach (var job in serviceClientJobs.ItemList.Value) { CmdletModel.AzureRmRecoveryServicesBackupJobBase convertedJob = GetPSJob(job); if (convertedJob != null) @@ -72,11 +72,11 @@ public static void AddHydraJobsToPSList(JobListResponse hydraJobs, List(); - psErrorInfo.Recommendations.AddRange(hydraError.Recommendations); + psErrorInfo.Recommendations.AddRange(serviceClientError.Recommendations); } return psErrorInfo; diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/RetentionPolicyConversions.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/RetentionPolicyConversions.cs index 19daca50d062..59cfd8d26f85 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/RetentionPolicyConversions.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/RetentionPolicyConversions.cs @@ -18,48 +18,48 @@ using System.Threading.Tasks; using System.Collections.Generic; using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models; -using HydraModels = Microsoft.Azure.Management.RecoveryServices.Backup.Models; +using ServiceClientModels = Microsoft.Azure.Management.RecoveryServices.Backup.Models; using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties; namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers { public partial class PolicyHelpers { - #region HydraToPSObject conversions + #region ServiceClientToPSObject conversions #region public public static AzureRmRecoveryServicesBackupLongTermRetentionPolicy GetPSLongTermRetentionPolicy( - HydraModels.LongTermRetentionPolicy hydraRetPolicy) + ServiceClientModels.LongTermRetentionPolicy serviceClientRetPolicy) { - if(hydraRetPolicy == null) + if(serviceClientRetPolicy == null) { return null; } AzureRmRecoveryServicesBackupLongTermRetentionPolicy ltrPolicy = new AzureRmRecoveryServicesBackupLongTermRetentionPolicy(); - if(hydraRetPolicy.DailySchedule != null) + if(serviceClientRetPolicy.DailySchedule != null) { ltrPolicy.IsDailyScheduleEnabled = true; - ltrPolicy.DailySchedule = GetPSLTRDailySchedule(hydraRetPolicy.DailySchedule); + ltrPolicy.DailySchedule = GetPSLTRDailySchedule(serviceClientRetPolicy.DailySchedule); } - if (hydraRetPolicy.WeeklySchedule != null) + if (serviceClientRetPolicy.WeeklySchedule != null) { ltrPolicy.IsWeeklyScheduleEnabled = true; - ltrPolicy.WeeklySchedule = GetPSLTRWeeklySchedule(hydraRetPolicy.WeeklySchedule); + ltrPolicy.WeeklySchedule = GetPSLTRWeeklySchedule(serviceClientRetPolicy.WeeklySchedule); } - if (hydraRetPolicy.MonthlySchedule != null) + if (serviceClientRetPolicy.MonthlySchedule != null) { ltrPolicy.IsMonthlyScheduleEnabled = true; - ltrPolicy.MonthlySchedule = GetPSLTRMonthlySchedule(hydraRetPolicy.MonthlySchedule); + ltrPolicy.MonthlySchedule = GetPSLTRMonthlySchedule(serviceClientRetPolicy.MonthlySchedule); } - if (hydraRetPolicy.YearlySchedule != null) + if (serviceClientRetPolicy.YearlySchedule != null) { ltrPolicy.IsYearlyScheduleEnabled = true; - ltrPolicy.YearlySchedule = GetPSLTRYearlySchedule(hydraRetPolicy.YearlySchedule); + ltrPolicy.YearlySchedule = GetPSLTRYearlySchedule(serviceClientRetPolicy.YearlySchedule); } // safe side validate @@ -69,7 +69,7 @@ public static AzureRmRecoveryServicesBackupLongTermRetentionPolicy GetPSLongTerm } public static AzureRmRecoveryServicesBackupLongTermRetentionPolicy GetPSSimpleRetentionPolicy( - HydraModels.SimpleRetentionPolicy hydraRetPolicy) + ServiceClientModels.SimpleRetentionPolicy serviceClientRetPolicy) { throw new NotSupportedException(); } @@ -78,25 +78,25 @@ public static AzureRmRecoveryServicesBackupLongTermRetentionPolicy GetPSSimpleRe #region private - private static int GetRetentionDurationInDays(HydraModels.RetentionDuration retentionDuration) + private static int GetRetentionDurationInDays(ServiceClientModels.RetentionDuration retentionDuration) { int daysCount = 0; switch (retentionDuration.DurationType) { - case HydraModels.RetentionDurationType.Days: + case ServiceClientModels.RetentionDurationType.Days: daysCount = retentionDuration.Count; break; - case HydraModels.RetentionDurationType.Weeks: + case ServiceClientModels.RetentionDurationType.Weeks: daysCount = retentionDuration.Count * PolicyConstants.NumOfDaysInWeek; break; - case HydraModels.RetentionDurationType.Months: + case ServiceClientModels.RetentionDurationType.Months: daysCount = retentionDuration.Count * PolicyConstants.NumOfDaysInMonth; break; - case HydraModels.RetentionDurationType.Years: + case ServiceClientModels.RetentionDurationType.Years: daysCount = retentionDuration.Count * PolicyConstants.NumOfDaysInYear; break; @@ -108,25 +108,25 @@ private static int GetRetentionDurationInDays(HydraModels.RetentionDuration rete return daysCount; } - private static int GetRetentionDurationInWeeks(HydraModels.RetentionDuration retentionDuration) + private static int GetRetentionDurationInWeeks(ServiceClientModels.RetentionDuration retentionDuration) { int weeksCount = 0; switch (retentionDuration.DurationType) { - case HydraModels.RetentionDurationType.Days: + case ServiceClientModels.RetentionDurationType.Days: weeksCount = retentionDuration.Count / PolicyConstants.NumOfDaysInWeek; break; - case HydraModels.RetentionDurationType.Weeks: + case ServiceClientModels.RetentionDurationType.Weeks: weeksCount = retentionDuration.Count; break; - case HydraModels.RetentionDurationType.Months: + case ServiceClientModels.RetentionDurationType.Months: weeksCount = retentionDuration.Count * PolicyConstants.NumOfWeeksInMonth; break; - case HydraModels.RetentionDurationType.Years: + case ServiceClientModels.RetentionDurationType.Years: weeksCount = retentionDuration.Count * PolicyConstants.NumOfWeeksInYear; break; @@ -138,25 +138,25 @@ private static int GetRetentionDurationInWeeks(HydraModels.RetentionDuration ret return weeksCount; } - private static int GetRetentionDurationInMonths(HydraModels.RetentionDuration retentionDuration) + private static int GetRetentionDurationInMonths(ServiceClientModels.RetentionDuration retentionDuration) { int monthsCount = 0; switch (retentionDuration.DurationType) { - case HydraModels.RetentionDurationType.Days: + case ServiceClientModels.RetentionDurationType.Days: monthsCount = retentionDuration.Count / PolicyConstants.NumOfDaysInMonth; break; - case HydraModels.RetentionDurationType.Weeks: + case ServiceClientModels.RetentionDurationType.Weeks: monthsCount = retentionDuration.Count / PolicyConstants.NumOfWeeksInMonth; break; - case HydraModels.RetentionDurationType.Months: + case ServiceClientModels.RetentionDurationType.Months: monthsCount = retentionDuration.Count; break; - case HydraModels.RetentionDurationType.Years: + case ServiceClientModels.RetentionDurationType.Years: monthsCount = retentionDuration.Count * PolicyConstants.NumOfMonthsInYear; break; @@ -168,25 +168,25 @@ private static int GetRetentionDurationInMonths(HydraModels.RetentionDuration re return monthsCount; } - private static int GetRetentionDurationInYears(HydraModels.RetentionDuration retentionDuration) + private static int GetRetentionDurationInYears(ServiceClientModels.RetentionDuration retentionDuration) { int yearsCount = 0; switch (retentionDuration.DurationType) { - case HydraModels.RetentionDurationType.Days: + case ServiceClientModels.RetentionDurationType.Days: yearsCount = retentionDuration.Count / PolicyConstants.NumOfDaysInYear; break; - case HydraModels.RetentionDurationType.Weeks: + case ServiceClientModels.RetentionDurationType.Weeks: yearsCount = retentionDuration.Count / PolicyConstants.NumOfWeeksInYear; break; - case HydraModels.RetentionDurationType.Months: + case ServiceClientModels.RetentionDurationType.Months: yearsCount = retentionDuration.Count / PolicyConstants.NumOfMonthsInYear; break; - case HydraModels.RetentionDurationType.Years: + case ServiceClientModels.RetentionDurationType.Years: yearsCount = retentionDuration.Count; break; @@ -198,96 +198,96 @@ private static int GetRetentionDurationInYears(HydraModels.RetentionDuration ret return yearsCount; } - private static DailyRetentionSchedule GetPSLTRDailySchedule(HydraModels.DailyRetentionSchedule hydraDaily) + private static DailyRetentionSchedule GetPSLTRDailySchedule(ServiceClientModels.DailyRetentionSchedule serviceClientDaily) { - if(hydraDaily == null) + if(serviceClientDaily == null) { return null; } DailyRetentionSchedule psDaily = new DailyRetentionSchedule(); - psDaily.DurationCountInDays = GetRetentionDurationInDays(hydraDaily.RetentionDuration); - psDaily.RetentionTimes = ParseDateTimesToUTC(hydraDaily.RetentionTimes); + psDaily.DurationCountInDays = GetRetentionDurationInDays(serviceClientDaily.RetentionDuration); + psDaily.RetentionTimes = ParseDateTimesToUTC(serviceClientDaily.RetentionTimes); return psDaily; } - private static WeeklyRetentionSchedule GetPSLTRWeeklySchedule(HydraModels.WeeklyRetentionSchedule hydraWeekly) + private static WeeklyRetentionSchedule GetPSLTRWeeklySchedule(ServiceClientModels.WeeklyRetentionSchedule serviceClientWeekly) { - if (hydraWeekly == null) + if (serviceClientWeekly == null) { return null; } WeeklyRetentionSchedule psWeekly = new WeeklyRetentionSchedule(); - psWeekly.DurationCountInWeeks = GetRetentionDurationInWeeks(hydraWeekly.RetentionDuration); - psWeekly.RetentionTimes = ParseDateTimesToUTC(hydraWeekly.RetentionTimes); - psWeekly.DaysOfTheWeek = HelperUtils.GetEnumListFromStringList(hydraWeekly.DaysOfTheWeek); + psWeekly.DurationCountInWeeks = GetRetentionDurationInWeeks(serviceClientWeekly.RetentionDuration); + psWeekly.RetentionTimes = ParseDateTimesToUTC(serviceClientWeekly.RetentionTimes); + psWeekly.DaysOfTheWeek = HelperUtils.GetEnumListFromStringList(serviceClientWeekly.DaysOfTheWeek); return psWeekly; } - private static MonthlyRetentionSchedule GetPSLTRMonthlySchedule(HydraModels.MonthlyRetentionSchedule hydraMonthly) + private static MonthlyRetentionSchedule GetPSLTRMonthlySchedule(ServiceClientModels.MonthlyRetentionSchedule serviceClientMonthly) { - if (hydraMonthly == null) + if (serviceClientMonthly == null) { return null; } MonthlyRetentionSchedule psMonthly = new MonthlyRetentionSchedule(); - psMonthly.DurationCountInMonths = GetRetentionDurationInMonths(hydraMonthly.RetentionDuration); - psMonthly.RetentionTimes = ParseDateTimesToUTC(hydraMonthly.RetentionTimes); + psMonthly.DurationCountInMonths = GetRetentionDurationInMonths(serviceClientMonthly.RetentionDuration); + psMonthly.RetentionTimes = ParseDateTimesToUTC(serviceClientMonthly.RetentionTimes); psMonthly.RetentionScheduleFormatType = (RetentionScheduleFormat)Enum.Parse(typeof(RetentionScheduleFormat), - hydraMonthly.RetentionScheduleFormatType); - psMonthly.RetentionScheduleDaily = GetPSLTRDailyRetentionFormat(hydraMonthly.RetentionScheduleDaily); - psMonthly.RetentionScheduleWeekly = GetPSLTRWeeklyRetentionFormat(hydraMonthly.RetentionScheduleWeekly); + serviceClientMonthly.RetentionScheduleFormatType); + psMonthly.RetentionScheduleDaily = GetPSLTRDailyRetentionFormat(serviceClientMonthly.RetentionScheduleDaily); + psMonthly.RetentionScheduleWeekly = GetPSLTRWeeklyRetentionFormat(serviceClientMonthly.RetentionScheduleWeekly); return psMonthly; } - private static YearlyRetentionSchedule GetPSLTRYearlySchedule(HydraModels.YearlyRetentionSchedule hydraYearly) + private static YearlyRetentionSchedule GetPSLTRYearlySchedule(ServiceClientModels.YearlyRetentionSchedule serviceClientYearly) { - if (hydraYearly == null) + if (serviceClientYearly == null) { return null; } YearlyRetentionSchedule psYearly = new YearlyRetentionSchedule(); - psYearly.DurationCountInYears = GetRetentionDurationInYears(hydraYearly.RetentionDuration); - psYearly.RetentionTimes = ParseDateTimesToUTC(hydraYearly.RetentionTimes); + psYearly.DurationCountInYears = GetRetentionDurationInYears(serviceClientYearly.RetentionDuration); + psYearly.RetentionTimes = ParseDateTimesToUTC(serviceClientYearly.RetentionTimes); psYearly.RetentionScheduleFormatType = (RetentionScheduleFormat)Enum.Parse(typeof(RetentionScheduleFormat), - hydraYearly.RetentionScheduleFormatType); - psYearly.RetentionScheduleDaily = GetPSLTRDailyRetentionFormat(hydraYearly.RetentionScheduleDaily); - psYearly.RetentionScheduleWeekly = GetPSLTRWeeklyRetentionFormat(hydraYearly.RetentionScheduleWeekly); - psYearly.MonthsOfYear = HelperUtils.GetEnumListFromStringList(hydraYearly.MonthsOfYear); + serviceClientYearly.RetentionScheduleFormatType); + psYearly.RetentionScheduleDaily = GetPSLTRDailyRetentionFormat(serviceClientYearly.RetentionScheduleDaily); + psYearly.RetentionScheduleWeekly = GetPSLTRWeeklyRetentionFormat(serviceClientYearly.RetentionScheduleWeekly); + psYearly.MonthsOfYear = HelperUtils.GetEnumListFromStringList(serviceClientYearly.MonthsOfYear); return psYearly; } private static DailyRetentionFormat GetPSLTRDailyRetentionFormat( - HydraModels.DailyRetentionFormat hydraFormat) + ServiceClientModels.DailyRetentionFormat serviceClientFormat) { - if (hydraFormat == null) + if (serviceClientFormat == null) { return null; } DailyRetentionFormat psFormat = new DailyRetentionFormat(); - if (hydraFormat.DaysOfTheMonth != null) + if (serviceClientFormat.DaysOfTheMonth != null) { psFormat.DaysOfTheMonth = new List(); - foreach (HydraModels.Day hydraDay in hydraFormat.DaysOfTheMonth) + foreach (ServiceClientModels.Day serviceClientDay in serviceClientFormat.DaysOfTheMonth) { Day psDay = new Day() { - Date = hydraDay.Date, - IsLast = hydraDay.IsLast + Date = serviceClientDay.Date, + IsLast = serviceClientDay.IsLast }; psFormat.DaysOfTheMonth.Add(psDay); @@ -298,21 +298,21 @@ private static DailyRetentionFormat GetPSLTRDailyRetentionFormat( } private static WeeklyRetentionFormat GetPSLTRWeeklyRetentionFormat( - HydraModels.WeeklyRetentionFormat hydraFormat) + ServiceClientModels.WeeklyRetentionFormat serviceClientFormat) { - if (hydraFormat == null) + if (serviceClientFormat == null) { return null; } WeeklyRetentionFormat psFormat = new WeeklyRetentionFormat(); - if (hydraFormat.DaysOfTheWeek != null) + if (serviceClientFormat.DaysOfTheWeek != null) { - psFormat.DaysOfTheWeek = HelperUtils.GetEnumListFromStringList(hydraFormat.DaysOfTheWeek); + psFormat.DaysOfTheWeek = HelperUtils.GetEnumListFromStringList(serviceClientFormat.DaysOfTheWeek); } - if (hydraFormat.WeeksOfTheMonth != null) + if (serviceClientFormat.WeeksOfTheMonth != null) { - psFormat.WeeksOfTheMonth = HelperUtils.GetEnumListFromStringList(hydraFormat.WeeksOfTheMonth); + psFormat.WeeksOfTheMonth = HelperUtils.GetEnumListFromStringList(serviceClientFormat.WeeksOfTheMonth); } return psFormat; @@ -322,8 +322,8 @@ private static WeeklyRetentionFormat GetPSLTRWeeklyRetentionFormat( #endregion - #region PStoHydraObject conversions - public static HydraModels.LongTermRetentionPolicy GetHydraLongTermRetentionPolicy( + #region PStoServiceClientObject conversions + public static ServiceClientModels.LongTermRetentionPolicy GetServiceClientLongTermRetentionPolicy( AzureRmRecoveryServicesBackupLongTermRetentionPolicy psRetPolicy) { if(psRetPolicy == null) @@ -331,138 +331,138 @@ public static HydraModels.LongTermRetentionPolicy GetHydraLongTermRetentionPolic return null; } - HydraModels.LongTermRetentionPolicy hydraRetPolicy = new HydraModels.LongTermRetentionPolicy(); + ServiceClientModels.LongTermRetentionPolicy serviceClientRetPolicy = new ServiceClientModels.LongTermRetentionPolicy(); if(psRetPolicy.IsDailyScheduleEnabled) { - hydraRetPolicy.DailySchedule = GetHydraLTRDailySchedule(psRetPolicy.DailySchedule); + serviceClientRetPolicy.DailySchedule = GetServiceClientLTRDailySchedule(psRetPolicy.DailySchedule); } if (psRetPolicy.IsWeeklyScheduleEnabled) { - hydraRetPolicy.WeeklySchedule = GetHydraLTRWeeklySchedule(psRetPolicy.WeeklySchedule); + serviceClientRetPolicy.WeeklySchedule = GetServiceClientLTRWeeklySchedule(psRetPolicy.WeeklySchedule); } if (psRetPolicy.IsMonthlyScheduleEnabled) { - hydraRetPolicy.MonthlySchedule = GetHydraLTRMonthlySchedule(psRetPolicy.MonthlySchedule); + serviceClientRetPolicy.MonthlySchedule = GetServiceClientLTRMonthlySchedule(psRetPolicy.MonthlySchedule); } if (psRetPolicy.IsYearlyScheduleEnabled) { - hydraRetPolicy.YearlySchedule = GetHydraLTRYearlySchedule(psRetPolicy.YearlySchedule); + serviceClientRetPolicy.YearlySchedule = GetServiceClientLTRYearlySchedule(psRetPolicy.YearlySchedule); } - return hydraRetPolicy; + return serviceClientRetPolicy; } - public static HydraModels.SimpleRetentionPolicy GetHydraSimpleRetentionPolicy( + public static ServiceClientModels.SimpleRetentionPolicy GetServiceClientSimpleRetentionPolicy( AzureRmRecoveryServicesBackupSimpleSchedulePolicy psRetPolicy) { throw new NotSupportedException(); } #region private - private static HydraModels.DailyRetentionSchedule GetHydraLTRDailySchedule(DailyRetentionSchedule psDaily) + private static ServiceClientModels.DailyRetentionSchedule GetServiceClientLTRDailySchedule(DailyRetentionSchedule psDaily) { if (psDaily == null) { return null; } - HydraModels.DailyRetentionSchedule hydraDaily = new HydraModels.DailyRetentionSchedule(); + ServiceClientModels.DailyRetentionSchedule serviceClientDaily = new ServiceClientModels.DailyRetentionSchedule(); - hydraDaily.RetentionDuration = new HydraModels.RetentionDuration() + serviceClientDaily.RetentionDuration = new ServiceClientModels.RetentionDuration() { Count = psDaily.DurationCountInDays, - DurationType = HydraModels.RetentionDurationType.Days + DurationType = ServiceClientModels.RetentionDurationType.Days }; - hydraDaily.RetentionTimes = psDaily.RetentionTimes; + serviceClientDaily.RetentionTimes = psDaily.RetentionTimes; - return hydraDaily; + return serviceClientDaily; } - private static HydraModels.WeeklyRetentionSchedule GetHydraLTRWeeklySchedule(WeeklyRetentionSchedule psWeekly) + private static ServiceClientModels.WeeklyRetentionSchedule GetServiceClientLTRWeeklySchedule(WeeklyRetentionSchedule psWeekly) { if (psWeekly == null) { return null; } - HydraModels.WeeklyRetentionSchedule hydraWeekly = new HydraModels.WeeklyRetentionSchedule(); + ServiceClientModels.WeeklyRetentionSchedule serviceClientWeekly = new ServiceClientModels.WeeklyRetentionSchedule(); - hydraWeekly.RetentionDuration = new HydraModels.RetentionDuration() + serviceClientWeekly.RetentionDuration = new ServiceClientModels.RetentionDuration() { Count = psWeekly.DurationCountInWeeks, - DurationType = HydraModels.RetentionDurationType.Weeks + DurationType = ServiceClientModels.RetentionDurationType.Weeks }; - hydraWeekly.RetentionTimes = psWeekly.RetentionTimes; - hydraWeekly.DaysOfTheWeek = HelperUtils.GetStringListFromEnumList(psWeekly.DaysOfTheWeek); + serviceClientWeekly.RetentionTimes = psWeekly.RetentionTimes; + serviceClientWeekly.DaysOfTheWeek = HelperUtils.GetStringListFromEnumList(psWeekly.DaysOfTheWeek); - return hydraWeekly; + return serviceClientWeekly; } - private static HydraModels.MonthlyRetentionSchedule GetHydraLTRMonthlySchedule(MonthlyRetentionSchedule psMonthly) + private static ServiceClientModels.MonthlyRetentionSchedule GetServiceClientLTRMonthlySchedule(MonthlyRetentionSchedule psMonthly) { if (psMonthly == null) { return null; } - HydraModels.MonthlyRetentionSchedule hydraMonthly = new HydraModels.MonthlyRetentionSchedule(); + ServiceClientModels.MonthlyRetentionSchedule serviceClientMonthly = new ServiceClientModels.MonthlyRetentionSchedule(); - hydraMonthly.RetentionDuration = new HydraModels.RetentionDuration() + serviceClientMonthly.RetentionDuration = new ServiceClientModels.RetentionDuration() { Count = psMonthly.DurationCountInMonths, - DurationType = HydraModels.RetentionDurationType.Months + DurationType = ServiceClientModels.RetentionDurationType.Months }; - hydraMonthly.RetentionTimes = psMonthly.RetentionTimes; + serviceClientMonthly.RetentionTimes = psMonthly.RetentionTimes; - hydraMonthly.RetentionScheduleFormatType = psMonthly.RetentionScheduleFormatType.ToString(); + serviceClientMonthly.RetentionScheduleFormatType = psMonthly.RetentionScheduleFormatType.ToString(); if (psMonthly.RetentionScheduleFormatType == RetentionScheduleFormat.Daily) { - hydraMonthly.RetentionScheduleDaily = GetHydraLTRDailyRetentionFormat(psMonthly.RetentionScheduleDaily); + serviceClientMonthly.RetentionScheduleDaily = GetServiceClientLTRDailyRetentionFormat(psMonthly.RetentionScheduleDaily); } else if (psMonthly.RetentionScheduleFormatType == RetentionScheduleFormat.Weekly) { - hydraMonthly.RetentionScheduleWeekly = GetHydraLTRWeeklyRetentionFormat(psMonthly.RetentionScheduleWeekly); + serviceClientMonthly.RetentionScheduleWeekly = GetServiceClientLTRWeeklyRetentionFormat(psMonthly.RetentionScheduleWeekly); } - return hydraMonthly; + return serviceClientMonthly; } - private static HydraModels.YearlyRetentionSchedule GetHydraLTRYearlySchedule(YearlyRetentionSchedule psYearly) + private static ServiceClientModels.YearlyRetentionSchedule GetServiceClientLTRYearlySchedule(YearlyRetentionSchedule psYearly) { if (psYearly == null) { return null; } - HydraModels.YearlyRetentionSchedule hydraYearly = new HydraModels.YearlyRetentionSchedule(); + ServiceClientModels.YearlyRetentionSchedule serviceClientYearly = new ServiceClientModels.YearlyRetentionSchedule(); - hydraYearly.RetentionDuration = new HydraModels.RetentionDuration() + serviceClientYearly.RetentionDuration = new ServiceClientModels.RetentionDuration() { Count = psYearly.DurationCountInYears, - DurationType = HydraModels.RetentionDurationType.Years + DurationType = ServiceClientModels.RetentionDurationType.Years }; - hydraYearly.RetentionTimes = psYearly.RetentionTimes; + serviceClientYearly.RetentionTimes = psYearly.RetentionTimes; - hydraYearly.RetentionScheduleFormatType = psYearly.RetentionScheduleFormatType.ToString(); + serviceClientYearly.RetentionScheduleFormatType = psYearly.RetentionScheduleFormatType.ToString(); if (psYearly.RetentionScheduleFormatType == RetentionScheduleFormat.Daily) { - hydraYearly.RetentionScheduleDaily = GetHydraLTRDailyRetentionFormat(psYearly.RetentionScheduleDaily); + serviceClientYearly.RetentionScheduleDaily = GetServiceClientLTRDailyRetentionFormat(psYearly.RetentionScheduleDaily); } else if (psYearly.RetentionScheduleFormatType == RetentionScheduleFormat.Weekly) { - hydraYearly.RetentionScheduleWeekly = GetHydraLTRWeeklyRetentionFormat(psYearly.RetentionScheduleWeekly); + serviceClientYearly.RetentionScheduleWeekly = GetServiceClientLTRWeeklyRetentionFormat(psYearly.RetentionScheduleWeekly); } - hydraYearly.MonthsOfYear = HelperUtils.GetStringListFromEnumList(psYearly.MonthsOfYear); + serviceClientYearly.MonthsOfYear = HelperUtils.GetStringListFromEnumList(psYearly.MonthsOfYear); - return hydraYearly; + return serviceClientYearly; } - private static HydraModels.DailyRetentionFormat GetHydraLTRDailyRetentionFormat( + private static ServiceClientModels.DailyRetentionFormat GetServiceClientLTRDailyRetentionFormat( DailyRetentionFormat psFormat) { if (psFormat == null) @@ -470,28 +470,28 @@ private static HydraModels.DailyRetentionFormat GetHydraLTRDailyRetentionFormat( return null; } - HydraModels.DailyRetentionFormat hydraFormat = new HydraModels.DailyRetentionFormat(); + ServiceClientModels.DailyRetentionFormat serviceClientFormat = new ServiceClientModels.DailyRetentionFormat(); if (psFormat.DaysOfTheMonth != null) { - hydraFormat.DaysOfTheMonth = new List(); + serviceClientFormat.DaysOfTheMonth = new List(); foreach (Day psDay in psFormat.DaysOfTheMonth) { - HydraModels.Day hydraDay = new HydraModels.Day() + ServiceClientModels.Day serviceClientDay = new ServiceClientModels.Day() { Date = psDay.Date, IsLast = psDay.IsLast }; - hydraFormat.DaysOfTheMonth.Add(hydraDay); + serviceClientFormat.DaysOfTheMonth.Add(serviceClientDay); } } - return hydraFormat; + return serviceClientFormat; } - private static HydraModels.WeeklyRetentionFormat GetHydraLTRWeeklyRetentionFormat( + private static ServiceClientModels.WeeklyRetentionFormat GetServiceClientLTRWeeklyRetentionFormat( WeeklyRetentionFormat psFormat) { if (psFormat == null) @@ -499,17 +499,17 @@ private static HydraModels.WeeklyRetentionFormat GetHydraLTRWeeklyRetentionForma return null; } - HydraModels.WeeklyRetentionFormat hydraFormat = new HydraModels.WeeklyRetentionFormat(); + ServiceClientModels.WeeklyRetentionFormat serviceClientFormat = new ServiceClientModels.WeeklyRetentionFormat(); if (psFormat.DaysOfTheWeek != null) { - hydraFormat.DaysOfTheWeek = HelperUtils.GetStringListFromEnumList(psFormat.DaysOfTheWeek); + serviceClientFormat.DaysOfTheWeek = HelperUtils.GetStringListFromEnumList(psFormat.DaysOfTheWeek); } if (psFormat.WeeksOfTheMonth != null) { - hydraFormat.WeeksOfTheMonth = HelperUtils.GetStringListFromEnumList(psFormat.WeeksOfTheMonth); + serviceClientFormat.WeeksOfTheMonth = HelperUtils.GetStringListFromEnumList(psFormat.WeeksOfTheMonth); } - return hydraFormat; + return serviceClientFormat; } #endregion diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/SchedulePolicyConversions.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/SchedulePolicyConversions.cs index de13dbd58c87..90f4a0e9ac48 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/SchedulePolicyConversions.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/SchedulePolicyConversions.cs @@ -24,22 +24,22 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers { public partial class PolicyHelpers { - #region HydraToPSObject conversions + #region ServiceClientToPSObject conversions public static AzureRmRecoveryServicesBackupSimpleSchedulePolicy GetPSSimpleSchedulePolicy( - SimpleSchedulePolicy hydraPolicy) + SimpleSchedulePolicy serviceClientPolicy) { - if (hydraPolicy == null) + if (serviceClientPolicy == null) { return null; } AzureRmRecoveryServicesBackupSimpleSchedulePolicy psPolicy = new AzureRmRecoveryServicesBackupSimpleSchedulePolicy(); - psPolicy.ScheduleRunDays = HelperUtils.GetEnumListFromStringList(hydraPolicy.ScheduleRunDays); + psPolicy.ScheduleRunDays = HelperUtils.GetEnumListFromStringList(serviceClientPolicy.ScheduleRunDays); psPolicy.ScheduleRunFrequency = (ScheduleRunType)Enum.Parse(typeof(ScheduleRunType), - hydraPolicy.ScheduleRunFrequency); - psPolicy.ScheduleRunTimes = ParseDateTimesToUTC(hydraPolicy.ScheduleRunTimes); + serviceClientPolicy.ScheduleRunFrequency); + psPolicy.ScheduleRunTimes = ParseDateTimesToUTC(serviceClientPolicy.ScheduleRunTimes); // safe side validation psPolicy.Validate(); @@ -49,7 +49,7 @@ public static AzureRmRecoveryServicesBackupSimpleSchedulePolicy GetPSSimpleSched #endregion - #region PStoHydraObject conversions + #region PStoServiceClientObject conversions public static List ParseDateTimesToUTC(IList localTimes) { @@ -74,7 +74,7 @@ public static List ParseDateTimesToUTC(IList localTimes) return utcTimes; } - public static SimpleSchedulePolicy GetHydraSimpleSchedulePolicy( + public static SimpleSchedulePolicy GetServiceClientSimpleSchedulePolicy( AzureRmRecoveryServicesBackupSimpleSchedulePolicy psPolicy) { if (psPolicy == null) @@ -82,15 +82,15 @@ public static SimpleSchedulePolicy GetHydraSimpleSchedulePolicy( return null; } - SimpleSchedulePolicy hydraPolicy = new SimpleSchedulePolicy(); - hydraPolicy.ScheduleRunFrequency = psPolicy.ScheduleRunFrequency.ToString(); + SimpleSchedulePolicy serviceClientPolicy = new SimpleSchedulePolicy(); + serviceClientPolicy.ScheduleRunFrequency = psPolicy.ScheduleRunFrequency.ToString(); if (psPolicy.ScheduleRunFrequency == ScheduleRunType.Weekly) { - hydraPolicy.ScheduleRunDays = HelperUtils.GetStringListFromEnumList(psPolicy.ScheduleRunDays); + serviceClientPolicy.ScheduleRunDays = HelperUtils.GetStringListFromEnumList(psPolicy.ScheduleRunDays); } - hydraPolicy.ScheduleRunTimes = psPolicy.ScheduleRunTimes; + serviceClientPolicy.ScheduleRunTimes = psPolicy.ScheduleRunTimes; - return hydraPolicy; + return serviceClientPolicy; } #endregion diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/HydraHelpers.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/ServiceClientHelpers.cs similarity index 78% rename from src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/HydraHelpers.cs rename to src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/ServiceClientHelpers.cs index 597791af26e4..eac53a735f8c 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/HydraHelpers.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/ServiceClientHelpers.cs @@ -20,14 +20,14 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers { - public class HydraConstants + public class ServiceClientConstants { public const string SkipToken = "skipToken"; } - public class HydraHelpers + public class ServiceClientHelpers { - public static string GetHydraProviderType(CmdletModel.ContainerType containerType) + public static string GetServiceClientProviderType(CmdletModel.ContainerType containerType) { string providerType = string.Empty; @@ -43,7 +43,7 @@ public static string GetHydraProviderType(CmdletModel.ContainerType containerTyp return providerType; } - public static string GetHydraProviderType(CmdletModel.WorkloadType workloadType) + public static string GetServiceClientProviderType(CmdletModel.WorkloadType workloadType) { string providerType = string.Empty; @@ -67,9 +67,9 @@ public static void GetSkipTokenFromNextLink(string nextLink, out string skipToke // This is sent by service and we don't expect this to be encoded. // TODO: Need to make sure during testing that this is in fact true. NameValueCollection queryParams = HttpUtility.ParseQueryString(uriObj.Query); - if (queryParams.Get(HydraConstants.SkipToken) != null) + if (queryParams.Get(ServiceClientConstants.SkipToken) != null) { - skipToken = queryParams.Get(HydraConstants.SkipToken); + skipToken = queryParams.Get(ServiceClientConstants.SkipToken); } else { @@ -98,36 +98,36 @@ public static string GetLastIdFromFullId(string fullId) return splitArr[splitArr.Length - 1]; } - public static string GetHydraContainerType(CmdletModel.ContainerType containerType) + public static string GetServiceClientContainerType(CmdletModel.ContainerType containerType) { - string hydraContainerType = string.Empty; + string serviceClientContainerType = string.Empty; switch (containerType) { case CmdletModel.ContainerType.AzureVM: - hydraContainerType = ContainerType.IaasVMContainer.ToString(); + serviceClientContainerType = ContainerType.IaasVMContainer.ToString(); break; default: break; } - return hydraContainerType; + return serviceClientContainerType; } - public static string GetHydraWorkloadType(CmdletModel.WorkloadType workloadType) + public static string GetServiceClientWorkloadType(CmdletModel.WorkloadType workloadType) { - string hydraWorkloadType = string.Empty; + string serviceClientWorkloadType = string.Empty; switch (workloadType) { case CmdletModel.WorkloadType.AzureVM: - hydraWorkloadType = WorkloadType.VM.ToString(); + serviceClientWorkloadType = WorkloadType.VM.ToString(); break; default: break; } - return hydraWorkloadType; + return serviceClientWorkloadType; } } } diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.Designer.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.Designer.cs index bc9926ac84af..e82d143ffa66 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.Designer.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -291,11 +291,11 @@ public static string DiscoveryFailureErrorMessage { } /// - /// Looks up a localized string similar to Empty response received from Service/Hydra. + /// Looks up a localized string similar to Empty response received from Service Client. /// - public static string EmptyHydraResponseException { + public static string EmptyServiceClientResponseException { get { - return ResourceManager.GetString("EmptyHydraResponseException", resourceCulture); + return ResourceManager.GetString("EmptyServiceClientResponseException", resourceCulture); } } diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.resx b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.resx index cd7ea3e0c80f..725f4142daef 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.resx +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.resx @@ -180,8 +180,8 @@ Both RetentionPolicy and SchedulePolicy are empty, nothing to update - - Empty response received from Service/Hydra + + Empty response received from Service Client Invalid ProtectionPolicy - either NULL or NOT of type: {0} diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj index a4ab177b7bae..b1ec33e140d0 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj @@ -75,10 +75,6 @@ {0e1d3f36-e6c8-4764-8c7d-6f9ee537490c} Commands.RecoveryServices.Backup.Helpers - - {b758fec1-35c1-4f93-a954-66dd33f6e0ec} - Commands.RecoveryServices.Backup.HydraAdapter - {5e675749-6139-464a-904c-59c0ffdfec82} Commands.RecoveryServices.Backup.Logger @@ -91,6 +87,10 @@ {5e675749-6139-464a-904c-59c0ffdfec82} Commands.RecoveryServices.Backup.Logger + + {b758fec1-35c1-4f93-a954-66dd33f6e0ec} + Commands.RecoveryServices.Backup.ServiceClientAdapter + diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/IPsBackupProvider.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/IPsBackupProvider.cs index e801b816db95..64a24aeab6b1 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/IPsBackupProvider.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/IPsBackupProvider.cs @@ -12,7 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS; +using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS; using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models; using Microsoft.Azure.Management.RecoveryServices.Backup.Models; using System; @@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel { public interface IPsBackupProvider { - void Initialize(Dictionary providerData, HydraAdapter hydraAdapter); + void Initialize(Dictionary providerData, ServiceClientAdapter serviceClientAdapter); BaseRecoveryServicesJobResponse EnableProtection(); diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/DpmPsBackupProvider.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/DpmPsBackupProvider.cs index 9f0319d240f5..b652ff001c9b 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/DpmPsBackupProvider.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/DpmPsBackupProvider.cs @@ -20,19 +20,19 @@ using System.Threading.Tasks; using Microsoft.Azure.Management.RecoveryServices.Backup.Models; using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers; -using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS; +using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS; namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel { public class DpmPsBackupProvider : IPsBackupProvider { Dictionary ProviderData { get; set; } - HydraAdapter HydraAdapter { get; set; } + ServiceClientAdapter ServiceClientAdapter { get; set; } - public void Initialize(Dictionary providerData, HydraAdapter hydraAdapter) + public void Initialize(Dictionary providerData, ServiceClientAdapter serviceClientAdapter) { this.ProviderData = providerData; - this.HydraAdapter = hydraAdapter; + this.ServiceClientAdapter = serviceClientAdapter; } public Management.RecoveryServices.Backup.Models.BaseRecoveryServicesJobResponse EnableProtection() @@ -91,7 +91,7 @@ public ProtectionPolicyResponse ModifyPolicy() BackupEngineListQueryParams queryParams = new BackupEngineListQueryParams(); - var listResponse = HydraAdapter.ListBackupEngines(queryParams); + var listResponse = ServiceClientAdapter.ListBackupEngines(queryParams); List backupEngineModels = ConversionHelpers.GetBackupEngineModelList(listResponse); diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs index ca148c7a6bb0..e86d9326be9e 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs @@ -24,7 +24,7 @@ using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers; using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models; using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties; -using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS; +using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS; using Microsoft.WindowsAzure.Commands.Utilities.Common; namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel @@ -37,12 +37,12 @@ public class IaasVmPsBackupProvider : IPsBackupProvider private const string classicComputeAzureVMVersion = "Microsoft.ClassicCompute"; Dictionary ProviderData { get; set; } - HydraAdapter HydraAdapter { get; set; } + ServiceClientAdapter ServiceClientAdapter { get; set; } - public void Initialize(Dictionary providerData, HydraAdapter hydraAdapter) + public void Initialize(Dictionary providerData, ServiceClientAdapter serviceClientAdapter) { this.ProviderData = providerData; - this.HydraAdapter = hydraAdapter; + this.ServiceClientAdapter = serviceClientAdapter; } public BaseRecoveryServicesJobResponse EnableProtection() @@ -92,7 +92,7 @@ public BaseRecoveryServicesJobResponse EnableProtection() protectedItemUri = HelperUtils.GetProtectedItemUri(keyValueDict, item.Id); } - // construct Hydra protectedItem request + // construct Service Client protectedItem request AzureIaaSVMProtectedItem properties; if (isComputeAzureVM == false) @@ -106,7 +106,7 @@ public BaseRecoveryServicesJobResponse EnableProtection() properties.PolicyId = policy.Id; - ProtectedItemCreateOrUpdateRequest hydraRequest = new ProtectedItemCreateOrUpdateRequest() + ProtectedItemCreateOrUpdateRequest serviceClientRequest = new ProtectedItemCreateOrUpdateRequest() { Item = new ProtectedItemResource() { @@ -114,10 +114,10 @@ public BaseRecoveryServicesJobResponse EnableProtection() } }; - return HydraAdapter.CreateOrUpdateProtectedItem( + return ServiceClientAdapter.CreateOrUpdateProtectedItem( containerUri, protectedItemUri, - hydraRequest); + serviceClientRequest); } public BaseRecoveryServicesJobResponse DisableProtection() @@ -141,7 +141,7 @@ public BaseRecoveryServicesJobResponse DisableProtection() if (deleteBackupData) { - return HydraAdapter.DeleteProtectedItem( + return ServiceClientAdapter.DeleteProtectedItem( containerUri, protectedItemUri); } @@ -149,7 +149,7 @@ public BaseRecoveryServicesJobResponse DisableProtection() { isComputeAzureVM = IsComputeAzureVM(item.VirtualMachineId); - // construct Hydra protectedItem request + // construct Service Client protectedItem request AzureIaaSVMProtectedItem properties; if (isComputeAzureVM == false) @@ -164,7 +164,7 @@ public BaseRecoveryServicesJobResponse DisableProtection() properties.PolicyId = string.Empty; properties.ProtectionState = ItemProtectionState.ProtectionStopped.ToString(); - ProtectedItemCreateOrUpdateRequest hydraRequest = new ProtectedItemCreateOrUpdateRequest() + ProtectedItemCreateOrUpdateRequest serviceClientRequest = new ProtectedItemCreateOrUpdateRequest() { Item = new ProtectedItemResource() { @@ -172,10 +172,10 @@ public BaseRecoveryServicesJobResponse DisableProtection() } }; - return HydraAdapter.CreateOrUpdateProtectedItem( + return ServiceClientAdapter.CreateOrUpdateProtectedItem( containerUri, protectedItemUri, - hydraRequest); + serviceClientRequest); } } @@ -183,7 +183,7 @@ public BaseRecoveryServicesJobResponse TriggerBackup() { AzureRmRecoveryServicesBackupItemBase item = (AzureRmRecoveryServicesBackupItemBase)ProviderData[ItemParams.Item]; AzureRmRecoveryServicesBackupIaasVmItem iaasVmItem = item as AzureRmRecoveryServicesBackupIaasVmItem; - return HydraAdapter.TriggerBackup(IdUtils.GetValueByName(iaasVmItem.Id, IdUtils.IdNames.ProtectionContainerName), + return ServiceClientAdapter.TriggerBackup(IdUtils.GetValueByName(iaasVmItem.Id, IdUtils.IdNames.ProtectionContainerName), IdUtils.GetValueByName(iaasVmItem.Id, IdUtils.IdNames.ProtectedItemName)); } @@ -195,7 +195,7 @@ public BaseRecoveryServicesJobResponse TriggerRestore() string storageAccountLocation = ProviderData[RestoreBackupItemParams.StorageAccountLocation].ToString(); string storageAccountType = ProviderData[RestoreBackupItemParams.StorageAccountType].ToString(); - var response = HydraAdapter.RestoreDisk(rp, storageAccountId, storageAccountLocation, storageAccountType); + var response = ServiceClientAdapter.RestoreDisk(rp, storageAccountId, storageAccountLocation, storageAccountType); return response; } @@ -215,7 +215,7 @@ public AzureRmRecoveryServicesBackupRecoveryPointBase GetRecoveryPointDetails() string containerUri = HelperUtils.GetContainerUri(uriDict, item.Id); string protectedItemName = HelperUtils.GetProtectedItemUri(uriDict, item.Id); - var rpResponse = HydraAdapter.GetRecoveryPointDetails(containerUri, protectedItemName, recoveryPointId); + var rpResponse = ServiceClientAdapter.GetRecoveryPointDetails(containerUri, protectedItemName, recoveryPointId); return RecoveryPointConversions.GetPSAzureRecoveryPoints(rpResponse, item); } @@ -242,7 +242,7 @@ public List ListRecoveryPoints() queryFilter.EndDate = CommonHelpers.GetDateTimeStringForService(endDate); RecoveryPointListResponse rpListResponse = null; - rpListResponse = HydraAdapter.GetRecoveryPoints(containerUri, protectedItemName, queryFilter); + rpListResponse = ServiceClientAdapter.GetRecoveryPoints(containerUri, protectedItemName, queryFilter); return RecoveryPointConversions.GetPSAzureRecoveryPoints(rpListResponse, item); } @@ -280,24 +280,24 @@ public ProtectionPolicyResponse CreatePolicy() (AzureRmRecoveryServicesBackupSimpleSchedulePolicy)schedulePolicy); Logger.Instance.WriteDebug("Validation of Retention policy with Schedule policy is successful"); - // construct Hydra policy request - ProtectionPolicyRequest hydraRequest = new ProtectionPolicyRequest() + // construct Service Client policy request + ProtectionPolicyRequest serviceClientRequest = new ProtectionPolicyRequest() { Item = new ProtectionPolicyResource() { Properties = new AzureIaaSVMProtectionPolicy() { - RetentionPolicy = PolicyHelpers.GetHydraLongTermRetentionPolicy( + RetentionPolicy = PolicyHelpers.GetServiceClientLongTermRetentionPolicy( (AzureRmRecoveryServicesBackupLongTermRetentionPolicy)retentionPolicy), - SchedulePolicy = PolicyHelpers.GetHydraSimpleSchedulePolicy( + SchedulePolicy = PolicyHelpers.GetServiceClientSimpleSchedulePolicy( (AzureRmRecoveryServicesBackupSimpleSchedulePolicy)schedulePolicy) } } }; - return HydraAdapter.CreateOrUpdateProtectionPolicy( + return ServiceClientAdapter.CreateOrUpdateProtectionPolicy( policyName, - hydraRequest); + serviceClientRequest); } public ProtectionPolicyResponse ModifyPolicy() @@ -352,23 +352,23 @@ public ProtectionPolicyResponse ModifyPolicy() (AzureRmRecoveryServicesBackupSimpleSchedulePolicy)((AzureRmRecoveryServicesBackupIaasVmPolicy)policy).SchedulePolicy); Logger.Instance.WriteDebug("Validation of Retention policy with Schedule policy is successful"); - // construct Hydra policy request - ProtectionPolicyRequest hydraRequest = new ProtectionPolicyRequest() + // construct Service Client policy request + ProtectionPolicyRequest serviceClientRequest = new ProtectionPolicyRequest() { Item = new ProtectionPolicyResource() { Properties = new AzureIaaSVMProtectionPolicy() { - RetentionPolicy = PolicyHelpers.GetHydraLongTermRetentionPolicy( + RetentionPolicy = PolicyHelpers.GetServiceClientLongTermRetentionPolicy( (AzureRmRecoveryServicesBackupLongTermRetentionPolicy)((AzureRmRecoveryServicesBackupIaasVmPolicy)policy).RetentionPolicy), - SchedulePolicy = PolicyHelpers.GetHydraSimpleSchedulePolicy( + SchedulePolicy = PolicyHelpers.GetServiceClientSimpleSchedulePolicy( (AzureRmRecoveryServicesBackupSimpleSchedulePolicy)((AzureRmRecoveryServicesBackupIaasVmPolicy)policy).SchedulePolicy) } } }; - return HydraAdapter.CreateOrUpdateProtectionPolicy(policy.Name, - hydraRequest); + return ServiceClientAdapter.CreateOrUpdateProtectionPolicy(policy.Name, + serviceClientRequest); } public List ListProtectionContainers() @@ -398,7 +398,7 @@ public List ListProtectionContainers queryParams.RegistrationStatus = status.ToString(); } - var listResponse = HydraAdapter.ListContainers(queryParams); + var listResponse = ServiceClientAdapter.ListContainers(queryParams); List containerModels = ConversionHelpers.GetContainerModelList(listResponse); @@ -437,10 +437,10 @@ public List ListProtectedItems() PaginationRequest paginationRequest = null; do { - var listResponse = HydraAdapter.ListProtectedItem(queryParams, paginationRequest); + var listResponse = ServiceClientAdapter.ListProtectedItem(queryParams, paginationRequest); protectedItems.AddRange(listResponse.ItemList.Value); - HydraHelpers.GetSkipTokenFromNextLink(listResponse.ItemList.NextLink, out skipToken); + ServiceClientHelpers.GetSkipTokenFromNextLink(listResponse.ItemList.NextLink, out skipToken); if (skipToken != null) { paginationRequest = new PaginationRequest(); @@ -480,7 +480,7 @@ public List ListProtectedItems() string containerUri = HelperUtils.GetContainerUri(dictionary, protectedItems[i].Id); string protectedItemUri = HelperUtils.GetProtectedItemUri(dictionary, protectedItems[i].Id); - var getResponse = HydraAdapter.GetProtectedItem(containerUri, protectedItemUri, getItemQueryParams); + var getResponse = ServiceClientAdapter.GetProtectedItem(containerUri, protectedItemUri, getItemQueryParams); protectedItemGetResponses.Add(getResponse); } } @@ -492,13 +492,13 @@ public List ListProtectedItems() for (int i = 0; i < itemModels.Count; i++) { AzureRmRecoveryServicesBackupIaasVmItemExtendedInfo extendedInfo = new AzureRmRecoveryServicesBackupIaasVmItemExtendedInfo(); - var hydraExtendedInfo = ((AzureIaaSVMProtectedItem)protectedItemGetResponses[i].Item.Properties).ExtendedInfo; - if (hydraExtendedInfo.OldestRecoveryPoint.HasValue) + var serviceClientExtendedInfo = ((AzureIaaSVMProtectedItem)protectedItemGetResponses[i].Item.Properties).ExtendedInfo; + if (serviceClientExtendedInfo.OldestRecoveryPoint.HasValue) { - extendedInfo.OldestRecoveryPoint = hydraExtendedInfo.OldestRecoveryPoint; + extendedInfo.OldestRecoveryPoint = serviceClientExtendedInfo.OldestRecoveryPoint; } - extendedInfo.PolicyState = hydraExtendedInfo.PolicyInconsistent.ToString(); - extendedInfo.RecoveryPointCount = hydraExtendedInfo.RecoveryPointCount; + extendedInfo.PolicyState = serviceClientExtendedInfo.PolicyInconsistent.ToString(); + extendedInfo.RecoveryPointCount = serviceClientExtendedInfo.RecoveryPointCount; ((AzureRmRecoveryServicesBackupIaasVmItem)itemModels[i]).ExtendedInfo = extendedInfo; } } @@ -816,14 +816,14 @@ private bool IsDiscoveryNeeded(string vmName, string rgName, bool isComputeAzure string virtualMachineId = GetAzureIaasVirtualMachineId(rgName, vmVersion, vmName); ProtectableObjectListQueryParameters queryParam = new ProtectableObjectListQueryParameters(); - // --- TBD To be added once bug is fixed in hydra and service + // --- TBD To be added once bug is fixed in Service Client and service //queryParam.ProviderType = ProviderType.AzureIaasVM.ToString(); //queryParam.FriendlyName = vmName; // No need to use skip or top token here as no pagination support of IaaSVM PO. //First check if container is discovered or not - var protectableItemList = HydraAdapter.ListProtectableItem(queryParam).ItemList; + var protectableItemList = ServiceClientAdapter.ListProtectableItem(queryParam).ItemList; Logger.Instance.WriteDebug(String.Format(Resources.ContainerCountAfterFilter, protectableItemList.ProtectableObjects.Count())); if (protectableItemList.ProtectableObjects.Count() == 0) @@ -855,7 +855,7 @@ private bool IsDiscoveryNeeded(string vmName, string rgName, bool isComputeAzure private void RefreshContainer() { string errorMessage = string.Empty; - var refreshContainerJobResponse = HydraAdapter.RefreshContainers(); + var refreshContainerJobResponse = ServiceClientAdapter.RefreshContainers(); //Now wait for the operation to Complete if (refreshContainerJobResponse.StatusCode != System.Net.HttpStatusCode.NoContent) @@ -872,7 +872,7 @@ private HttpStatusCode TrackRefreshContainerOperation(string operationResultLink { try { - var response = HydraAdapter.GetRefreshContainerOperationResultByURL(operationResultLink); + var response = ServiceClientAdapter.GetRefreshContainerOperationResultByURL(operationResultLink); status = response.StatusCode; TestMockSupport.Delay(checkFrequency); diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/MabPsBackupProvider.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/MabPsBackupProvider.cs index 6d6c41f698f1..26673084fa19 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/MabPsBackupProvider.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/MabPsBackupProvider.cs @@ -20,19 +20,19 @@ using Microsoft.Azure.Management.RecoveryServices.Backup.Models; using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers; using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models; -using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS; +using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS; namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel { public class MabPsBackupProvider : IPsBackupProvider { Dictionary ProviderData { get; set; } - HydraAdapter HydraAdapter { get; set; } + ServiceClientAdapter ServiceClientAdapter { get; set; } - public void Initialize(Dictionary providerData, HydraAdapter hydraAdapter) + public void Initialize(Dictionary providerData, ServiceClientAdapter serviceClientAdapter) { this.ProviderData = providerData; - this.HydraAdapter = hydraAdapter; + this.ServiceClientAdapter = serviceClientAdapter; } public Management.RecoveryServices.Backup.Models.BaseRecoveryServicesJobResponse EnableProtection() @@ -92,7 +92,7 @@ public ProtectionPolicyResponse ModifyPolicy() // 2. Filter by ContainerType queryParams.BackupManagementType = Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.MAB.ToString(); - var listResponse = HydraAdapter.ListContainers(queryParams); + var listResponse = ServiceClientAdapter.ListContainers(queryParams); List containerModels = ConversionHelpers.GetContainerModelList(listResponse); diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderManager.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderManager.cs index 737c886f4626..45add51e9ea2 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderManager.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderManager.cs @@ -12,7 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS; +using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS; using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models; using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties; using System; @@ -26,12 +26,12 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel public class PsBackupProviderManager { Dictionary providerData; - HydraAdapter hydraAdapter; + ServiceClientAdapter serviceClientAdapter; - public PsBackupProviderManager(Dictionary providerDataIn, HydraAdapter hydraAdapterIn) + public PsBackupProviderManager(Dictionary providerDataIn, ServiceClientAdapter serviceClientAdapterIn) { providerData = providerDataIn; - hydraAdapter = hydraAdapterIn; + serviceClientAdapter = serviceClientAdapterIn; } public IPsBackupProvider GetProviderInstance(ContainerType containerType, BackupManagementType? backupManagementType) @@ -130,7 +130,7 @@ public IPsBackupProvider GetProviderInstance(PsBackupProviderTypes providerType) break; } - psBackupProvider.Initialize(providerData, hydraAdapter); + psBackupProvider.Initialize(providerData, serviceClientAdapter); return psBackupProvider; } diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ContainerAPIs.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/ContainerAPIs.cs similarity index 98% rename from src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ContainerAPIs.cs rename to src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/ContainerAPIs.cs index 31df9ee33536..f7fb3c2c5384 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ContainerAPIs.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/ContainerAPIs.cs @@ -20,9 +20,9 @@ using System.Text; using System.Threading.Tasks; -namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS +namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS { - public partial class HydraAdapter + public partial class ServiceClientAdapter { /// /// Fetches protection containers in the vault according to the query params diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ItemAPIs.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/ItemAPIs.cs similarity index 98% rename from src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ItemAPIs.cs rename to src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/ItemAPIs.cs index ead662f3ef4d..668c9590a353 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ItemAPIs.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/ItemAPIs.cs @@ -19,9 +19,9 @@ using System.Threading.Tasks; using Microsoft.Azure.Management.RecoveryServices.Backup.Models; -namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS +namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS { - public partial class HydraAdapter + public partial class ServiceClientAdapter { public BaseRecoveryServicesJobResponse CreateOrUpdateProtectedItem( string containerName, diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/JobAPIs.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/JobAPIs.cs similarity index 98% rename from src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/JobAPIs.cs rename to src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/JobAPIs.cs index d1a14c0b1cb1..fd4c46fc9e18 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/JobAPIs.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/JobAPIs.cs @@ -15,9 +15,9 @@ using System; using Microsoft.Azure.Management.RecoveryServices.Backup.Models; -namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS +namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS { - public partial class HydraAdapter + public partial class ServiceClientAdapter { public JobResponse GetJob(string jobId) { diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/OperationStatusAPIs.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/OperationStatusAPIs.cs similarity index 96% rename from src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/OperationStatusAPIs.cs rename to src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/OperationStatusAPIs.cs index 2f5a4e7b55f8..69c31ff04c10 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/OperationStatusAPIs.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/OperationStatusAPIs.cs @@ -19,9 +19,9 @@ using System.Threading.Tasks; using Microsoft.Azure.Management.RecoveryServices.Backup.Models; -namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS +namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS { - public partial class HydraAdapter + public partial class ServiceClientAdapter { public BaseRecoveryServicesJobResponse GetRefreshContainerOperationResultByURL( string operationResultLink) diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/PolicyAPIs.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/PolicyAPIs.cs similarity index 98% rename from src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/PolicyAPIs.cs rename to src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/PolicyAPIs.cs index 00a3613217bb..71eff3bfd899 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/PolicyAPIs.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/PolicyAPIs.cs @@ -19,9 +19,9 @@ using System.Collections.Generic; using Microsoft.Azure.Management.RecoveryServices.Backup.Models; -namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS +namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS { - public partial class HydraAdapter + public partial class ServiceClientAdapter { public ProtectionPolicyResponse CreateOrUpdateProtectionPolicy( string policyName, diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ProtectableItemAPI.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/ProtectableItemAPI.cs similarity index 94% rename from src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ProtectableItemAPI.cs rename to src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/ProtectableItemAPI.cs index 6a89cd1c8fe7..a009b1b9e7bf 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ProtectableItemAPI.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/ProtectableItemAPI.cs @@ -19,9 +19,9 @@ using System.Threading.Tasks; using Microsoft.Azure.Management.RecoveryServices.Backup.Models; -namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS +namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS { - public partial class HydraAdapter + public partial class ServiceClientAdapter { public ProtectableObjectListResponse ListProtectableItem( ProtectableObjectListQueryParameters queryFilter, @@ -45,7 +45,7 @@ public BaseRecoveryServicesJobResponse TriggerBackup(string containerName, strin BmsAdapter.GetResourceGroupName(), BmsAdapter.GetResourceName(), BmsAdapter.GetCustomRequestHeaders(), - HydraAdapter.AzureFabricName, + ServiceClientAdapter.AzureFabricName, containerName, itemName, BmsAdapter.CmdletCancellationToken).Result; diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/RecoveryPointsAPIs.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/RecoveryPointsAPIs.cs similarity index 96% rename from src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/RecoveryPointsAPIs.cs rename to src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/RecoveryPointsAPIs.cs index d86fe7ec8c6e..dc1d261b91ce 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/RecoveryPointsAPIs.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/RecoveryPointsAPIs.cs @@ -19,9 +19,9 @@ using System.Text; using System.Threading.Tasks; -namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS +namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS { - public partial class HydraAdapter + public partial class ServiceClientAdapter { public RecoveryPointResponse GetRecoveryPointDetails(string containerName, string protectedItemName, string recoveryPointId) diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/RestoreDiskAPIs.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/RestoreDiskAPIs.cs similarity index 98% rename from src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/RestoreDiskAPIs.cs rename to src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/RestoreDiskAPIs.cs index 4322c5fdb7b7..fb954607e90b 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/RestoreDiskAPIs.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/RestoreDiskAPIs.cs @@ -21,9 +21,9 @@ using System.Threading.Tasks; using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties; -namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS +namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS { - public partial class HydraAdapter + public partial class ServiceClientAdapter { public BaseRecoveryServicesJobResponse RestoreDisk(AzureRmRecoveryServicesBackupIaasVmRecoveryPoint rp, string storageAccountId, diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/ClientProxy.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/ClientProxy.cs similarity index 98% rename from src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/ClientProxy.cs rename to src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/ClientProxy.cs index 04b98156676d..0d35ab13008e 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/ClientProxy.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/ClientProxy.cs @@ -20,7 +20,7 @@ using System.Text; using System.Threading.Tasks; -namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS +namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS { public partial class ClientProxy : ClientProxyBase where TClient : ServiceClient diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/ClientProxyBase.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/ClientProxyBase.cs similarity index 99% rename from src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/ClientProxyBase.cs rename to src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/ClientProxyBase.cs index ed9b9744bce1..8e27685ab5b2 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/ClientProxyBase.cs +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/ClientProxyBase.cs @@ -22,7 +22,7 @@ using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models; using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties; -namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS +namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS { public class ClientProxyBase { diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Commands.RecoveryServices.Backup.HydraAdapter.csproj b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/Commands.RecoveryServices.Backup.ServiceClientAdapter.csproj similarity index 96% rename from src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Commands.RecoveryServices.Backup.HydraAdapter.csproj rename to src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/Commands.RecoveryServices.Backup.ServiceClientAdapter.csproj index f1393db4f58c..eb37849a409c 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Commands.RecoveryServices.Backup.HydraAdapter.csproj +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/Commands.RecoveryServices.Backup.ServiceClientAdapter.csproj @@ -7,8 +7,8 @@ {B758FEC1-35C1-4F93-A954-66DD33F6E0EC} Library Properties - Microsoft.Azure.Commands.RecoveryServices.Backup.HydraAdapter - Microsoft.Azure.Commands.RecoveryServices.Backup.HydraAdapter + Microsoft.Azure.Commands.RecoveryServices.Backup.ServiceClientAdapter + Microsoft.Azure.Commands.RecoveryServices.Backup.ServiceClientAdapter v4.5 512 @@ -66,7 +66,7 @@ - + @@ -88,7 +88,9 @@ - + + Designer +