Renamed all occurences of Hydra to ServiceClient

Author: dragonfly91

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Commands.RecoveryServices.Backup.Helpers.csproj

@@ -57,18 +57,14 @@
     <Compile Include="Conversions\SchedulePolicyConversions.cs" />
     <Compile Include="Conversions\RetentionPolicyConversions.cs" />
     <Compile Include="Conversions\ConversionHelpers.cs" />
-    <Compile Include="HydraHelpers.cs" />
+    <Compile Include="ServiceClientHelpers.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
       <Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
       <Name>Commands.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Commands.RecoveryServices.Backup.HydraAdapter\Commands.RecoveryServices.Backup.HydraAdapter.csproj">
-      <Project>{b758fec1-35c1-4f93-a954-66dd33f6e0ec}</Project>
-      <Name>Commands.RecoveryServices.Backup.HydraAdapter</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Commands.RecoveryServices.Backup.Logger\Commands.RecoveryServices.Backup.Logger.csproj">
       <Project>{5e675749-6139-464a-904c-59c0ffdfec82}</Project>
       <Name>Commands.RecoveryServices.Backup.Logger</Name>

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs

@@ -93,32 +93,32 @@ public static List<AzureRmRecoveryServicesBackupEngineBase> 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<AzureRmRecoveryServicesBackupPolicyBase> 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<AzureRmRecoveryServicesBackupPolicyBase> GetPolicyModelList(
             List<AzureRmRecoveryServicesBackupPolicyBase> policyModels = new List<AzureRmRecoveryServicesBackupPolicyBase>();
             AzureRmRecoveryServicesBackupPolicyBase policyModel = null;
 
-            foreach (ProtectionPolicyResource resource in hydraListResponse.ItemList.Value)
+            foreach (ProtectionPolicyResource resource in serviceClientListResponse.ItemList.Value)
             {
                 policyModel = GetPolicyModel(resource);
                 if (policyModel != null)

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
 
         /// <summary>
         /// 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.
         /// </summary>
-        /// <param name="hydraJob"></param>
+        /// <param name="ServiceClientJob"></param>
         /// <returns></returns>
-        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<CmdletModel.AzureRmRecoveryServicesBackupJobBase> psJobs, ref int jobsCount)
+        public static void AddServiceClientJobsToPSList(JobListResponse serviceClientJobs, List<CmdletModel.AzureRmRecoveryServicesBackupJobBase> 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<CmdletMo
 
         #region AzureVm job private helpers
 
-        private static CmdletModel.AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJob(JobResource hydraJob)
+        private static CmdletModel.AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJob(JobResource serviceClientJob)
         {
             CmdletModel.AzureRmRecoveryServicesBackupAzureVmJob response;
 
-            AzureIaaSVMJob vmJob = hydraJob.Properties as AzureIaaSVMJob;
+            AzureIaaSVMJob vmJob = serviceClientJob.Properties as AzureIaaSVMJob;
 
             if (vmJob.ExtendedInfo != null)
             {
@@ -87,7 +87,7 @@ private static CmdletModel.AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJ
                 response = new CmdletModel.AzureRmRecoveryServicesBackupAzureVmJob();
             }
 
-            response.JobId = GetLastIdFromFullId(hydraJob.Id);
+            response.JobId = GetLastIdFromFullId(serviceClientJob.Id);
             response.StartTime = vmJob.StartTime;
             response.EndTime = vmJob.EndTime;
             response.Duration = vmJob.Duration;
@@ -140,15 +140,15 @@ private static CmdletModel.AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJ
             return response;
         }
 
-        private static CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobErrorInfo GetPSAzureVmErrorInfo(AzureIaaSVMErrorInfo hydraError)
+        private static CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobErrorInfo GetPSAzureVmErrorInfo(AzureIaaSVMErrorInfo serviceClientError)
         {
             CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobErrorInfo psErrorInfo = new CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobErrorInfo();
-            psErrorInfo.ErrorCode = hydraError.ErrorCode;
-            psErrorInfo.ErrorMessage = hydraError.ErrorString;
-            if (hydraError.Recommendations != null)
+            psErrorInfo.ErrorCode = serviceClientError.ErrorCode;
+            psErrorInfo.ErrorMessage = serviceClientError.ErrorString;
+            if (serviceClientError.Recommendations != null)
             {
                 psErrorInfo.Recommendations = new List<string>();
-                psErrorInfo.Recommendations.AddRange(hydraError.Recommendations);
+                psErrorInfo.Recommendations.AddRange(serviceClientError.Recommendations);
             }
 
             return psErrorInfo;