Skip to content

Commit a20a16c

Browse files
committed
Merge pull request #262 from MabOneSdk/adit-dev1-jobsrecordings
Included recordings of jobs. Fixed few bugs in jobs area.
2 parents 6ea2093 + 107bfa1 commit a20a16c

File tree

12 files changed

+483
-2246
lines changed

12 files changed

+483
-2246
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private static AzureRmRecoveryServicesAzureVmJob GetPSAzureVmJob(JobResource hyd
8787
}
8888

8989
response.InstanceId = GetLastIdFromFullId(hydraJob.Id);
90-
response.StartTime = vmJob.StartTime.ToLocalTime();
90+
response.StartTime = vmJob.StartTime;
9191
response.EndTime = vmJob.EndTime;
9292
response.Duration = vmJob.Duration;
9393
response.Status = vmJob.Status;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
# ----------------------------------------------------------------------------------
1414

1515
#Have to hard-code this because time keeps changing with every run and we cannot use recorded sessions
16-
$fixedStartDate = Get-Date -Date "2016-04-12 22:00:00"
16+
$fixedStartDate = Get-Date -Date "2016-04-13 22:00:00"
1717
$fixedStartDate = $fixedStartDate.ToUniversalTime()
18-
$fixedEndDate = Get-Date -Date "2016-04-13 20:00:00"
18+
$fixedEndDate = Get-Date -Date "2016-04-14 16:00:00"
1919
$fixedEndDate = $fixedEndDate.ToUniversalTime()
2020

2121
function SetVaultContext
@@ -57,8 +57,8 @@ function Test-GetJobsTimeFilter
5757
{
5858
echo $job.StartTime;
5959

60-
Assert-AreEqual $job.StartTime.CompareTo($startTime) 1
61-
Assert-AreEqual $endTime.CompareTo($job.StartTime) 1
60+
Assert-AreEqual $job.StartTime.ToUniversalTime().CompareTo($startTime) 1
61+
Assert-AreEqual $endTime.CompareTo($job.StartTime.ToUniversalTime()) 1
6262
}
6363
}
6464

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.JobTests/TestCancelJobScenario.json

Lines changed: 70 additions & 73 deletions
Large diffs are not rendered by default.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.JobTests/TestGetJobDetails.json

Lines changed: 61 additions & 70 deletions
Large diffs are not rendered by default.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.JobTests/TestGetJobs.json

Lines changed: 37 additions & 40 deletions
Large diffs are not rendered by default.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.JobTests/TestGetJobsBackupManagementTypeFilter.json

Lines changed: 37 additions & 40 deletions
Large diffs are not rendered by default.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.JobTests/TestGetJobsOperationFilter.json

Lines changed: 37 additions & 40 deletions
Large diffs are not rendered by default.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.JobTests/TestGetJobsStatusFilter.json

Lines changed: 37 additions & 40 deletions
Large diffs are not rendered by default.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.JobTests/TestGetJobsTimeFilter.json

Lines changed: 37 additions & 40 deletions
Large diffs are not rendered by default.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.JobTests/TestWaitJobPipeScenario.json

Lines changed: 61 additions & 646 deletions
Large diffs are not rendered by default.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.JobTests/TestWaitJobScenario.json

Lines changed: 85 additions & 1252 deletions
Large diffs are not rendered by default.

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,22 @@ public override void ExecuteCmdlet()
5656
jobsToWaitOn.Add(job.InstanceId);
5757
}
5858
}
59+
else if (Job.GetType() == typeof(System.Object[]))
60+
{
61+
System.Object[] castedJobsList = Job as System.Object[];
62+
object castedJob;
63+
foreach (var job in castedJobsList)
64+
{
65+
if (GetCastedObjFromPSObj<AzureRmRecoveryServicesJobBase>(job, out castedJob))
66+
{
67+
jobsToWaitOn.Add((castedJob as AzureRmRecoveryServicesJobBase).InstanceId);
68+
}
69+
else
70+
{
71+
throw new Exception(string.Format(Resources.JobWaitJobInvalidInput, Job.GetType().FullName));
72+
}
73+
}
74+
}
5975
else
6076
{
6177
// not a valid object. throw exception.

0 commit comments

Comments
 (0)