Merge pull request #306 from MabOneSdk/mkheranidev1

Changed some parameter name in GetRP to be in sync with Restore and Jobs

Author: mkherani

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/RecoveryPointConversions.cs

@@ -42,14 +42,14 @@ public static List<AzureRmRecoveryServicesBackupRecoveryPointBase> GetPSAzureRec
                 DateTime recPointTime = DateTime.ParseExact(recPoint.RecoveryPointTime, @"MM/dd/yyyy HH:mm:ss", CultureInfo.InvariantCulture);
                 AzureRmRecoveryServicesBackupIaasVmRecoveryPoint rpBase = new AzureRmRecoveryServicesBackupIaasVmRecoveryPoint()
                 {
-                    Name = rp.Name,
+                    RecoveryPointId = rp.Name,
                     BackupManagementType = item.BackupManagementType,
                     ItemName = protectedItemName,
                     ContainerName = containerUri,
                     ContainerType = item.ContainerType,
                     RecoveryPointTime = recPointTime,
                     RecoveryPointType = recPoint.RecoveryPointType,
-                    RecoveryPointId = rp.Id,
+                    Id = rp.Id,
                     WorkloadType = item.WorkloadType,
                     RecoveryPointAdditionalInfo = recPoint.RecoveryPointAdditionalInfo,
                     SourceVMStorageType = recPoint.SourceVMStorageType,
@@ -74,14 +74,14 @@ public static AzureRmRecoveryServicesBackupRecoveryPointBase GetPSAzureRecoveryP
 
             AzureRmRecoveryServicesBackupIaasVmRecoveryPoint result = new AzureRmRecoveryServicesBackupIaasVmRecoveryPoint()
             {
-                Name = rpResponse.RecPoint.Name,
+                RecoveryPointId = rpResponse.RecPoint.Name,
                 BackupManagementType = item.BackupManagementType,
                 ItemName = protectedItemName,
                 ContainerName = containerUri,
                 ContainerType = item.ContainerType,
                 RecoveryPointTime = Convert.ToDateTime(recPoint.RecoveryPointTime).ToLocalTime(),
                 RecoveryPointType = recPoint.RecoveryPointType,
-                RecoveryPointId = rpResponse.RecPoint.Id,
+                Id = rpResponse.RecPoint.Id,
                 WorkloadType = item.WorkloadType,
                 RecoveryPointAdditionalInfo = recPoint.RecoveryPointAdditionalInfo,
             };

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/RestoreDiskAPIs.cs

@@ -28,7 +28,7 @@ public BaseRecoveryServicesJobResponse RestoreDisk(AzureRmRecoveryServicesBackup
             string vaultLocation = BmsAdapter.GetResourceLocation();            
             string containerName = rp.ContainerName;
             string protectedItemName = rp.ItemName;
-            string recoveryPointId = rp.Name;
+            string recoveryPointId = rp.RecoveryPointId;
             //validtion block
             if(storageAccountLocation != vaultLocation)
             {

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

@@ -176,7 +176,7 @@ public class AzureRmRecoveryServicesBackupRecoveryPointBase : AzureRmRecoverySer
         /// <summary>
         /// 
         /// </summary>
-        public string Name { get; set; }
+        public string RecoveryPointId { get; set; }
 
         /// <summary>
         /// 
@@ -186,7 +186,7 @@ public class AzureRmRecoveryServicesBackupRecoveryPointBase : AzureRmRecoverySer
         /// <summary>
         /// 
         /// </summary>
-        public string RecoveryPointId { get; set; }
+        public string Id { get; set; }
 
         /// <summary>
         ///Type of recovery point (appConsistent\CrashConsistent etc) 

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml

@@ -304,7 +304,7 @@
 				  <TableRowEntry>
 					  <TableColumnItems>
 						  <TableColumnItem>
-							  <PropertyName>Name</PropertyName>
+							  <PropertyName>RecoveryPointId</PropertyName>
 						  </TableColumnItem>
 						  <TableColumnItem>
 							  <PropertyName>RecoveryPointType</PropertyName>