Merge pull request #90 from MabOneSdk/csm-pikumar

Csm pikumar

Author: pikumarmsft16

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

@@ -57,9 +57,7 @@ public IList<CSMItemResponse> ListProtectableObjects(CSMItemQueryObject query)
         /// Dsiable protection
         /// </summary>
         /// <param name="containerName"></param>
-        /// <param name="dsType"></param>
-        /// <param name="dsId"></param>
-        /// <param name="request"></param>
+        /// <param name="itemName"></param>
         /// <returns></returns>
         public Guid DisableProtection(string containerName, string itemName)
         {
@@ -70,6 +68,8 @@ public Guid DisableProtection(string containerName, string itemName)
         /// <summary>
         /// Enable Protection
         /// </summary>
+        /// <param name="containerName"></param>
+        /// <param name="itemName"></param>
         /// <param name="request"></param>
         /// <returns></returns>
         public Guid EnableProtection(string containerName, string itemName, CSMSetProtectionRequest request)

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Disable-AzureBackupProtection .cs

@@ -55,6 +55,7 @@ public override void ExecuteCmdlet()
 
                 if(!this.DeleteBackupData)
                 {
+                    //Calling update protection with policy Id as empty.
                     CSMUpdateProtectionRequest input = new CSMUpdateProtectionRequest()
                     {
                         Properties = new CSMUpdateProtectionRequestProperties(string.Empty)
@@ -65,6 +66,7 @@ public override void ExecuteCmdlet()
 
                 else
                 {
+                    //Calling disable protection
                     operationId = AzureBackupClient.DisableProtection(Item.ContainerUniqueName, Item.ItemName);
                 }
 

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Enable-AzureBackupProtection .cs

@@ -43,12 +43,15 @@ public override void ExecuteCmdlet()
 
                 WriteDebug("Making client call");
                 string itemName = string.Empty;
+
                 CSMSetProtectionRequest input = new CSMSetProtectionRequest();
-                input.Properties.PolicyId = Policy.InstanceId;
+                input.Properties.PolicyId = Policy.PolicyId;
+
                 if (Item.GetType() == typeof(AzureBackupItem))
                 {
                     itemName = (Item as AzureBackupItem).ItemName;
                 }
+
                 else if (Item.GetType() == typeof(AzureBackupContainer))
                 {
                     WriteDebug("Input is container Type = " + Item.GetType());
@@ -61,6 +64,7 @@ public override void ExecuteCmdlet()
                         throw new Exception("Uknown item type");
                     }
                 }
+
                 else
                 {
                     throw new Exception("Uknown item type");

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

@@ -100,7 +100,7 @@ public void WriteAzureBackupItem(List<CSMProtectedItemResponse> sourceDataSource
                 foreach (var item in sourcePOList)
                 {
                     //If user has stopped protection for some datasoure then we will have duplicate items(po and ds).
-                    //So in this case removing  poitems from the list.
+                    //So in this case removing  po items from the list.
                     if (targetList.FindIndex(element => element.ItemName == item.Name) < 0)
                     {
                         targetList.Add(new AzureBackupItem(item, azureBackupContainer));

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

@@ -37,12 +37,7 @@ public class AzureBackupItem : AzureBackupItemContextObject
         public string ProtectionStatus { get; set; }
 
         /// <summary>
-        /// DataSourceId of Azure Backup Item
-        /// </summary>
-        public string DataSourceId { get; set; }
-
-        /// <summary>
-        /// DataSourceId of Azure Backup Item
+        /// Type of Azure Backup Item
         /// </summary>
         public string Type { get; set; }
 
@@ -72,16 +67,18 @@ public AzureBackupItem(CSMProtectedItemResponse datasource, AzureBackupContainer
             DataSourceStatus = datasource.Properties.ProtectionStatus;
             ProtectionStatus = datasource.Properties.Status;
             ItemName = datasource.Name;
-            ProtectionPolicyName = datasource.Properties.ProtectionPolicyId;
+            ProtectionPolicyName = datasource.Properties.ProtectionPolicyId.Split('/').Last();
             ProtectionPolicyId = datasource.Properties.ProtectionPolicyId;
             RecoveryPointsCount = datasource.Properties.RecoveryPointsCount;
+            Type = datasource.Properties.ItemType;
         }
 
         public AzureBackupItem(CSMItemResponse pPOItem, AzureBackupContainer azureBackupContainer)
             : base(pPOItem, azureBackupContainer)
         {
             ProtectionStatus = pPOItem.Properties.Status;
             ItemName = pPOItem.Name;
+            Type = pPOItem.Properties.ItemType;
         }
     }
 }

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

@@ -54,7 +54,7 @@ public AzureBackupProtectionPolicy(AzurePSBackupVault vault, CSMProtectionPolicy
             ScheduleType = sourcePolicy.BackupSchedule.ScheduleRun;
             ScheduleRunTimes = ConvertScheduleRunTimes(sourcePolicy.BackupSchedule.ScheduleRunTimes);
             ScheduleRunDays = ConvertScheduleRunDays(sourcePolicy.BackupSchedule.ScheduleRunDays);
-            RetentionPolicyList = ConvertCSMRetentionPolicyListToPowershell(sourcePolicy.LtrRetentionPolicy);            
+            RetentionPolicyList = ConvertCSMRetentionPolicyListToPowershell(sourcePolicy.LTRRetentionPolicy);            
         }
 
         private IList<AzureBackupRetentionPolicy> ConvertCSMRetentionPolicyListToPowershell(CSMLongTermRetentionPolicy LTRRetentionPolicy)