Merge pull request #256 from MabOneSdk/anudeeb-dev1

Fix for bug: ContainerURI is coming up in Container Unique Name

Author: Samuel Anudeep

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/BaseObjects.cs

@@ -73,10 +73,10 @@ public class AzureRmRecoveryServicesContainerBase : AzureRmRecoveryServicesConta
         public string Name { get; set; }
 
         public AzureRmRecoveryServicesContainerBase(ProtectionContainerResource protectionContainer)
-            : base(ConversionUtils.GetPsContainerType(((ProtectionContainer)protectionContainer.Properties).ContainerType), 
+            : base(ConversionUtils.GetPsContainerType(((ProtectionContainer)protectionContainer.Properties).ContainerType),
                    ((ProtectionContainer)protectionContainer.Properties).BackupManagementType)
         {
-            Name = protectionContainer.Name;
+            Name = IdUtils.GetNameFromUri(protectionContainer.Name);
         }
     }
 
@@ -166,7 +166,7 @@ public class AzureRmRecoveryServicesItemExtendedInfoBase : AzureRmRecoveryServic
     public class AzureRmRecoveryServicesRecoveryPointBase : AzureRmRecoveryServicesItemContext
     {
         private global::Microsoft.Azure.Management.RecoveryServices.Backup.Models.RecoveryPointResource rp;
-                
+
         /// <summary>
         /// 
         /// </summary>
@@ -212,12 +212,12 @@ public override void Validate()
         {
             base.Validate();
 
-            if(string.IsNullOrEmpty(Name))
+            if (string.IsNullOrEmpty(Name))
             {
                 throw new ArgumentException(Resources.PolicyNameIsEmptyOrNull);
             }
 
-            if(string.IsNullOrEmpty(Id))
+            if (string.IsNullOrEmpty(Id))
             {
                 throw new ArgumentException(Resources.PolicyIdIsEmptyOrNull);
             }

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/Utils.cs

@@ -44,8 +44,8 @@ public class TraceUtils
     {
         public static string GetString<T>(IEnumerable<T> objList)
         {
-            return (objList == null) ? "null" : "{" + string.Join(", ", objList.Select(e => e.ToString())) +"}";
-        }       
+            return (objList == null) ? "null" : "{" + string.Join(", ", objList.Select(e => e.ToString())) + "}";
+        }
     }
 
     public class IdUtils
@@ -104,6 +104,16 @@ public static string GetValueByName(string id, string idName)
 
             return dict[idName];
         }
+
+        /// <summary>
+        /// URI format: Type;Name
+        /// </summary>
+        /// <param name="uri"></param>
+        /// <returns></returns>
+        public static string GetNameFromUri(string uri)
+        {
+            return uri.Substring(uri.IndexOf(NameDelimiter) + 1);
+        }
     }
 
     public class EnumUtils