Fix for set and remove arm cmdlet

Author: eshaparmar

src/ResourceManager/Compute/Commands.Compute/Extension/DSC/RemoveAzureVMDscExtensionCommand.cs

@@ -59,7 +59,8 @@ public override void ExecuteCmdlet()
                 //Add retry logic due to CRP service restart known issue CRP bug: 3564713
                 var count = 1;
                 Rest.Azure.AzureOperationResponse op = null;
-                while (count <= 2)
+
+                while (true)
                 {
                     op = VirtualMachineExtensionClient.DeleteWithHttpMessagesAsync(
                         ResourceGroupName,
@@ -70,12 +71,15 @@ public override void ExecuteCmdlet()
                         //&& op.Error != null && "InternalExecutionError".Equals(op.Error.Code))
                     {
                         count++;
+                        if (count <= 2)
+                        {
+                            continue;
+                        }
                     }
-                    else
-                    {
-                        break;
-                    }
+                    
+                    break;
                 }
+
                 var result = Mapper.Map<PSAzureOperationResponse>(op);
                 WriteObject(result);
             }

src/ResourceManager/Compute/Commands.Compute/Extension/DSC/SetAzureVMDscExtensionCommand.cs

@@ -366,7 +366,8 @@ private void CreateConfiguration()
             //Add retry logic due to CRP service restart known issue CRP bug: 3564713
             var count = 1;
             Rest.Azure.AzureOperationResponse<VirtualMachineExtension> op = null;
-            while (count <= 2)
+
+            while (true)
             {
                 try
                 {
@@ -375,6 +376,8 @@ private void CreateConfiguration()
                         VMName,
                         Name ?? DscExtensionCmdletConstants.ExtensionPublishedNamespace + "." + DscExtensionCmdletConstants.ExtensionPublishedName,
                         parameters).GetAwaiter().GetResult();
+
+                    break;
                 }
                 catch (Rest.Azure.CloudException ex)
                 {
@@ -385,13 +388,16 @@ private void CreateConfiguration()
                         && errorReturned.Error != null && "InternalExecutionError".Equals(errorReturned.Error.Code))
                     {
                         count++;
+                        if (count <= 2)
+                        {
+                            continue;
+                        }
                     }
-                    else
-                    {
-                        break;
-                    }
+
+                    ThrowTerminatingError(new ErrorRecord(ex, "InvalidResult", ErrorCategory.InvalidResult, null));
                 }
             }
+
             var result = Mapper.Map<PSAzureOperationResponse>(op);
             WriteObject(result);
         }