Merge pull request #231 from MabOneSdk/pragrawa-dev1

Minor Fixes in protection

Author: pragrawa

src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/RemoveAzureRmRecoveryServicesPolicy.cs

@@ -35,8 +35,7 @@ public class RemoveAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBac
         internal const string PolicyNameParameterSet = "PolicyName";
         internal const string PolicyObjectParameterSet = "PolicyObject";
 
-        [Parameter(Position = 1, Mandatory = true, HelpMessage = ParamHelpMsg.Policy.Name, ValueFromPipeline = true,
-            ParameterSetName = PolicyNameParameterSet)]
+        [Parameter(Position = 1, Mandatory = true, HelpMessage = ParamHelpMsg.Policy.Name, ParameterSetName = PolicyNameParameterSet)]
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
@@ -61,7 +60,7 @@ public override void ExecuteCmdlet()
                Force.IsPresent,
                string.Format(Resources.RemoveProtectionPolicyWarning, PolicyName),
                Resources.RemoveProtectionPolicyMessage,
-               Policy.Name, () =>
+               PolicyName, () =>
                {
                    ExecutionBlock(() =>
                    {

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

@@ -31,7 +31,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
 {
     public class IaasVmPsBackupProvider : IPsBackupProvider
     {
-        private const int defaultOperationStatusRetryTimeInMilliSec = 5 * 1000; // 10 sec
+        private const int defaultOperationStatusRetryTimeInMilliSec = 5 * 1000; // 5 sec
         private const string separator = ";";
         private const string computeAzureVMVersion = "Compute";
         private const string classicComputeAzureVMVersion = "ClassicCompute";
@@ -713,15 +713,17 @@ private AzureIaaSVMProtectableItem GetAzureVMProtectableObject(string azureVMNam
                 if (isDiscoveryNeed == true)
                 {
                     // Container is not discovered. Throw exception
-                    string errMsg = String.Format(Resources.DiscoveryFailure, azureVMName, azureVMRGName, isComputeAzureVM);
+                    string vmversion = (isComputeAzureVM) ? computeAzureVMVersion : classicComputeAzureVMVersion;
+                    string errMsg = String.Format(Resources.DiscoveryFailure, azureVMName, azureVMRGName, vmversion);
                     Logger.Instance.WriteDebug(errMsg);
                     Logger.Instance.ThrowTerminatingError(new ErrorRecord(new Exception(Resources.AzureVMNotFound), string.Empty, ErrorCategory.InvalidArgument, null));
                 }
             }
             if (protectableObject == null)
             {
                 // Container is not discovered. Throw exception
-                string errMsg = String.Format(Resources.DiscoveryFailure, azureVMName, azureVMRGName, isComputeAzureVM);
+                string vmversion = (isComputeAzureVM) ? computeAzureVMVersion : classicComputeAzureVMVersion;
+                string errMsg = String.Format(Resources.DiscoveryFailure, azureVMName, azureVMRGName, vmversion);
                 Logger.Instance.WriteDebug(errMsg);
                 Logger.Instance.ThrowTerminatingError(new ErrorRecord(new Exception(Resources.AzureVMNotFound), string.Empty, ErrorCategory.InvalidArgument, null));
             }
@@ -790,9 +792,8 @@ private void RefreshContainer()
             }
         }
 
-        private bool WaitForDiscoveryToComplete(string locationUri, out bool isDiscoverySuccessful, out string errorMessage)
+        private void WaitForDiscoveryToComplete(string locationUri, out bool isDiscoverySuccessful, out string errorMessage)
         {
-            bool isRetryNeeded = false;
             var status = TrackRefreshContainerOperation(locationUri);
             errorMessage = String.Empty;
 
@@ -801,12 +802,9 @@ private bool WaitForDiscoveryToComplete(string locationUri, out bool isDiscovery
             if (status != HttpStatusCode.NoContent)
             {
                 isDiscoverySuccessful = false;
-                errorMessage = String.Format(Resources.DiscoveryFailureErrorMessage, status);
-                Logger.Instance.WriteDebug(String.Format(Resources.DiscoveryFailureErrorCode, status));
-                // No need to try as service is handling retryable errors
-                isRetryNeeded = false;
+                errorMessage = String.Format(Resources.DiscoveryFailureErrorCode, status);
+                Logger.Instance.WriteDebug(errorMessage);
             }
-            return isRetryNeeded;
         }
 
         private HttpStatusCode TrackRefreshContainerOperation(string operationResultLink, int checkFrequency = defaultOperationStatusRetryTimeInMilliSec)