Merge pull request #221 from MabOneSdk/mkheranidev1

Removing location from RPResponse and taking dependancy on vault loca…

Author: mkherani

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

@@ -35,11 +35,12 @@ public static List<AzureRmRecoveryServicesRecoveryPointBase> GetPSAzureRecoveryP
                 AzureRmRecoveryServicesIaasVmRecoveryPoint rpBase = new AzureRmRecoveryServicesIaasVmRecoveryPoint()
                 {
                     BackupManagementType = item.BackupManagementType,
-                    ContainerName = item.ContainerName,
                     ItemName = item.Name,
+                    ContainerName = item.ContainerName,
                     ContainerType = item.ContainerType,
                     RecoveryPointTime = Convert.ToDateTime(recPoint.RecoveryPointTime).ToLocalTime(),
                     RecoveryPointType = recPoint.RecoveryPointType,
+                    RecoveryPointId = rp.Id,
                     WorkloadType = item.WorkloadType,
                     RecoveryPointAdditionalInfo = recPoint.RecoveryPointAdditionalInfo,                    
                 };
@@ -67,7 +68,6 @@ public static AzureRmRecoveryServicesRecoveryPointBase GetPSAzureRecoveryPoints(
                     RecoveryPointTime = Convert.ToDateTime(recPoint.RecoveryPointTime).ToLocalTime(),
                     RecoveryPointType = recPoint.RecoveryPointType,
                     RecoveryPointId = rpResponse.RecPoint.Id,
-                    Region = rpResponse.Location,
                     WorkloadType = item.WorkloadType,
                     RecoveryPointAdditionalInfo = recPoint.RecoveryPointAdditionalInfo,
                 };

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

@@ -23,6 +23,7 @@ public BaseRecoveryServicesJobResponse RestoreDisk(AzureRmRecoveryServicesIaasVm
         {
             string resourceGroupName = BmsAdapter.GetResourceGroupName();
             string resourceName = BmsAdapter.GetResourceName();
+            string location = BmsAdapter.GetResourceLocation();            
 
             string containerName = rp.ContainerName;
             string protectedItemName = rp.ItemName;
@@ -35,7 +36,7 @@ public BaseRecoveryServicesJobResponse RestoreDisk(AzureRmRecoveryServicesIaasVm
                 CreateNewCloudService = false,
                 RecoveryPointId = recoveryPointId,
                 RecoveryType = RecoveryType.RestoreDisks,
-                Region = rp.Region,
+                Region = location,
                 StorageAccountName = storageAccountId,
                 SubnetName = string.Empty,
                 VirtualMachineName = string.Empty,

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/ClientProxyBase.cs

@@ -67,5 +67,10 @@ public string GetResourceGroupName()
         {
             return PSRecoveryServicesClient.arsVault.ResouceGroupName;
         }
+
+        public string GetResourceLocation()
+        {
+            return PSRecoveryServicesClient.arsVault.Location;
+        }
     }
 }

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/AzureVmModels/AzureRmRecoveryServicesAzureVmRecoveryPoint.cs

@@ -28,8 +28,6 @@ public class AzureRmRecoveryServicesIaasVmRecoveryPoint : AzureRmRecoveryService
         /// 
         public string RecoveryPointAdditionalInfo { get; set; }
 
-        public string Region { get; set; }
-
         public AzureRmRecoveryServicesIaasVmRecoveryPoint()
         {