Fix for register unregister cmdlet

Author: mkherani

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

@@ -162,7 +162,7 @@ private bool IsDiscoveryNeeded(string vmName, string rgName, out CSMContainerRes
                 FriendlyName = vmName,                
             };
 
-            //First check if container is discoverd or not            
+            //First check if container is discovered or not            
             var containers = AzureBackupClient.ListContainers(parameters);
             WriteDebug(String.Format("Container count returned from service: {0}.", containers.Count()));
             if (containers.Count() == 0)

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

@@ -45,7 +45,7 @@ public override void ExecuteCmdlet()
             {
                 base.ExecuteCmdlet();
 
-                AzureBackupContainerType containerType = (AzureBackupContainerType)Enum.Parse(typeof(AzureBackupContainerType), Container.ContainerType);
+                AzureBackupContainerType containerType = (AzureBackupContainerType)Enum.Parse(typeof(AzureBackupContainerType), Container.ContainerType, true);
                 switch (containerType)
                 {
                     case AzureBackupContainerType.Windows:

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

@@ -36,7 +36,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Helpers
 {
     internal class ContainerHelpers
     {
-        private static readonly Regex ResourceGroupRegex = new Regex(@"/resourceGroups/(?<resourceGroupName>.+)/providers/", RegexOptions.Compiled);
+        private static readonly Regex ResourceGroupRegex = new Regex(@"/subscriptions/(?<subscriptionsId>.+)/resourceGroups/(?<resourceGroupName>.+)/providers/(?<providersName>.+)/BackupVault/(?<BackupVaultName>.+)/containers/(?<containersName>.+)", RegexOptions.Compiled);
 
         internal static AzureBackupContainerType GetContainerType(string customerType)
         {
@@ -70,6 +70,28 @@ internal static AzureBackupContainerType GetContainerType(string customerType)
             return containerType;
         }
 
+        internal static AzureBackupContainerType GetTypeForManagedContainer(string managedContainerTypeString)
+        {
+            ManagedContainerType managedContainerType = (ManagedContainerType)Enum.Parse(typeof(ManagedContainerType), managedContainerTypeString, true);
+
+            AzureBackupContainerType containerType = 0;
+
+            switch (managedContainerType)
+            {
+                case ManagedContainerType.Invalid:
+                    break;
+                case ManagedContainerType.IaasVM:
+                    containerType = AzureBackupContainerType.AzureVM;
+                    break;
+                case ManagedContainerType.IaasVMService:
+                    break;
+                default:
+                    break;
+            }
+
+            return containerType;
+        }
+
         internal static string GetQueryFilter(ListContainerQueryParameter queryParams)
         {
             NameValueCollection collection = new NameValueCollection();
@@ -101,10 +123,10 @@ internal static string GetRGNameFromId(string id)
             var match = ResourceGroupRegex.Match(id);
             if (match.Success)
             {
-                var resourceGroupNameGroup = match.Groups["resourceGroupName"];
-                if (resourceGroupNameGroup != null && resourceGroupNameGroup.Success)
+                var vmRGName = match.Groups["containersName"];
+                if (vmRGName != null && vmRGName.Success)
                 {
-                    return resourceGroupNameGroup.Value;
+                    return vmRGName.Value;
                 }
             }
 

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

@@ -92,7 +92,7 @@ public AzureBackupContainerContextObject(AzureBackupContainer azureBackupContain
         public AzureBackupContainerContextObject(AzurePSBackupVault vault, CSMContainerResponse containerInfo)
             : base(vault.ResourceGroupName, vault.Name, vault.Region)
         {
-            ContainerType = containerInfo.Properties.ContainerType;
+            ContainerType = ContainerHelpers.GetTypeForManagedContainer(containerInfo.Properties.ContainerType).ToString();
             ContainerUniqueName = containerInfo.Name;
         }
     }