Incorporating changes from comments of PR

Author: AditTulasi

src/ResourceManager/RecoveryServices.Backup/CmdletWarningAndErrorMessages.cs

@@ -17,6 +17,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
 {
@@ -79,11 +80,11 @@ public override void ExecuteCmdlet()
                 // validate filters
                 if (rangeEnd <= rangeStart)
                 {
-                    throw new Exception(CmdletWarningAndErrorMessages.Job.ToShouldBeGreaterThanFrom);
+                    throw new Exception(Resources.JobToShouldBeGreaterThanFrom);
                 }
                 else if (rangeEnd.Subtract(rangeStart) > TimeSpan.FromDays(30))
                 {
-                    throw new Exception(CmdletWarningAndErrorMessages.Job.AllowedDateTimeRangeExceeded);
+                    throw new Exception(Resources.JobAllowedDateTimeRangeExceeded);
                 }
 
                 // validate JobId and Job objects
@@ -92,7 +93,7 @@ public override void ExecuteCmdlet()
                     // if JobId and Job are provided together and they don't match then throw exception
                     if (Job != null && JobId != Job.InstanceId)
                     {
-                        throw new Exception(CmdletWarningAndErrorMessages.Job.JobIdAndJobMismatch);
+                        throw new Exception(Resources.JobJobIdAndJobMismatch);
                     }
                 }
                 else if (Job != null)
@@ -115,7 +116,7 @@ public override void ExecuteCmdlet()
                     if (resultCount >= JobConstants.MaximumJobsToFetch)
                     {
                         // trace a warning that there are more jobs and user has to refine filters.
-                        WriteWarning(CmdletWarningAndErrorMessages.Job.RefineFilters);
+                        WriteWarning(Resources.JobRefineFilters);
                         break;
                     }
 

src/ResourceManager/RecoveryServices.Backup/Cmdlets/Jobs/GetAzureRmRecoveryServicesJob.cs

@@ -17,6 +17,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
 {
@@ -57,7 +58,7 @@ public override void ExecuteCmdlet()
                 else
                 {
                     // not a valid object. throw exception.
-                    throw new Exception(CmdletWarningAndErrorMessages.Job.WaitJobInvalidInput + Job.GetType().FullName);
+                    throw new Exception(string.Format(Resources.JobWaitJobInvalidInput, Job.GetType().FullName));
                 }
 
                 // now wait until timeout happens or all jobs complete execution

src/ResourceManager/RecoveryServices.Backup/Cmdlets/Jobs/WaitAzureRmRecoveryServicesJob.cs

@@ -81,7 +81,6 @@
     <Compile Include="Cmdlets\ProtectionPolicy\PolicyCmdletHelpers.cs" />
     <Compile Include="Cmdlets\ProtectionPolicy\SetAzureRmRecoveryServicesPolicy.cs" />
     <Compile Include="Cmdlets\ProtectionPolicy\NewAzureRmRecoveryServicesPolicy.cs" />
-    <Compile Include="CmdletWarningAndErrorMessages.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="Cmdlets\RecoveryPoint\GetAzureRMRecoveryServicesRecoveryPoint.cs" />
     <Compile Include="Cmdlets\Restore\RestoreAzureRMRecoveryServicesBackupItem.cs" />

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

@@ -264,4 +264,19 @@
   <data name="UpdateToNewAzurePowershellWarning" xml:space="preserve">
     <value>Data truncated. Please upgrade to latest version of Azure Powershell</value>
   </data>
+  <data name="JobAllowedDateTimeRangeExceeded" xml:space="preserve">
+    <value>To filter should not be more than 30 days away from From filter.</value>
+  </data>
+  <data name="JobJobIdAndJobMismatch" xml:space="preserve">
+    <value>JobID and Job object provided don't match each other.</value>
+  </data>
+  <data name="JobRefineFilters" xml:space="preserve">
+    <value>There are more than 1000 jobs for the filter combination you have provided. Kindly refine your filters to fetch the job you want.</value>
+  </data>
+  <data name="JobToShouldBeGreaterThanFrom" xml:space="preserve">
+    <value>To filter should not be less than From filter.</value>
+  </data>
+  <data name="JobWaitJobInvalidInput" xml:space="preserve">
+    <value>Please pass Job or List of Jobs as input. Your input is of type: {0}</value>
+  </data>
 </root>

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.Designer.cs

@@ -26,6 +26,10 @@
 using System.Text;
 using System.Threading.Tasks;
 using HydraAdapterNS = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
+using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
+using System.Threading;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
 {
@@ -34,6 +38,9 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     /// </summary>
     public abstract class RecoveryServicesBackupCmdletBase : AzureRMCmdlet
     {
+        // in seconds
+        private int _defaultSleepForOperationTracking = 15;
+
         protected HydraAdapterNS.HydraAdapter HydraAdapter { get; set; }
 
         protected void InitializeAzureBackupCmdlet()
@@ -119,5 +126,36 @@ public override void ExecuteCmdlet()
 
             InitializeAzureBackupCmdlet();
         }
+
+        public AzureRmRecoveryServicesJobBase GetJobObject(string jobId)
+        {
+            return JobConversions.GetPSJob(HydraAdapter.GetJob(jobId));
+        }
+
+        public List<AzureRmRecoveryServicesJobBase> GetJobObject(List<string> jobIds)
+        {
+            List<AzureRmRecoveryServicesJobBase> result = new List<AzureRmRecoveryServicesJobBase>();
+            foreach (string jobId in jobIds)
+            {
+                result.Add(GetJobObject(jobId));
+            }
+            return result;
+        }
+
+        public BackUpOperationStatusResponse WaitForOperation(string url)
+        {
+            // using this directly because it doesn't matter which function we use.
+            // return type is same and currently we are using it in only two places.
+            // protected item and policy.
+            BackUpOperationStatusResponse response = HydraAdapter.GetProtectedItemOperationStatusByURL(url);
+
+            while (response.OperationStatus.Status == OperationStatusValues.InProgress.ToString())
+            {
+                Thread.Sleep(_defaultSleepForOperationTracking * 1000);
+                response = HydraAdapter.GetProtectedItemOperationStatusByURL(url);
+            }
+
+            return response;
+        }
     }
 }