Fixing merge confilcs,

src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupClientAdapter/ContainerAdapter.cs

@@ -46,22 +46,22 @@ public IEnumerable<CSMContainerResponse> ListContainers(string filter)
         /// <summary>
         /// Register container
         /// </summary>
-        /// <param name="request"></param>
+        /// <param name="containerName"></param>
         /// <returns></returns>
-        public Guid RegisterContainer(RegisterContainerRequestInput request)
+        public Guid RegisterContainer(string containerName)
         {
-            var response = AzureBackupClient.Container.RegisterAsync(request, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
+            var response = AzureBackupClient.Container.RegisterAsync(containerName, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
             return response.OperationId;
         }
 
         /// <summary>
         /// UnRegister container
         /// </summary>
-        /// <param name="request"></param>
+        /// <param name="containerName"></param>
         /// <returns></returns>
-        public Guid UnRegisterContainer(UnregisterContainerRequestInput request)
+        public Guid UnRegisterContainer(string containerName)
         {
-            var response = AzureBackupClient.Container.UnregisterAsync(request, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
+            var response = AzureBackupClient.Container.UnregisterAsync(containerName, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
             return response.OperationId;
         }
 

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

@@ -67,8 +67,8 @@ public override void ExecuteCmdlet()
                 {
                     containerInfos.RemoveAll(containerInfo =>
                     {
-                        // TODO: Parse ManagedResourceGroupName from ParentContainerId by getting the last segment
-                        return containerInfo.Properties.ParentContainerId != ManagedResourceGroupName;
+                        string rgName = ContainerHelpers.GetRGNameFromId(containerInfo.Properties.ParentContainerId);
+                        return rgName != ManagedResourceGroupName;
                     });
                     WriteDebug(string.Format("Count of containers after resource group filter = {0}", containerInfos.Count));                
                 }

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

@@ -83,7 +83,7 @@ public override void ExecuteCmdlet()
                 Guid jobId = Guid.Empty;
                 bool isDiscoveryNeed = false;
 
-                ContainerInfo container = null;
+                CSMContainerResponse container = null;
                 isDiscoveryNeed = IsDiscoveryNeeded(vmName, rgName, out container);
                 if(isDiscoveryNeed)
                 {
@@ -101,10 +101,7 @@ public override void ExecuteCmdlet()
 
                 //Container is discovered. Register the container
                 WriteDebug(String.Format("Going to register VM {0}", vmName));
-                List<string> containerNameList = new List<string>();
-                containerNameList.Add(container.Name);
-                RegisterContainerRequestInput registrationRequest = new RegisterContainerRequestInput(containerNameList, AzureBackupContainerType.IaasVMContainer.ToString());
-                var operationId = AzureBackupClient.RegisterContainer(registrationRequest);
+                var operationId = AzureBackupClient.RegisterContainer(container.Name);
 
                 var operationStatus = GetOperationStatus(operationId);
                 WriteObject(GetCreatedJobs(Vault, operationStatus.Jobs).FirstOrDefault());
@@ -156,7 +153,7 @@ private bool WaitForDiscoveryToComplete(Guid operationId, out bool isDiscoverySu
             return isRetryNeeded;         
         }
 
-        private bool IsDiscoveryNeeded(string vmName, string rgName, out ContainerInfo container)
+        private bool IsDiscoveryNeeded(string vmName, string rgName, out CSMContainerResponse container)
         {
             bool isDiscoveryNeed = false;
             //First check if container is discoverd or not
@@ -178,9 +175,8 @@ private bool IsDiscoveryNeeded(string vmName, string rgName, out ContainerInfo c
 
             else
             {
-                //We can have multiple container with same friendly name.
-                //Look for resourceGroup name in the container unoque name                
-                container = containers.Where(c => c.ParentContainerFriendlyName.ToLower().Equals(rgName.ToLower())).FirstOrDefault();
+                //We can have multiple container with same friendly name. 
+                container = containers.Where(c => ContainerHelpers.GetRGNameFromId(c.Properties.ParentContainerId).Equals(rgName.ToLower())).FirstOrDefault(); //TODO need to change.
                 if (container == null)
                 {
                     //Container is not in list of registered container

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

@@ -39,8 +39,7 @@ public override void ExecuteCmdlet()
                 base.ExecuteCmdlet();
 
                 string containerUniqueName = Container.ContainerUniqueName;
-                UnregisterContainerRequestInput unregRequest = new UnregisterContainerRequestInput(containerUniqueName, AzureBackupContainerType.IaasVMContainer.ToString());
-                var operationId = AzureBackupClient.UnRegisterContainer(unregRequest);
+                var operationId = AzureBackupClient.UnRegisterContainer(containerUniqueName);
 
                 WriteObject(GetCreatedJobs(new Models.AzurePSBackupVault(Container.ResourceGroupName, Container.ResourceName, Container.Location), GetOperationStatus(operationId).Jobs).FirstOrDefault());
             });

src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/ContainerHelpers.cs

@@ -30,11 +30,14 @@
 using CmdletModel = Microsoft.Azure.Commands.AzureBackup.Models;
 using System.Collections.Specialized;
 using System.Web;
+using System.Text.RegularExpressions;
 
 namespace Microsoft.Azure.Commands.AzureBackup.Helpers
 {
     internal class ContainerHelpers
     {
+        private static readonly Regex ResourceGroupRegex =
+            new Regex(@"/resourceGroups/(?<resourceGroupName>.+)/providers/", RegexOptions.Compiled);
         internal static string GetQueryFilter(ListContainerQueryParameter queryParams)
         {
             NameValueCollection collection = new NameValueCollection();
@@ -58,10 +61,41 @@ internal static string GetQueryFilter(ListContainerQueryParameter queryParams)
                 return String.Empty;
             }
 
-            var httpValueCollection = HttpUtility.ParseQueryString(String.Empty);
-            httpValueCollection.Add(collection);
+            return CreateQueryString(collection);
+        }
 
-            return "&" + httpValueCollection.ToString();
+        internal static string GetRGNameFromId(string id)
+        {
+            var match = ResourceGroupRegex.Match(id);
+            if (match.Success)
+            {
+                var resourceGroupNameGroup = match.Groups["resourceGroupName"];
+                if (resourceGroupNameGroup != null && resourceGroupNameGroup.Success)
+                {
+                    return resourceGroupNameGroup.Value;
+                }
+            }
+
+            return null;
+        }
+        private static string CreateQueryString(NameValueCollection collection)
+        {
+            string filterValue = string.Empty;
+
+            if (collection == null)
+            {
+                throw new ArgumentNullException("collection");
+            }
+
+            if (collection.Count > 0)
+            {
+                foreach (string key in collection.Keys)
+                {
+                    filterValue += key + " eq '" + collection[key] + "' and ";
+                }
+                filterValue = filterValue.Remove(filterValue.Length - 5);
+            }
+            return filterValue; 
         }
     }
 }

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

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.AzureBackup.Helpers;
 using Microsoft.Azure.Management.BackupServices.Models;
 using System;
 using System.Collections.Generic;
@@ -51,8 +52,7 @@ public AzureBackupContainer() : base() { }
         public AzureBackupContainer(AzurePSBackupVault vault, CSMContainerResponse containerInfo)
             : base(vault, containerInfo)
         {
-            // TODO: Parse ManagedResourceGroupName from ParentContainerId by getting the last segment
-            //ManagedResourceGroupName = containerInfo.Properties.ParentContainerId;
+            ManagedResourceGroupName = ContainerHelpers.GetRGNameFromId(containerInfo.Properties.ParentContainerId);
             ManagedResourceName = containerInfo.Properties.FriendlyName;
             HealthStatus = containerInfo.Properties.HealthStatus;
             RegistrationStatus = containerInfo.Properties.Status;