merged from dev

Author: pikumarmsft16

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

@@ -21,10 +21,11 @@ internal static class AzureBackupCmdletHelpMessage
         public const string ResourceGroupName = "The ResourceGroup name.";
         public const string ResourceName = "The Resource name.";
         public const string TargetLocation = "The directory where the credentials file will be saved.";
-        public const string ContainerName = "The container name.";
+        public const string ContainerResourceName = "The container resource name aka friendly name.";
         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.";
+        public const string ContainerResourceGroupName = "The container resource group name.";
+        public const string ProtectionStatus = "Protection Status of the azure backup item.";
     }
 }

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/BackUp/TriggerBackUp.cs

@@ -44,10 +44,10 @@ public override void ExecuteCmdlet()
 
                 MBS.OperationResponse triggerBackUpInfo =
                     AzureBackupClient.BackUp.TriggerBackUpAsync(GetCustomRequestHeaders(),
-                    AzureBackupItem.ContainerName,
+                    AzureBackupItem.ContainerUniqueName,
                     AzureBackupItem.Type,
                     AzureBackupItem.DataSourceId,
-                    CmdletCancellationToken).Result;                
+                    CmdletCancellationToken).Result;
 
                 WriteVerbose("Received policy response");
                 WriteVerbose("Received policy response2");
@@ -77,4 +77,3 @@ public void WriteAzureBackupProtectionPolicy(IEnumerable<MBS.OperationResponse>
         }
     }
 }
-

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureBackupContainer.cs

@@ -12,6 +12,9 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using BCI = Microsoft.BackupManagementService.CommonInterface;
+using BMI = Microsoft.BackupManagementService.ManagementInterface;
+using Microsoft.Azure.Management.BackupServices.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -27,19 +30,19 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
     [Cmdlet(VerbsCommon.Get, "AzureBackupContainer"), OutputType(typeof(AzureBackupContainer), typeof(List<AzureBackupContainer>))]
     public class GetAzureBackupContainer : AzureBackupVaultCmdletBase
     {
-        [Parameter(Position = 2, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ContainerName)]
+        [Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ContainerResourceGroupName)]
         [ValidateNotNullOrEmpty]
-        public string Name { get; set; }
+        public string ContainerResourceGroupName { get; set; }
 
-        [Parameter(Position = 2, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ContainerId)]
+        [Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ContainerResourceName)]
         [ValidateNotNullOrEmpty]
-        public string Id { get; set; }
+        public string ContainerResourceName { get; set; }
 
-        [Parameter(Position = 2, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ContainerRegistrationStatus)]
+        [Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ContainerRegistrationStatus)]
         [ValidateNotNullOrEmpty]
         public AzureBackupContainerStatus Status { get; set; }
 
-        [Parameter(Position = 2, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ContainerType)]
+        [Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ContainerType)]
         [ValidateNotNullOrEmpty]
         public AzureBackupContainerType Type { get; set; }
 
@@ -49,12 +52,64 @@ public override void ExecuteCmdlet()
 
             ExecutionBlock(() =>
             {
-                IEnumerable<AzureBackupContainer> containers = new List<AzureBackupContainer>();
+                string queryFilterString = string.Empty;
+                queryFilterString = ConstructQueryFilterString();
+                ListContainerResponse listContainerResponse = AzureBackupClient.Container.ListAsync(queryFilterString,
+                    GetCustomRequestHeaders(), CmdletCancellationToken).Result;
 
-                // TODO: Call Hydra
+                List<ContainerInfo> containerInfos = listContainerResponse.Objects.ToList();
 
-                WriteObject(containers);
+                // When resource group name is specified, remove all containers whose resource group name
+                // doesn't match the given resource group name
+                if (!string.IsNullOrEmpty(ContainerResourceGroupName))
+                {
+                    containerInfos.RemoveAll(containerInfo =>
+                    {
+                        return containerInfo.ParentContainerName != ContainerResourceGroupName;
+                    });
+                }
+
+                WriteObject(containerInfos.ConvertAll(containerInfo =>
+                {
+                    return new AzureBackupContainer(containerInfo);
+                }));
             });
         }
+
+        private string ConstructQueryFilterString()
+        {
+            BMI.ContainerQueryObject containerQueryObject = new BMI.ContainerQueryObject();
+
+            switch (Type)
+            {
+                case AzureBackupContainerType.AzureVirtualMachine:
+                    containerQueryObject.Type = BCI.ContainerType.IaasVMContainer.ToString();
+                    break;
+                default:
+                    break;
+            }
+
+            switch (Status)
+            {
+                case AzureBackupContainerStatus.Registered:
+                    containerQueryObject.Status = BCI.RegistrationStatus.Registered.ToString();
+                    break;
+                case AzureBackupContainerStatus.Registering:
+                    containerQueryObject.Status = BCI.RegistrationStatus.Registering.ToString();
+                    break;
+                case AzureBackupContainerStatus.NotRegistered:
+                    containerQueryObject.Status = BCI.RegistrationStatus.NotRegistered.ToString();
+                    break;
+                default:
+                    break;
+            }
+
+            if (!string.IsNullOrEmpty(ContainerResourceName))
+            {
+                containerQueryObject.FriendlyName = ContainerResourceName;
+            }
+
+            return BMI.BackupManagementAPIHelper.GetQueryString(containerQueryObject.GetNameValueCollection());
+        }
     }
 }

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/RecoveryPoint/GetAzureBackupRecoveryPoint.cs

@@ -41,7 +41,7 @@ public override void ExecuteCmdlet()
 
                 RecoveryPointListResponse recoveryPointListResponse = 
                     AzureBackupClient.RecoveryPoint.ListAsync(GetCustomRequestHeaders(),
-                    AzureBackupItem.ContainerName,
+                    AzureBackupItem.ContainerUniqueName,
                     AzureBackupItem.Type,
                     AzureBackupItem.DataSourceId,
                     CmdletCancellationToken).Result;

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

@@ -38,6 +38,10 @@ public AzureBackupVaultContextObject(string resourceGroupName, string resourceNa
         }
     }
 
+    /// <summary>
+    /// This class encapsulates all the properties of the container object 
+    /// that are needed by higher level objects (data source, recovery point etc). 
+    /// </summary>
     public class AzureBackupContainerContextObject : AzureBackupVaultContextObject
     {
         /// <summary>
@@ -46,14 +50,9 @@ public class AzureBackupContainerContextObject : AzureBackupVaultContextObject
         public string ContainerType { get; set; }
 
         /// <summary>
-        /// Name of the Azure Backup container
+        /// Unique name of the Azure Backup Container
         /// </summary>
-        public string ContainerName { get; set; }
-
-        /// <summary>
-        /// Id of the Azure Backup Container
-        /// </summary>
-        public string ContainerId { get; set; }
+        public string ContainerUniqueName { get; set; }
 
         public AzureBackupContainerContextObject()
             : base()
@@ -64,15 +63,20 @@ public AzureBackupContainerContextObject(AzureBackupContainerContextObject azure
             : base(azureBackupContainerContextObject.ResourceGroupName, azureBackupContainerContextObject.ResourceName)
         {
             ContainerType = azureBackupContainerContextObject.ContainerType;
-            ContainerName = azureBackupContainerContextObject.ContainerName;
-            ContainerId = azureBackupContainerContextObject.ContainerId;
+            ContainerUniqueName = azureBackupContainerContextObject.ContainerUniqueName;
         }
         public AzureBackupContainerContextObject(AzureBackupContainer azureBackupContainer)
             : base(azureBackupContainer.ResourceGroupName, azureBackupContainer.ResourceName)
         {
             ContainerType = azureBackupContainer.ContainerType;
-            ContainerName = azureBackupContainer.ContainerName;
-            ContainerId = azureBackupContainer.ContainerId;
+            ContainerUniqueName = azureBackupContainer.ContainerUniqueName;
+        }
+
+        public AzureBackupContainerContextObject(ContainerInfo containerInfo)
+            : base(containerInfo.ParentContainerName, containerInfo.FriendlyName)
+        {
+            ContainerType = containerInfo.ContainerType;
+            ContainerUniqueName = containerInfo.Name;
         }
     }