Skip to content

Mkherani swagger #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 27, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -485,4 +485,10 @@ Please contact Microsoft for further assistant.</value>
<data name="GetContainerNameParamDeprecated" xml:space="preserve">
<value>Name parameter will be deprecated. Please use FriendlyName instead for filtering by name.</value>
</data>
<data name="GetRPErrorStartTimeShouldBeLessThanUTCNow" xml:space="preserve">
<value>Start date\time should be less than current UTC date\time</value>
</data>
<data name="JobStartTimeShouldBeLessThanCurrent" xml:space="preserve">
<value>From date should be less than current UTC time</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,49 @@ function Test-GetAzureVMRecoveryPointsScenario
-RecoveryPointId $recoveryPoint[0].RecoveryPointId -Item $item;

Assert-NotNull $recoveryPointDetail;


#Negative test case
# # StartDate < EndDate
# $failed = 0
# try
# {
# $recoveryPoint = Get-AzureRmRecoveryServicesBackupRecoveryPoint `
# -StartDate $backupEndTime -EndDate $backupStartTime -Item $item
# $failed = 0
# }
# catch
# {
# $failed = 1
# }
# Assert-AreEqual $failed 1
#
# # rangeStart > DateTime.UtcNow
# try
# {
# $backupStartTime = (Get-Date).ToUniversalTime().AddMinutes(30)
# $recoveryPoint = Get-AzureRmRecoveryServicesBackupRecoveryPoint `
# -StartDate $backupStartTime -Item $item
# $failed = 0
# }
# catch
# {
# $failed = 1
# }
# Assert-AreEqual $failed 1
#
# # rangeStart.Kind != DateTimeKind.Utc
# try
# {
# $backupStartTime = (Get-Date).AddDays(-20)
# $recoveryPoint = Get-AzureRmRecoveryServicesBackupRecoveryPoint `
# -StartDate $backupStartTime -Item $item
# $failed = 0
# }
# catch
# {
# $failed = 1
# }
# Assert-AreEqual $failed 1
}

function Test-RestoreAzureVMRItemScenario
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,61 @@ function Test-GetJobsTimeFilter
Assert-AreEqual $job.StartTime.ToUniversalTime().CompareTo($startTime) 1
Assert-AreEqual $endTime.CompareTo($job.StartTime.ToUniversalTime()) 1
}

#Negative test case
# rangeEnd <= rangeStart
[bool] $failed = $false
try
{
$filteredJobs = Get-AzureRmRecoveryServicesBackupJob -From $endTime -To $startTime
$failed = $true
}
catch
{
$failed = $false
}
Assert-True $failed

# rangeStart.Kind != DateTimeKind.Utc
$startTime = (Get-Date).AddDays(-20)
try
{
$filteredJobs = Get-AzureRmRecoveryServicesBackupJob -From $startTime -To $endTime
$failed = $true
}
catch
{
$failed = $false
}
Assert-True $failed

#rangeEnd.Subtract(rangeStart) > TimeSpan.FromDays(30)
$startTime = (Get-Date).ToUniversalTime().AddDays(-40)
$endTime = (Get-Date).ToUniversalTime()
try
{
$filteredJobs = Get-AzureRmRecoveryServicesBackupJob -From $startTime -To $endTime
$failed = $true
}
catch
{
$failed = $false
}
Assert-True $failed

#rangeStart > DateTime.UtcNow
$startTime = (Get-Date).ToUniversalTime().AddDays(2)
$endTime = (Get-Date).ToUniversalTime().AddDays(5)
try
{
$filteredJobs = Get-AzureRmRecoveryServicesBackupJob -From $startTime -To $endTime
$failed = $true
}
catch
{
$failed = $false
}
Assert-True $failed
}

function Test-GetJobsStatusFilter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ public override void ExecuteCmdlet()
{
throw new Exception(Resources.JobAllowedDateTimeRangeExceeded);
}
else if(rangeStart > DateTime.UtcNow)
{
throw new Exception(Resources.JobStartTimeShouldBeLessThanCurrent);
}

// validate JobId and Job objects
if (!string.IsNullOrEmpty(JobId))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@ public override void ExecuteCmdlet()
throw new ArgumentException(Resources.GetRPErrorInputDatesShouldBeInUTC);
}

if(rangeStart > DateTime.UtcNow)
{
throw new ArgumentException(Resources.GetRPErrorStartTimeShouldBeLessThanUTCNow);
}

parameter.Add(RecoveryPointParams.StartDate, rangeStart);
parameter.Add(RecoveryPointParams.EndDate, rangeEnd);
PsBackupProviderManager providerManager =
Expand Down