Skip to content

Commit 8afc54b

Browse files
committed
Added AFS support to stop job
1 parent a102d8f commit 8afc54b

File tree

3 files changed

+45
-1
lines changed

3 files changed

+45
-1
lines changed

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/AzureFiles/JobTests.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@ public void TestAzureFileJob()
3030
_logger, PsBackupProviderTypes.AzureFiles, "Test-AzureFileJob");
3131
}
3232

33+
[Fact]
34+
[Trait(Category.AcceptanceType, Category.CheckIn)]
35+
[Trait(TestConstants.Workload, TestConstants.AzureFile)]
36+
public void TestAzureFileCancelJob()
37+
{
38+
TestController.NewInstance.RunPsTest(
39+
_logger, PsBackupProviderTypes.AzureFiles, "Test-AzureFileCancelJob");
40+
}
41+
3342
[Fact]
3443
[Trait(Category.AcceptanceType, Category.CheckIn)]
3544
[Trait(TestConstants.Workload, TestConstants.AzureFile)]

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,39 @@ function Test-AzureFileWaitJob
7676
{
7777
# Cleanup
7878
}
79+
}
80+
81+
function Test-AzureFileCancelJob
82+
{
83+
$location = "westus"
84+
$resourceGroupName = "sisi-RSV"
85+
86+
try
87+
{
88+
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName $resourceGroupName -Name "sisi-RSV-29-6"
89+
$container = Get-AzureRmRecoveryServicesBackupContainer `
90+
-VaultId $vault.ID `
91+
-ContainerType AzureStorage `
92+
-Status Registered `
93+
-FriendlyName "sisisa";
94+
$item = Get-AzureRmRecoveryServicesBackupItem `
95+
-VaultId $vault.ID `
96+
-Container $container[16] `
97+
-WorkloadType AzureFiles `
98+
-Name "sharetest"
99+
100+
$backupJob = Backup-AzureRmRecoveryServicesBackupItem `
101+
-VaultId $vault.ID `
102+
-Item $item[0]
103+
104+
Assert-True { $backupJob.Status -eq "InProgress" }
105+
106+
$cancelledJob = Stop-AzureRmRecoveryServicesBackupJob -VaultId $vault.ID -Job $backupJob
107+
108+
Assert-True { $cancelledJob.Status -ne "InProgress" }
109+
}
110+
finally
111+
{
112+
# Cleanup
113+
}
79114
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
2626
/// Cancels a job. Returns the corresponding job object after the trigger of the cancellation finishes.
2727
/// The job may not cancel successfully. The cmdlet will ensure that the service is notified that a cancellation has been triggered.
2828
/// </summary>
29-
[Cmdlet("Stop", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "RecoveryServicesBackupJob", DefaultParameterSetName = JobFilterSet,SupportsShouldProcess = true), OutputType(typeof(JobBase))]
29+
[Cmdlet("Stop", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "RecoveryServicesBackupJob", DefaultParameterSetName = JobFilterSet, SupportsShouldProcess = true), OutputType(typeof(JobBase))]
3030
public class StopAzureRmRecoveryServicesBackupJob : RSBackupVaultCmdletBase
3131
{
3232
protected const string IdFilterSet = "IdFilterSet";

0 commit comments

Comments
 (0)