Skip to content

Commit 1e0021e

Browse files
author
dragonfly91
committed
Backup Item fixes and test
1 parent 2943f57 commit 1e0021e

File tree

4 files changed

+21
-6
lines changed

4 files changed

+21
-6
lines changed

src/ResourceManager/RecoveryServices.Backup/Cmdlets/Item/BackupAzureRmRecoveryServicesItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class BackupAzureRmRecoveryServicesItem : RecoveryServicesBackupCmdletBas
3333
[ValidateNotNullOrEmpty]
3434
public AzureRmRecoveryServicesItemBase Item { get; set; }
3535

36-
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Item.ExpiryDate, ValueFromPipeline = false)]
36+
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Item.ExpiryDate, ValueFromPipeline = false)]
3737
[ValidateNotNullOrEmpty]
3838
public DateTime ExpiryDate { get; set; }
3939

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderManager.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ public IPsBackupProvider GetProviderInstance(ContainerType containerType, Backup
4242
switch (containerType)
4343
{
4444
case ContainerType.AzureVM:
45-
if (backupManagementType.HasValue && backupManagementType != BackupManagementType.AzureVM)
46-
{
47-
throw new ArgumentException("BackupManagementType is not expected for ContainerType: " +
48-
containerType.ToString());
49-
}
5045
providerType = PsBackupProviderTypes.IaasVm;
5146
break;
5247
case ContainerType.Windows:

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ItemTests.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,11 @@ public void TestGetItemScenario()
3131
{
3232
this.RunPowerShellTest(PsBackupProviderTypes.IaasVm.ToString(), "Test-GetItemScenario");
3333
}
34+
35+
[Fact]
36+
public void TestBackupItemScenario()
37+
{
38+
this.RunPowerShellTest(PsBackupProviderTypes.IaasVm.ToString(), "Test-BackupItemScenario");
39+
}
3440
}
3541
}

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,18 @@ function Test-GetItemScenario
2222

2323
$item = Get-AzureRmRecoveryServicesItem -Container $namedContainer -WorkloadType "AzureVM";
2424
echo $item.Name;
25+
}
26+
27+
function Test-BackupItemScenario
28+
{
29+
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "pstestrg" -Name "pstestrsvault";
30+
Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
31+
32+
$namedContainer = Get-AzureRmRecoveryServicesContainer -ContainerType "AzureVM" -Status "Registered" -Name "pstestv2vm1";
33+
Assert-AreEqual $namedContainer.FriendlyName "pstestv2vm1";
34+
35+
$item = Get-AzureRmRecoveryServicesItem -Container $namedContainer -WorkloadType "AzureVM";
36+
echo $item.Name;
37+
38+
Backup-AzureRmRecoveryServicesItem -Item $item;
2539
}

0 commit comments

Comments
 (0)