Merge pull request #2941 from gandhiniraj/dev

Fix the ARM cmdlet to show the progress bar for long running operation

Author: cormacpayne

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Components/LongRunningOperationHelper.cs

@@ -283,7 +283,7 @@ private ResourceManagerRestRestClient GetResourcesClient()
         /// <param name="result">The operation result</param>
         private void UpdateProgress(TrackingOperationResult result)
         {
-            this.ProgressTrackerObject.UpdateProgress(result);
+            this.ProgressTrackerObject.UpdateProgress(result, this.IsResourceCreateOrUpdate);
         }
 
         /// <summary>
@@ -332,26 +332,43 @@ internal ProgressTracker(string activityName, Func<ResourceManagerRestRestClient
                 this.ProgressRecord = new ProgressRecord(activityId: 0, activity: activityName, statusDescription: "Starting - 0.00% completed.");
             }
 
+            internal void SetProgressPercentageAndWriteProgress(double percentage)
+            {
+                this.SetProgressRecordPercentComplete(percentage);
+                this.WriteProgressAction(this.ProgressRecord);
+            }
+
             /// <summary>
             /// Logs the fact that the operation has progressed.
             /// </summary>
             /// <param name="result">The operation result</param>
-            internal void UpdateProgress(TrackingOperationResult result)
+            /// <param name="isResourceCreateOrUpdate">Is Create or Update operation, other option include Move etc.</param>
+            internal void UpdateProgress(TrackingOperationResult result, bool isResourceCreateOrUpdate)
             {
-                var currentState = this.GetOperationState(result.OperationResult);
-
-                if (result.Failed || currentState == null || !this.LastState.EqualsInsensitively(currentState))
+                if (isResourceCreateOrUpdate)
                 {
-                    this.SetProgressRecordPercentComplete(100.0);
-                    this.WriteProgressAction(this.ProgressRecord);
-                }
+                    var currentState = this.GetOperationState(result.OperationResult);
 
-                if (currentState == null)
+                    if (result.Failed || currentState == null || !this.LastState.EqualsInsensitively(currentState))
+                    {
+                        this.SetProgressPercentageAndWriteProgress(100.0);
+                    }
+
+                    if (currentState == null)
+                    {
+                        return;
+                    }
+
+                    this.LastState = currentState;
+                }
+                else
                 {
-                    return;
+                    if(result.Failed)
+                    {
+                        this.SetProgressPercentageAndWriteProgress(100.0);
+                    }
                 }
 
-                this.LastState = currentState;
                 this.SetProgressRecordPercentComplete(result.OperationResult.PercentComplete);
                 this.WriteProgressAction(this.ProgressRecord);
             }