Skip to content

Commit cc6c69d

Browse files
author
dragonfly91
committed
Fix for bug "Change filter param from status to ProtectionState in get-item cmdlet"
1 parent 953fd5f commit cc6c69d

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/AzureVmModels/AzureRmRecoveryServicesAzureVmItem.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class AzureRmRecoveryServicesBackupIaasVmItem : AzureRmRecoveryServicesBa
3636
/// <summary>
3737
/// Protection State of the item
3838
/// </summary>
39-
public ItemStatus ProtectionState { get; set; }
39+
public ItemProtectionState ProtectionState { get; set; }
4040

4141
/// <summary>
4242
/// Last Backup Status for the item
@@ -60,7 +60,7 @@ public AzureRmRecoveryServicesBackupIaasVmItem(ProtectedItemResource protectedIt
6060
AzureIaaSVMProtectedItem protectedItem = (AzureIaaSVMProtectedItem)protectedItemResource.Properties;
6161
LastBackupStatus = protectedItem.LastBackupStatus;
6262
ProtectionPolicyName = policyName;
63-
ProtectionState = EnumUtils.GetEnum<ItemStatus>(protectedItem.ProtectionState);
63+
ProtectionState = EnumUtils.GetEnum<ItemProtectionState>(protectedItem.ProtectionState);
6464
ProtectionStatus = EnumUtils.GetEnum<ItemProtectionStatus>(protectedItem.ProtectionStatus);
6565
VirtualMachineId = protectedItem.VirtualMachineId;
6666
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public enum ItemParams
7171
ParameterSetName,
7272
Container,
7373
ProtectionStatus,
74-
Status,
74+
ProtectionState,
7575
DeleteBackupData,
7676
ExpiryDate,
7777
}

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/Enums.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public enum ItemProtectionStatus
7272
Unhealthy,
7373
}
7474

75-
public enum ItemStatus
75+
public enum ItemProtectionState
7676
{
7777
IRPending = 1,
7878
ProtectionError,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public BaseRecoveryServicesJobResponse DisableProtection()
162162
}
163163

164164
properties.PolicyId = string.Empty;
165-
properties.ProtectionState = ItemStatus.ProtectionStopped.ToString();
165+
properties.ProtectionState = ItemProtectionState.ProtectionStopped.ToString();
166166

167167
ProtectedItemCreateOrUpdateRequest hydraRequest = new ProtectedItemCreateOrUpdateRequest()
168168
{
@@ -418,7 +418,7 @@ public List<AzureRmRecoveryServicesBackupItemBase> ListProtectedItems()
418418
string name = (string)this.ProviderData.ProviderParameters[ItemParams.AzureVMName];
419419
ItemProtectionStatus protectionStatus =
420420
(ItemProtectionStatus)this.ProviderData.ProviderParameters[ItemParams.ProtectionStatus];
421-
ItemStatus status = (ItemStatus)this.ProviderData.ProviderParameters[ItemParams.Status];
421+
ItemProtectionState status = (ItemProtectionState)this.ProviderData.ProviderParameters[ItemParams.ProtectionState];
422422
Models.WorkloadType workloadType =
423423
(Models.WorkloadType)this.ProviderData.ProviderParameters[ItemParams.WorkloadType];
424424

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,23 @@ function Test-GetItemScenario
3737
Assert-AreEqual $item.Name "iaasvmcontainerv2;mkheranirmvm1;mkheranirmvm1";
3838

3939
# VAR-4: Get items for container with Status filter
40-
$item = Get-AzureRmRecoveryServicesBackupItem -Container $namedContainer -WorkloadType "AzureVM" -Status "IRPending";
40+
$item = Get-AzureRmRecoveryServicesBackupItem -Container $namedContainer -WorkloadType "AzureVM" -ProtectionState "IRPending";
4141
Assert-AreEqual $item.Name "iaasvmcontainerv2;mkheranirmvm1;mkheranirmvm1";
4242

4343
# VAR-5: Get items for container with friendly name and ProtectionStatus filters
4444
$item = Get-AzureRmRecoveryServicesBackupItem -Container $namedContainer -WorkloadType "AzureVM" -Name "mkheraniRMVM1" -ProtectionStatus "Healthy";
4545
Assert-AreEqual $item.Name "iaasvmcontainerv2;mkheranirmvm1;mkheranirmvm1";
4646

4747
# VAR-6: Get items for container with friendly name and Status filters
48-
$item = Get-AzureRmRecoveryServicesBackupItem -Container $namedContainer -WorkloadType "AzureVM" -Name "mkheraniRMVM1" -Status "IRPending";
48+
$item = Get-AzureRmRecoveryServicesBackupItem -Container $namedContainer -WorkloadType "AzureVM" -Name "mkheraniRMVM1" -ProtectionState "IRPending";
4949
Assert-AreEqual $item.Name "iaasvmcontainerv2;mkheranirmvm1;mkheranirmvm1";
5050

5151
# VAR-7: Get items for container with Status and ProtectionStatus filters
52-
$item = Get-AzureRmRecoveryServicesBackupItem -Container $namedContainer -WorkloadType "AzureVM" -Status "IRPending" -ProtectionStatus "Healthy";
52+
$item = Get-AzureRmRecoveryServicesBackupItem -Container $namedContainer -WorkloadType "AzureVM" -ProtectionState "IRPending" -ProtectionStatus "Healthy";
5353
Assert-AreEqual $item.Name "iaasvmcontainerv2;mkheranirmvm1;mkheranirmvm1";
5454

5555
# VAR-8: Get items for container with friendly name, Status and ProtectionStatus filters
56-
$item = Get-AzureRmRecoveryServicesBackupItem -Container $namedContainer -WorkloadType "AzureVM" -Name "mkheraniRMVM1" -Status "IRPending" -ProtectionStatus "Healthy";
56+
$item = Get-AzureRmRecoveryServicesBackupItem -Container $namedContainer -WorkloadType "AzureVM" -Name "mkheraniRMVM1" -ProtectionState "IRPending" -ProtectionStatus "Healthy";
5757
Assert-AreEqual $item.Name "iaasvmcontainerv2;mkheranirmvm1;mkheranirmvm1";
5858
}
5959

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Item/GetAzureRmRecoveryServicesItem.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class GetAzureRmRecoveryServicesBackupItem : RecoveryServicesBackupCmdlet
4343

4444
[Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Item.Status)]
4545
[ValidateNotNullOrEmpty]
46-
public ItemStatus Status { get; set; }
46+
public ItemProtectionState ProtectionState { get; set; }
4747

4848
[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Common.WorkloadType)]
4949
[ValidateNotNullOrEmpty]
@@ -60,7 +60,7 @@ public override void ExecuteCmdlet()
6060
{ItemParams.Container, Container},
6161
{ItemParams.AzureVMName, Name},
6262
{ItemParams.ProtectionStatus, ProtectionStatus},
63-
{ItemParams.Status, Status},
63+
{ItemParams.ProtectionState, ProtectionState},
6464
{ItemParams.WorkloadType, WorkloadType},
6565
}, HydraAdapter);
6666

0 commit comments

Comments
 (0)