Incorporating CSM feedback changes in powershell

Author: pragrawa

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

@@ -183,7 +183,11 @@ public static AzureRmRecoveryServicesItemBase GetItemModel(ProtectedItemResource
             {
                 if (protectedItem.Properties.GetType().IsSubclassOf(typeof(AzureIaaSVMProtectedItem)))
                 {
-                    itemModel = new AzureRmRecoveryServicesIaasVmItem(protectedItem, container);
+                    string policyId = ((AzureIaaSVMProtectedItem)protectedItem.Properties).PolicyId;
+                    Dictionary<UriEnums, string> keyVauleDict = 
+                        HelperUtils.ParseUri(policyId);
+                    string policyName = HelperUtils.GetPolicyNameFromPolicyId(keyVauleDict, policyId);
+                    itemModel = new AzureRmRecoveryServicesIaasVmItem(protectedItem, container, policyName);
                 }
             }
 

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Utils.cs

@@ -126,6 +126,22 @@ public static string GetProtectableItemUri(Dictionary<CmdletModel.UriEnums, stri
             }
             return protectableItemUri;
         }
+
+        public static string GetPolicyNameFromPolicyId(Dictionary<CmdletModel.UriEnums, string> keyValuePairDict, string id)
+        {
+            string policyName = string.Empty;
+
+            if (keyValuePairDict.ContainsKey(CmdletModel.UriEnums.BackupPolicies))
+            {
+                policyName = keyValuePairDict[CmdletModel.UriEnums.BackupPolicies];
+            }
+            else
+            {
+                throw new ArgumentException(string.Format(Resources.URIValueNotFound,
+                    CmdletModel.UriEnums.BackupPolicies.ToString(), id));
+            }
+            return policyName;
+        }
 
     }
 }

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

@@ -48,11 +48,7 @@ public BaseRecoveryServicesJobResponse RestoreDisk(AzureRmRecoveryServicesIaasVm
                 CreateNewCloudService = false,
                 RecoveryPointId = recoveryPointId,
                 RecoveryType = RecoveryType.RestoreDisks,
-                Region = vaultLocation,
-                StorageAccountName = storageAccountId,
-                SubnetName = string.Empty,
-                VirtualMachineName = string.Empty,
-                VirtualNetworkName = string.Empty,
+                Region = vaultLocation // TBD - To be fixed by Mkherani
             };
 
             TriggerRestoreRequest triggerRestoreRequest = new TriggerRestoreRequest();

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Resources/Microsoft.Azure.Management.RecoveryServicesBackupManagement.dll

@@ -26,11 +26,6 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
     /// </summary>
     public class AzureRmRecoveryServicesIaasVmItem : AzureRmRecoveryServicesItemBase
     {
-        /// <summary>
-        /// Friendly Name for the Item
-        /// </summary>
-        public string Name { get; set; }
-
         public string VirtualMachineId { get; set; }
 
         /// <summary>
@@ -59,16 +54,15 @@ public class AzureRmRecoveryServicesIaasVmItem : AzureRmRecoveryServicesItemBase
         public AzureRmRecoveryServicesIaasVmItemExtendedInfo ExtendedInfo { get; set; }
 
         public AzureRmRecoveryServicesIaasVmItem(ProtectedItemResource protectedItemResource,
-            AzureRmRecoveryServicesContainerBase container)
+            AzureRmRecoveryServicesContainerBase container, string policyName)
             : base(protectedItemResource, container)
         {
             AzureIaaSVMProtectedItem protectedItem = (AzureIaaSVMProtectedItem)protectedItemResource.Properties;
             LastBackupStatus = protectedItem.LastBackupStatus;
-            ProtectionPolicyName = protectedItem.PolicyName;
+            ProtectionPolicyName = policyName;
             ProtectionState = EnumUtils.GetEnum<ItemStatus>(protectedItem.ProtectionState);
             ProtectionStatus = EnumUtils.GetEnum<ItemProtectionStatus>(protectedItem.ProtectionStatus);
             VirtualMachineId = protectedItem.VirtualMachineId;
-            Name = protectedItem.FriendlyName;
         }
     }
 

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

@@ -121,7 +121,7 @@ public AzureRmRecoveryServicesItemContext(ProtectedItem protectedItem,
             : base(container.ContainerType, protectedItem.BackupManagementType)
         {
             WorkloadType = ConversionUtils.GetPsWorkloadType(protectedItem.WorkloadType);
-            ContainerName = protectedItem.ContainerName;
+            ContainerName = container.Name;
         }
     }
 

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

@@ -33,8 +33,8 @@ public class IaasVmPsBackupProvider : IPsBackupProvider
     {
         private const int defaultOperationStatusRetryTimeInMilliSec = 5 * 1000; // 5 sec
         private const string separator = ";";
-        private const string computeAzureVMVersion = "Compute";
-        private const string classicComputeAzureVMVersion = "ClassicCompute";
+        private const string computeAzureVMVersion = "Microsoft.Compute";
+        private const string classicComputeAzureVMVersion = "Microsoft.ClassicCompute";
 
         ProviderData ProviderData { get; set; }
         HydraAdapter.HydraAdapter HydraAdapter { get; set; }
@@ -107,7 +107,7 @@ public BaseRecoveryServicesJobResponse EnableProtection()
                 properties = new AzureIaaSComputeVMProtectedItem();
             }
 
-            properties.PolicyName = policy.Name;
+            properties.PolicyId = policy.Id;
 
             ProtectedItemCreateOrUpdateRequest hydraRequest = new ProtectedItemCreateOrUpdateRequest()
             {
@@ -164,7 +164,7 @@ public BaseRecoveryServicesJobResponse DisableProtection()
                     properties = new AzureIaaSComputeVMProtectedItem();
                 }
 
-                properties.PolicyName = string.Empty;
+                properties.PolicyId = string.Empty;
                 properties.ProtectionState = ItemStatus.ProtectionStopped.ToString();
 
                 ProtectedItemCreateOrUpdateRequest hydraRequest = new ProtectedItemCreateOrUpdateRequest()
@@ -760,6 +760,7 @@ private bool IsDiscoveryNeeded(string vmName, string rgName, bool isComputeAzure
             protectableObjectResource = null;
             string vmVersion = string.Empty;
             vmVersion = (isComputeAzureVM) == true ? computeAzureVMVersion : classicComputeAzureVMVersion;
+            string virtualMachineId = GetAzureIaasVirtualMachineId(rgName, vmVersion, vmName);
 
             ProtectableObjectListQueryParameters queryParam = new ProtectableObjectListQueryParameters();
             // --- TBD To be added once bug is fixed in hydra and service
@@ -785,8 +786,8 @@ private bool IsDiscoveryNeeded(string vmName, string rgName, bool isComputeAzure
                     AzureIaaSVMProtectableItem iaaSVMProtectableItem = (AzureIaaSVMProtectableItem)protectableItem.Properties;
                     if (iaaSVMProtectableItem != null &&
                         string.Compare(iaaSVMProtectableItem.FriendlyName, vmName, true) == 0
-                        && string.Compare(iaaSVMProtectableItem.ResourceGroup, rgName, true) == 0
-                        && string.Compare(iaaSVMProtectableItem.VirtualMachineVersion, vmVersion, true) == 0)
+                        && iaaSVMProtectableItem.VirtualMachineId.IndexOf(virtualMachineId,
+                        StringComparison.InvariantCultureIgnoreCase) >= 0)
                     {
                         protectableObjectResource = protectableItem;
                         isDiscoveryNeed = false;
@@ -862,6 +863,12 @@ private HttpStatusCode TrackRefreshContainerOperation(string operationResultLink
             return status;
         }
 
+        private static string GetAzureIaasVirtualMachineId(string resourceGroup, string vmVersion, string name)
+        {
+            string IaasVMIdFormat = "/resourceGroups/{0}/providers/{1}/virtualMachines/{2}";
+            return string.Format(IaasVMIdFormat, resourceGroup, vmVersion, name);
+        }
+
         private void CopyScheduleTimeToRetentionTimes(AzureRmRecoveryServicesBackupLongTermRetentionPolicy retPolicy,
                                                       AzureRmRecoveryServicesBackupSimpleSchedulePolicy schPolicy)
         {