Skip to content

Commit f86b565

Browse files
committed
Removed status filter from Get-AzRecoveryServicesBackupContainer command
1 parent fcca561 commit f86b565

File tree

3 files changed

+10
-32
lines changed

3 files changed

+10
-32
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ public enum ContainerRegistrationStatus
199199
/// Represents the registered state of the container with the recovery services vault.
200200
/// </summary>
201201
Registered = 1,
202+
NotRegistered = 2,
202203
}
203204

204205
/// <summary>

src/RecoveryServices/RecoveryServices.Backup.Providers/AzureWorkloadProviderHelper.cs

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -340,28 +340,13 @@ public List<ProtectedItemResource> ListProtectedItemsByContainer(
340340
{
341341
string vaultName = (string)providerData[CmdletModel.VaultParams.VaultName];
342342
string vaultResourceGroupName = (string)providerData[CmdletModel.VaultParams.ResourceGroupName];
343-
string friendlyName = (string)providerData[CmdletModel.ContainerParams.FriendlyName];
344-
CmdletModel.ContainerRegistrationStatus status =
345-
(CmdletModel.ContainerRegistrationStatus)providerData[CmdletModel.ContainerParams.Status];
343+
string friendlyName = (string)providerData[CmdletModel.ContainerParams.FriendlyName];
346344

347345
string nameQueryFilter = friendlyName;
348-
349-
ODataQuery<ServiceClientModel.BMSContainerQueryObject> queryParams = null;
350-
if (status == 0)
351-
{
352-
queryParams = new ODataQuery<ServiceClientModel.BMSContainerQueryObject>(
346+
ODataQuery<ServiceClientModel.BMSContainerQueryObject> queryParams = new ODataQuery<ServiceClientModel.BMSContainerQueryObject>(
353347
q => q.FriendlyName == nameQueryFilter &&
354348
q.BackupManagementType == backupManagementType);
355-
}
356-
else
357-
{
358-
var statusString = status.ToString();
359-
queryParams = new ODataQuery<ServiceClientModel.BMSContainerQueryObject>(
360-
q => q.FriendlyName == nameQueryFilter &&
361-
q.BackupManagementType == backupManagementType &&
362-
q.Status == statusString);
363-
}
364-
349+
365350
var listResponse = ServiceClientAdapter.ListContainers(
366351
queryParams,
367352
vaultName: vaultName,

src/RecoveryServices/RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesBackupContainer.cs

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,7 @@ public class GetAzureRmRecoveryServicesBackupContainer : RSBackupVaultCmdletBase
5858
HelpMessage = ParamHelpMsgs.Container.ResourceGroupName)]
5959
[ResourceGroupCompleter]
6060
[ValidateNotNullOrEmpty]
61-
public string ResourceGroupName { get; set; }
62-
63-
/// <summary>
64-
/// Status of the registration of the container with the recovery services vault.
65-
/// </summary>
66-
[Parameter(Mandatory = false, Position = 5,
67-
HelpMessage = ParamHelpMsgs.Container.Status)]
68-
[ValidateNotNullOrEmpty]
69-
public ContainerRegistrationStatus Status { get; set; }
61+
public string ResourceGroupName { get; set; }
7062

7163
public override void ExecuteCmdlet()
7264
{
@@ -86,9 +78,10 @@ public override void ExecuteCmdlet()
8678
backupManagementTypeNullable = backupManagementType;
8779
}
8880

89-
// Forcing this cmdlet to return only Registered containers for now.
90-
// Once we support containers returning other status types, one can undo this behavior.
91-
Status = ContainerRegistrationStatus.Registered;
81+
// Currently the containers API doesn't support any status level filtering
82+
// Also the NotRegitered container isn't a valid scenario, so we're not allowing client filtering too
83+
// If the filtering is required in future we can add client side filtering
84+
// Status = ContainerRegistrationStatus.Registered;
9285

9386
PsBackupProviderManager providerManager =
9487
new PsBackupProviderManager(new Dictionary<Enum, object>()
@@ -98,8 +91,7 @@ public override void ExecuteCmdlet()
9891
{ ContainerParams.ContainerType, ContainerType },
9992
{ ContainerParams.BackupManagementType, backupManagementTypeNullable },
10093
{ ContainerParams.FriendlyName, FriendlyName },
101-
{ ContainerParams.ResourceGroupName, ResourceGroupName },
102-
{ ContainerParams.Status, Status },
94+
{ ContainerParams.ResourceGroupName, ResourceGroupName },
10395
}, ServiceClientAdapter);
10496

10597
IPsBackupProvider psBackupProvider =

0 commit comments

Comments
 (0)