Merge pull request #228 from MabOneSdk/pragrawa-dev1

Enable-Protection cmdlet Fixes

Author: pragrawa

src/ResourceManager/RecoveryServices.Backup/Cmdlets/Item/EnableAzureRmRecoveryServicesProtection.cs

@@ -76,13 +76,12 @@ public override void ExecuteCmdlet()
                     {ItemParams.ParameterSetName, this.ParameterSetName},
                 }, HydraAdapter);
 
-                IPsBackupProvider psBackupProvider = (Item != null) ? providerManager.GetProviderInstance(WorkLoadType, Item.BackupManagementType)
+                IPsBackupProvider psBackupProvider = (Item != null) ? providerManager.GetProviderInstance(Item.WorkloadType, Item.BackupManagementType)
                     : providerManager.GetProviderInstance(WorkLoadType);
 
                 var jobResponse = psBackupProvider.EnableProtection();
 
                 // Track Response and display job details
-                // -- TBD to move it to common helper and remove hard-coded vaules
 
                 var response = OperationStatusHelper.TrackOperationStatus(jobResponse, HydraAdapter);
 

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

@@ -27,7 +27,7 @@ public partial class HydraAdapter
         const string AppSettingsSectionName = "appSettings";
         const string RecoveryServicesResourceNamespace = "Microsoft.RecoveryServices";
         const string ProviderNamespaceKey = "ProviderNamespace";
-        const string AzureFabricName = "AzureIaasVM";
+        const string AzureFabricName = "Azure";
 
         ClientProxy<RecoveryServicesNS.RecoveryServicesBackupManagementClient, RecoveryServicesModelsNS.CustomRequestHeaders> BmsAdapter;
 

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs

@@ -64,7 +64,6 @@ public BaseRecoveryServicesJobResponse EnableProtection()
             AzureRmRecoveryServicesIaasVmItem item = (AzureRmRecoveryServicesIaasVmItem)
                                                  ProviderData.ProviderParameters[ItemParams.Item];
             // do validations
-            
 
             string containerUri = "";
             string protectedItemUri = "";
@@ -613,6 +612,7 @@ private void ValidateAzureVMContainerType(Microsoft.Azure.Commands.RecoveryServi
                                             type.ToString()));
             }
         }
+        
         private void ValidateAzureVMProtectionPolicy(AzureRmRecoveryServicesPolicyBase policy)
         {
             if (policy == null || policy.GetType() != typeof(AzureRmRecoveryServicesIaasVmPolicy))
@@ -651,10 +651,9 @@ private void ValidateAzureVMRetentionPolicy(AzureRmRecoveryServicesRetentionPoli
             policy.Validate();
         }
 
-        private void ValidateAzureVMEnableProtectionRequest(string vmName, string rgName, string serviceName,
+        private void ValidateAzureVMEnableProtectionRequest(string vmName, string serviceName, string rgName,
             AzureRmRecoveryServicesPolicyBase policy)
         {
-            ValidateAzureVMProtectionPolicy(policy);
             if(string.IsNullOrEmpty(vmName))
             {
                 throw new ArgumentException(string.Format(Resources.InvalidAzureVMName));
@@ -668,8 +667,6 @@ private void ValidateAzureVMEnableProtectionRequest(string vmName, string rgName
         private void ValidateAzureVMModifyProtectionRequest(AzureRmRecoveryServicesItemBase itemBase,
             AzureRmRecoveryServicesPolicyBase policy)
         {
-            ValidateAzureVMProtectionPolicy(policy);
-
             if (itemBase == null || itemBase.GetType() != typeof(AzureRmRecoveryServicesIaasVmItem))
             {
                 throw new ArgumentException(string.Format(Resources.InvalidProtectionPolicyException,
@@ -742,8 +739,10 @@ private bool IsDiscoveryNeeded(string vmName, string rgName, bool isComputeAzure
             vmVersion = (isComputeAzureVM) == true ? computeAzureVMVersion : classicComputeAzureVMVersion;
 
             ProtectableObjectListQueryParameters queryParam = new ProtectableObjectListQueryParameters();
-            queryParam.ProviderType = ProviderType.AzureIaasVM.ToString();
-            queryParam.FriendlyName = vmName;
+            // --- TBD To be added once bug is fixed in hydra and service
+            //queryParam.ProviderType = ProviderType.AzureIaasVM.ToString();
+            //queryParam.FriendlyName = vmName;
+
             // No need to use skip or top token here as no pagination support of IaaSVM PO.
 
             //First check if container is discovered or not
@@ -762,8 +761,9 @@ private bool IsDiscoveryNeeded(string vmName, string rgName, bool isComputeAzure
                 {
                     AzureIaaSVMProtectableItem iaaSVMProtectableItem = (AzureIaaSVMProtectableItem)protectableItem.Properties;
                     if (iaaSVMProtectableItem != null &&
-                        iaaSVMProtectableItem.FriendlyName == vmName && iaaSVMProtectableItem.ResourceGroup == rgName
-                        && iaaSVMProtectableItem.VirtualMachineVersion == vmVersion)
+                        string.Compare(iaaSVMProtectableItem.FriendlyName, vmName, true) == 0
+                        && string.Compare(iaaSVMProtectableItem.ResourceGroup, rgName, true) == 0
+                        && string.Compare(iaaSVMProtectableItem.VirtualMachineVersion, vmVersion, true) == 0)
                     {
                         protectableObject = iaaSVMProtectableItem;
                         isDiscoveryNeed = false;
@@ -777,18 +777,12 @@ private bool IsDiscoveryNeeded(string vmName, string rgName, bool isComputeAzure
 
         private void RefreshContainer()
         {
-            bool isRetryNeeded = true;
-            int retryCount = 1;
-            bool isDiscoverySuccessful = true;
+            bool isDiscoverySuccessful = false;
             string errorMessage = string.Empty;
-            while (!isDiscoverySuccessful && retryCount <= 3)
-            {
-                var refreshContainerJobResponse = HydraAdapter.RefreshContainers();
+            var refreshContainerJobResponse = HydraAdapter.RefreshContainers();
 
-                //Now wait for the operation to Complete
-                isRetryNeeded = WaitForDiscoveryToComplete(refreshContainerJobResponse.Location, out isDiscoverySuccessful, out errorMessage);
-                retryCount++;
-            }
+            //Now wait for the operation to Complete
+            WaitForDiscoveryToComplete(refreshContainerJobResponse.Location, out isDiscoverySuccessful, out errorMessage);
 
             if (!isDiscoverySuccessful)
             {
@@ -804,7 +798,7 @@ private bool WaitForDiscoveryToComplete(string locationUri, out bool isDiscovery
 
             isDiscoverySuccessful = true;
             //If operation fails check if retry is needed or not
-            if (status != HttpStatusCode.OK)
+            if (status != HttpStatusCode.NoContent)
             {
                 isDiscoverySuccessful = false;
                 errorMessage = String.Format(Resources.DiscoveryFailureErrorMessage, status);