Added Filters and help message

Author: pikumarmsft16

src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletHelpMessage.cs

@@ -25,5 +25,6 @@ internal static class AzureBackupCmdletHelpMessage
         public const string ContainerId = "The container ID.";
         public const string ContainerRegistrationStatus = "The container registration status.";
         public const string ContainerType = "The container type.";
+        public const string ProtectionStatus = "Protection Status of item.";
     }
 }

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/GetAzureBackupItem.cs

@@ -18,6 +18,7 @@
 using System.Xml;
 using System.Linq;
 using Microsoft.Azure.Management.BackupServices.Models;
+using System.Runtime.Serialization;
 
 namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
 {
@@ -27,9 +28,9 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
     [Cmdlet(VerbsCommon.Get, "AzureBackupItem"), OutputType(typeof(AzureBackupItem), typeof(List<AzureBackupItem>))]
     public class GetAzureBackupItem : AzureBackupContainerCmdletBase
     {
-        [Parameter(Position = 2, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.PolicyName)]
+        [Parameter(Position = 2, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ProtectionStatus)]
         [ValidateNotNullOrEmpty]
-        public string Id { get; set; }
+        public protectionStatus ProtectionStatus { get; set; }
 
         public override void ExecuteCmdlet()
         {
@@ -39,23 +40,38 @@ public override void ExecuteCmdlet()
             {
                 WriteVerbose("Making client call");
 
-                var azureBackupDatasourceListResponse = AzureBackupClient.DataSource.ListAsync(GetCustomRequestHeaders(), CmdletCancellationToken).Result;
-                var azureBackupPOListResponse = AzureBackupClient.ProtectableObject. ListAsync(GetCustomRequestHeaders(), CmdletCancellationToken).Result;
+                DataSourceQueryParameter dsQueryParameter = new DataSourceQueryParameter()
+                {
+                    ContainerName = AzureBackupContainer.ContainerName
+                };
+
+                POQueryParameter pOQueryParameter = new POQueryParameter()
+                {
+                    Status = this.ProtectionStatus.ToString()
+                };
+
+                var azureBackupDatasourceListResponse = AzureBackupClient.DataSource.ListAsync(dsQueryParameter,GetCustomRequestHeaders(), CmdletCancellationToken).Result;
+                var azureBackupPOListResponse = AzureBackupClient.ProtectableObject. ListAsync(pOQueryParameter, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
 
                 WriteVerbose("Received policy response");
                 WriteVerbose("Received policy response2");
-                IEnumerable<DataSourceInfo> azureBackupDatasourceObjects = null;
-                IEnumerable<ProtectableObjectInfo> azureBackupPOObjects = null;
+                List<DataSourceInfo> azureBackupDatasourceObjects = null;
+                List<ProtectableObjectInfo> azureBackupPOObjects = null;
 
-                if (Id != null)
-                {
-                    azureBackupDatasourceObjects = azureBackupDatasourceListResponse.DataSources.Objects.Where(x => x.InstanceId.Equals(Id, System.StringComparison.InvariantCultureIgnoreCase));
-                    azureBackupPOObjects = azureBackupPOListResponse.ProtectableObject.Objects.Where(x => x.InstanceId.Equals(Id, System.StringComparison.InvariantCultureIgnoreCase));
-                }
-                else
+                azureBackupDatasourceObjects = azureBackupDatasourceListResponse.DataSources.Objects.ToList();
+                azureBackupPOObjects = azureBackupPOListResponse.ProtectableObject.Objects.Where(x => x.ContainerName.Equals(AzureBackupContainer.ContainerName, System.StringComparison.InvariantCultureIgnoreCase)).ToList();
+
+                //If user has stopped protection for some datasoure then we will have duplicate items(po and ds).
+                //So in this case removing  poitem.
+                foreach (var DSItem in azureBackupDatasourceObjects)
                 {
-                    azureBackupDatasourceObjects = azureBackupDatasourceListResponse.DataSources.Objects;
-                    azureBackupPOObjects = azureBackupPOListResponse.ProtectableObject.Objects;
+                    foreach(var POItem in azureBackupPOObjects)
+                    {
+                        if(DSItem.ProtectableObjectName == POItem.Name)
+                        {
+                            azureBackupPOObjects.Remove(POItem);
+                        }
+                    }
                 }
 
                 WriteVerbose("Converting response");
@@ -68,7 +84,7 @@ public void WriteAzureBackupProtectionPolicy(DataSourceInfo sourceItem, AzureBac
             this.WriteObject(new AzureBackupItem(sourceItem, azureBackupItem));
         }
 
-        public void WriteAzureBackupProtectionPolicy(IEnumerable<DataSourceInfo> sourceDataSourceList,IEnumerable<ProtectableObjectInfo> sourcePOList, AzureBackupContainer azureBackupContainer)
+        public void WriteAzureBackupProtectionPolicy(List<DataSourceInfo> sourceDataSourceList, List<ProtectableObjectInfo> sourcePOList, AzureBackupContainer azureBackupContainer)
         {
             List<AzureBackupItem> targetList = new List<AzureBackupItem>();
 
@@ -85,5 +101,13 @@ public void WriteAzureBackupProtectionPolicy(IEnumerable<DataSourceInfo> sourceD
             this.WriteObject(targetList, true);
         }
 
+        public enum protectionStatus
+        {
+            [EnumMember]
+            NotProtected = 0,
+
+            [EnumMember]
+            Protected,
+        }
     }
 }

src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupBaseObjects.cs

@@ -86,7 +86,7 @@ public class AzureBackupItemContextObject : AzureBackupContainerContextObject
         /// <summary>
         /// DataSourceId of Azure Backup Item
         /// </summary>
-        public string DataSourceType { get; set; }
+        public string Type { get; set; }
 
         public AzureBackupItemContextObject()
             : base()
@@ -97,20 +97,20 @@ public AzureBackupItemContextObject(AzureBackupItemContextObject azureBackupItem
             : base(azureBackupItemContextObject)
         {
             DataSourceId = azureBackupItemContextObject.DataSourceId;
-            DataSourceType = azureBackupItemContextObject.DataSourceType;
+            Type = azureBackupItemContextObject.Type;
         }
 
         public AzureBackupItemContextObject(DataSourceInfo item, AzureBackupContainer azureBackupContainer)
             : base(azureBackupContainer)
         {
             DataSourceId = item.InstanceId;
-            DataSourceType = item.Type;
+            Type = item.Type;
         }
 
         public AzureBackupItemContextObject(ProtectableObjectInfo item, AzureBackupContainer azureBackupContainer)
             : base(azureBackupContainer)
         {
-            DataSourceType = item.Type;
+            Type = item.Type;
         }
     }
 }

src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupItem.cs

@@ -29,7 +29,7 @@ public class AzureBackupItem : AzureBackupItemContextObject
         /// <summary>
         /// Status for the Azure Backup Item
         /// </summary>
-        public string Status { get; set; }
+        public string DataSourceStatus { get; set; }
 
         /// <summary>
         /// Protection Status for the Azure Backup Item
@@ -39,7 +39,7 @@ public class AzureBackupItem : AzureBackupItemContextObject
         /// <summary>
         /// Protectable Object Name for the Azure Backup Item
         /// </summary>
-        public string ProtectableObjectName { get; set; }
+        public string Name { get; set; }
 
         /// <summary>
         /// Protection Policy Name for the Azure Backup Item
@@ -51,11 +51,6 @@ public class AzureBackupItem : AzureBackupItemContextObject
         /// </summary>
         public string ProtectionPolicyId { get; set; }
 
-        /// <summary>
-        /// Policy Inconsistent for the Azure Backup Item
-        /// </summary>
-        public bool PolicyInconsistent { get; set; }
-
         /// <summary>
         /// Recovery Points Count for the Azure Backup Item
         /// </summary>
@@ -64,22 +59,6 @@ public class AzureBackupItem : AzureBackupItemContextObject
         /// <summary>
         /// Last Recovery Point for the Azure Backup Item
         /// </summary>
-        public DateTime? LastRecoveryPoint { get; set; }
-
-        /// <summary>
-        /// Last Backup Time for the Azure Backup Item
-        /// </summary>
-        public DateTime? LastBackupTime { get; set; }
-
-        /// <summary>
-        /// Last Backup Status for the Azure Backup Item
-        /// </summary>
-        public string LastBackupStatus { get; set; }
-
-        /// <summary>
-        /// Last Backup Job Id for the Azure Backup Item
-        /// </summary>
-        public string LastBackupJobId { get; set; }
 
         public AzureBackupItem()
             : base()
@@ -89,24 +68,19 @@ public AzureBackupItem()
         public AzureBackupItem(DataSourceInfo datasource, AzureBackupContainer azureBackupContainer)
             : base(datasource, azureBackupContainer)
         {
-            Status = datasource.Status;
+            DataSourceStatus = datasource.Status;
             ProtectionStatus = datasource.ProtectionStatus;
-            ProtectableObjectName = datasource.ProtectableObjectName;
+            Name = datasource.Name;
             ProtectionPolicyName = datasource.ProtectionPolicyName;
             ProtectionPolicyId = datasource.ProtectionPolicyId;
-            PolicyInconsistent = datasource.PolicyInconsistent;
             RecoveryPointsCount = datasource.RecoveryPointsCount;
-            LastRecoveryPoint = datasource.LastRecoveryPoint;
-            LastBackupTime = datasource.LastBackupTime;
-            LastBackupStatus = datasource.LastBackupStatus;
-            LastBackupJobId = datasource.LastBackupJobId;
         }
 
         public AzureBackupItem(ProtectableObjectInfo pPOItem, AzureBackupContainer azureBackupContainer)
             : base(pPOItem, azureBackupContainer)
         {
             ProtectionStatus = pPOItem.ProtectionStatus;
-            ProtectableObjectName = pPOItem.Name;
+            Name = pPOItem.Name;
         }
     }
 }