Renaming InstanceId to JobId in Job object

Author: AditTulasi

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 = GetLastIdFromFullId(hydraJob.Id);
+            response.JobId = GetLastIdFromFullId(hydraJob.Id);
             response.StartTime = vmJob.StartTime;
             response.EndTime = vmJob.EndTime;
             response.Duration = vmJob.Duration;

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/BaseObjects.cs

@@ -244,7 +244,7 @@ public class AzureRmRecoveryServicesJobBase : AzureRmRecoveryServicesBackupManag
     {
         public string ActivityId { get; set; }
 
-        public string InstanceId { get; set; }
+        public string JobId { get; set; }
 
         public string Operation { get; set; }
 

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/JobTests.ps1

@@ -30,7 +30,7 @@ function Test-GetJobsScenario
 	$jobs = Get-AzureRmRecoveryServicesBackupJob -From $fixedStartDate -To $fixedEndDate
 	foreach ($job in $jobs)
 	{
-		Assert-NotNull $job.InstanceId
+		Assert-NotNull $job.JobId
 		Assert-NotNull $job.Operation
 		Assert-NotNull $job.Status
 		Assert-NotNull $job.WorkloadName
@@ -111,10 +111,10 @@ function Test-GetJobDetails
 	foreach ($job in $jobs)
 	{
 		$jobDetails = Get-AzureRmRecoveryServicesBackupJobDetails -Job $job;
-		$jobDetails2 = Get-AzureRmRecoveryServicesBackupJobDetails -JobId $job.InstanceId
+		$jobDetails2 = Get-AzureRmRecoveryServicesBackupJobDetails -JobId $job.JobId
 
-		Assert-AreEqual $jobDetails.InstanceId $job.InstanceId
-		Assert-AreEqual $jobDetails2.InstanceId $job.InstanceId
+		Assert-AreEqual $jobDetails.JobId $job.JobId
+		Assert-AreEqual $jobDetails2.JobId $job.JobId
 
 		break;
 	}

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

@@ -99,14 +99,14 @@ public override void ExecuteCmdlet()
                 if (!string.IsNullOrEmpty(JobId))
                 {
                     // if JobId and Job are provided together and they don't match then throw exception
-                    if (Job != null && JobId != Job.InstanceId)
+                    if (Job != null && JobId != Job.JobId)
                     {
                         throw new Exception(Resources.JobJobIdAndJobMismatch);
                     }
                 }
                 else if (Job != null)
                 {
-                    JobId = Job.InstanceId;
+                    JobId = Job.JobId;
                 }
 
                 List<AzureRmRecoveryServicesJobBase> result = new List<AzureRmRecoveryServicesJobBase>();

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Jobs/GetAzureRmRecoveryServicesJobDetails.cs

@@ -40,7 +40,7 @@ public override void ExecuteCmdlet()
 
                 if (ParameterSetName == JobFilterSet)
                 {
-                    JobId = Job.InstanceId;
+                    JobId = Job.JobId;
                 }
 
                 WriteDebug("Fetching job with ID: " + JobId);

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

@@ -46,7 +46,7 @@ public override void ExecuteCmdlet()
 
                 if (ParameterSetName == JobFilterSet)
                 {
-                    JobId = Job.InstanceId;
+                    JobId = Job.JobId;
                 }
 
                 WriteDebug("Stopping job with ID: " + JobId);

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

@@ -46,14 +46,14 @@ public override void ExecuteCmdlet()
                 if (GetCastedObjFromPSObj<AzureRmRecoveryServicesJobBase>(Job, out castedObj))
                 {
                     AzureRmRecoveryServicesJobBase justJob = castedObj as AzureRmRecoveryServicesJobBase;
-                    jobsToWaitOn.Add(justJob.InstanceId);
+                    jobsToWaitOn.Add(justJob.JobId);
                 }
                 else if (GetCastedObjFromPSObj<List<AzureRmRecoveryServicesJobBase>>(Job, out castedObj))
                 {
                     List<AzureRmRecoveryServicesJobBase> jobsList = castedObj as List<AzureRmRecoveryServicesJobBase>;
                     foreach (var job in jobsList)
                     {
-                        jobsToWaitOn.Add(job.InstanceId);
+                        jobsToWaitOn.Add(job.JobId);
                     }
                 }
                 else if (Job.GetType() == typeof(System.Object[]))
@@ -64,7 +64,7 @@ public override void ExecuteCmdlet()
                     {
                         if (GetCastedObjFromPSObj<AzureRmRecoveryServicesJobBase>(job, out castedJob))
                         {
-                            jobsToWaitOn.Add((castedJob as AzureRmRecoveryServicesJobBase).InstanceId);
+                            jobsToWaitOn.Add((castedJob as AzureRmRecoveryServicesJobBase).JobId);
                         }
                         else
                         {