Implementation of Stop-Job cmdlet

Author: AditTulasi

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

@@ -15,8 +15,11 @@
 using System;
 using System.Collections.Generic;
 using System.Management.Automation;
+using System.Net;
+using System.Threading;
 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
 {
@@ -46,14 +49,23 @@ public override void ExecuteCmdlet()
                 }
 
                 var cancelResponse = HydraAdapter.CancelJob(JobId);
+                string opId = HydraHelpers.GetLastIdFromFullId(cancelResponse.Location);
+                var cancelStatus = HydraAdapter.GetJobOperationStatus(JobId, opId);
 
-                while (cancelResponse.StatusCode == System.Net.HttpStatusCode.Accepted)
+                while (cancelStatus.StatusCode == HttpStatusCode.Accepted)
                 {
-
+                    Thread.Sleep(15 * 1000);
+                    cancelStatus = HydraAdapter.GetJobOperationStatus(JobId, opId);
                 }
 
-                var adapterResponse = HydraAdapter.GetJob(JobId);
-                WriteObject(JobConversions.GetPSJob(adapterResponse));
+                if (cancelStatus.StatusCode != HttpStatusCode.NoContent)
+                {
+                    throw new Exception(string.Format(Resources.JobCouldNotCancelJob, cancelStatus.StatusCode.ToString()));
+                }
+                else
+                {
+                    WriteObject(JobConversions.GetPSJob(cancelStatus.Item));
+                }
             });
         }
     }

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

@@ -86,7 +86,7 @@ private static AzureRmRecoveryServicesAzureVmJob GetPSAzureVmJob(JobResource hyd
                 response = new AzureRmRecoveryServicesAzureVmJob();
             }
 
-            response.InstanceId = GetJobIdFromFullId(hydraJob.Id);
+            response.InstanceId = GetLastIdFromFullId(hydraJob.Id);
             response.StartTime = vmJob.StartTime.ToLocalTime();
             if (vmJob.EndTime > new DateTime(2000, 1, 1))
             {
@@ -160,7 +160,7 @@ private static AzureRmRecoveryServicesAzureVmJobErrorInfo GetPSAzureVmErrorInfo(
             return psErrorInfo;
         }
 
-        private static string GetJobIdFromFullId(string fullId)
+        public static string GetLastIdFromFullId(string fullId)
         {
             string[] splitArr = fullId.Split("/".ToCharArray());
             return splitArr[splitArr.Length - 1];

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/HydraHelpers.cs

@@ -75,6 +75,20 @@ public static void GetSkipTokenFromNextLink(string url, out string nextLink)
             }
         }
 
+        /// <summary>
+        /// Use this function to get the last part of a URL.
+        /// Generally this is the ID of object or OperationId.
+        /// Note: This doesn't work if the string has any extra characters
+        /// after slash. (CSM ID's generally don't have)
+        /// </summary>
+        /// <param name="url"></param>
+        /// <returns></returns>
+        public static string GetLastIdFromFullId(string fullId)
+        {
+            string[] splitArr = fullId.Split("/".ToCharArray());
+            return splitArr[splitArr.Length - 1];
+        }
+
         public static string GetHydraContainerType(CmdletModel.ContainerType containerType)
         {
             string hydraContainerType = string.Empty;

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ContainerAPIs.cs

@@ -49,6 +49,5 @@ public BaseRecoveryServicesJobResponse RefreshContainers()
                 BmsAdapter.GetCustomRequestHeaders(), AzureFabricName, BmsAdapter.CmdletCancellationToken).Result;
             return response;
         }
-
     }
 }

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

@@ -267,6 +267,10 @@
   <data name="JobAllowedDateTimeRangeExceeded" xml:space="preserve">
     <value>To filter should not be more than 30 days away from From filter.</value>
   </data>
+  <data name="JobCouldNotCancelJob" xml:space="preserve">
+    <value>Failed to cancel the job. Error code: {0}</value>
+    <comment> </comment>
+  </data>
   <data name="JobJobIdAndJobMismatch" xml:space="preserve">
     <value>JobID and Job object provided don't match each other.</value>
   </data>

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.resx

@@ -38,6 +38,8 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     /// </summary>
     public abstract class RecoveryServicesBackupCmdletBase : AzureRMCmdlet
     {
+        public delegate BackUpOperationStatusResponse GetOpResponse(string url);
+
         // in seconds
         private int _defaultSleepForOperationTracking = 15;
 
@@ -142,12 +144,12 @@ public List<AzureRmRecoveryServicesJobBase> GetJobObject(List<string> jobIds)
             return result;
         }
 
-        public BackUpOperationStatusResponse WaitForOperation(string url)
+        public BackUpOperationStatusResponse WaitForOperation(string url, GetOpResponse hydraFunc)
         {
             // 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);
+            BackUpOperationStatusResponse response = hydraFunc(url);
 
             while (response.OperationStatus.Status == OperationStatusValues.InProgress.ToString())
             {