Use TimeSpan instead of int for representing durations of time

Author: sharwell

src/corelib/Core/Domain/ServerBase.cs

@@ -27,23 +27,23 @@ protected virtual void UpdateThis(ServerBase server)
         /// Waits for the server to enter the ACTIVE state
         /// </summary>
         /// <param name="refreshCount">Number of times to check the images status</param>
-        /// <param name="refreshDelayInMS">The number of milliseconds to wait each time before requesting the status for the image.</param>
+        /// <param name="refreshDelay">The time to wait each time before requesting the status for the image. If this value is <c>null</c>, the default is 2.4 seconds.</param>
         /// <param name="progressUpdatedCallback">A callback delegate to execute each time the <see cref="SimpleServer"/>s Progress value increases.</param>
-        public void WaitForActive(int refreshCount = 600, int refreshDelayInMS = 2400, Action<int> progressUpdatedCallback = null)
+        public void WaitForActive(int refreshCount = 600, TimeSpan? refreshDelay = null, Action<int> progressUpdatedCallback = null)
         {
-            var details = Provider.WaitForServerActive(Id, refreshCount, refreshDelayInMS, progressUpdatedCallback, Region);
+            var details = Provider.WaitForServerActive(Id, refreshCount, refreshDelay ?? TimeSpan.FromMilliseconds(2400), progressUpdatedCallback, Region);
             UpdateThis(details);
         }
 
         /// <summary>
         /// Waits for the server to enter the DELETED state
         /// </summary>
         /// <param name="refreshCount">Number of times to check the server status</param>
-        /// <param name="refreshDelayInMS">The number of milliseconds to wait each time before requesting the status for the server.</param>
+        /// <param name="refreshDelay">The time to wait each time before requesting the status for the server. If this value is <c>null</c>, the default is 2.4 seconds.</param>
         /// <param name="progressUpdatedCallback">A callback delegate to execute each time the <see cref="SimpleServer"/>s Progress value increases.</param>
-        public void WaitForDeleted(int refreshCount = 600, int refreshDelayInMS = 2400, Action<int> progressUpdatedCallback = null)
+        public void WaitForDeleted(int refreshCount = 600, TimeSpan? refreshDelay = null, Action<int> progressUpdatedCallback = null)
         {
-            Provider.WaitForServerDeleted(Id, refreshCount, refreshDelayInMS, progressUpdatedCallback, Region);
+            Provider.WaitForServerDeleted(Id, refreshCount, refreshDelay ?? TimeSpan.FromMilliseconds(2400), progressUpdatedCallback, Region);
         }
 
         /// <summary>
@@ -52,11 +52,11 @@ public void WaitForDeleted(int refreshCount = 600, int refreshDelayInMS = 2400,
         /// <param name="expectedState">The expected <see cref="ServerState"/></param>
         /// <param name="errorStates">A list of <see cref="ServerState"/>s in which to throw an exception if the server enters. </param>
         /// <param name="refreshCount">Number of times to check the server status</param>
-        /// <param name="refreshDelayInMS">The number of milliseconds to wait each time before requesting the status for the server.</param>
+        /// <param name="refreshDelay">The time to wait each time before requesting the status for the server. If this value is <c>null</c>, the default is 2.4 seconds.</param>
         /// <param name="progressUpdatedCallback">A callback delegate to execute each time the <see cref="SimpleServer"/>s Progress value increases.</param>
-        public void WaitForState(string expectedState, string[] errorStates, int refreshCount = 600, int refreshDelayInMS = 2400, Action<int> progressUpdatedCallback = null)
+        public void WaitForState(string expectedState, string[] errorStates, int refreshCount = 600, TimeSpan? refreshDelay = null, Action<int> progressUpdatedCallback = null)
         {
-            var details = Provider.WaitForServerState(Id, expectedState, errorStates, refreshCount, refreshDelayInMS, progressUpdatedCallback, Region);
+            var details = Provider.WaitForServerState(Id, expectedState, errorStates, refreshCount, refreshDelay ?? TimeSpan.FromMilliseconds(2400), progressUpdatedCallback, Region);
             UpdateThis(details);
         }
 
@@ -66,11 +66,11 @@ public void WaitForState(string expectedState, string[] errorStates, int refresh
         /// <param name="expectedStates">The set expected <see cref="ServerState"/>s</param>
         /// <param name="errorStates">A list of <see cref="ServerState"/>s in which to throw an exception if the server enters. </param>
         /// <param name="refreshCount">Number of times to check the server status</param>
-        /// <param name="refreshDelayInMS">The number of milliseconds to wait each time before requesting the status for the server.</param>
+        /// <param name="refreshDelay">The time to wait each time before requesting the status for the server. If this value is <c>null</c>, the default is 2.4 seconds.</param>
         /// <param name="progressUpdatedCallback">A callback delegate to execute each time the <see cref="SimpleServer"/>s Progress value increases.</param>
-        public void WaitForState(string[] expectedStates, string[] errorStates, int refreshCount = 600, int refreshDelayInMS = 2400, Action<int> progressUpdatedCallback = null)
+        public void WaitForState(string[] expectedStates, string[] errorStates, int refreshCount = 600, TimeSpan? refreshDelay = null, Action<int> progressUpdatedCallback = null)
         {
-            var details = Provider.WaitForServerState(Id, expectedStates, errorStates, refreshCount, refreshDelayInMS, progressUpdatedCallback, Region);
+            var details = Provider.WaitForServerState(Id, expectedStates, errorStates, refreshCount, refreshDelay ?? TimeSpan.FromMilliseconds(2400), progressUpdatedCallback, Region);
             UpdateThis(details);
         }
 

src/corelib/Core/Domain/SimpleServerImage.cs

@@ -21,23 +21,23 @@ public class SimpleServerImage : ProviderStateBase<IComputeProvider>
         /// Waits for the image to enter the ACTIVE state
         /// </summary>
         /// <param name="refreshCount">Number of times to check the images status</param>
-        /// <param name="refreshDelayInMS">The number of milliseconds to wait each time before requesting the status for the image.</param>
+        /// <param name="refreshDelay">The time to wait each time before requesting the status for the image. If this value is <c>null</c>, the default is 2.4 seconds.</param>
         /// <param name="progressUpdatedCallback">A callback delegate to execute each time the <see cref="SimpleServer"/>s Progress value increases.</param>
-        public void WaitForActive(int refreshCount = 600, int refreshDelayInMS = 2400, Action<int> progressUpdatedCallback = null)
+        public void WaitForActive(int refreshCount = 600, TimeSpan? refreshDelay = null, Action<int> progressUpdatedCallback = null)
         {
-            var details = Provider.WaitForImageActive(Id, refreshCount, refreshDelayInMS, progressUpdatedCallback, Region);
+            var details = Provider.WaitForImageActive(Id, refreshCount, refreshDelay, progressUpdatedCallback, Region);
             UpdateThis(details);
         }
 
         /// <summary>
         /// Waits for the image to enter the DELETED state
         /// </summary>
         /// <param name="refreshCount">Number of times to check the images status</param>
-        /// <param name="refreshDelayInMS">The number of milliseconds to wait each time before requesting the status for the image.</param>
+        /// <param name="refreshDelay">The time to wait each time before requesting the status for the image. If this value is <c>null</c>, the default is 2.4 seconds.</param>
         /// <param name="progressUpdatedCallback">A callback delegate to execute each time the <see cref="SimpleServer"/>s Progress value increases.</param>
-        public void WaitForDelete(int refreshCount = 600, int refreshDelayInMS = 2400, Action<int> progressUpdatedCallback = null)
+        public void WaitForDelete(int refreshCount = 600, TimeSpan? refreshDelay = null, Action<int> progressUpdatedCallback = null)
         {
-            Provider.WaitForImageDeleted(Id, refreshCount, refreshDelayInMS, progressUpdatedCallback, Region);
+            Provider.WaitForImageDeleted(Id, refreshCount, refreshDelay, progressUpdatedCallback, Region);
         }
 
 
@@ -47,11 +47,11 @@ public void WaitForDelete(int refreshCount = 600, int refreshDelayInMS = 2400, A
         /// <param name="expectedState">The expected <see cref="ImageState"/></param>
         /// <param name="errorStates">A list of <see cref="ImageState"/>s in which to throw an exception if the server enters. </param>
         /// <param name="refreshCount">Number of times to check the images status</param>
-        /// <param name="refreshDelayInMS">The number of milliseconds to wait each time before requesting the status for the image.</param>
+        /// <param name="refreshDelay">The time to wait each time before requesting the status for the image. If this value is <c>null</c>, the default is 2.4 seconds.</param>
         /// <param name="progressUpdatedCallback">A callback delegate to execute each time the <see cref="SimpleServer"/>s Progress value increases.</param>
-        public void WaitForState(string expectedState, string[] errorStates, int refreshCount = 600, int refreshDelayInMS = 2400, Action<int> progressUpdatedCallback = null)
+        public void WaitForState(string expectedState, string[] errorStates, int refreshCount = 600, TimeSpan? refreshDelay = null, Action<int> progressUpdatedCallback = null)
         {
-            var details = Provider.WaitForImageState(Id, expectedState, errorStates, refreshCount, refreshDelayInMS, progressUpdatedCallback, Region);
+            var details = Provider.WaitForImageState(Id, expectedState, errorStates, refreshCount, refreshDelay, progressUpdatedCallback, Region);
             UpdateThis(details);
         }
 
@@ -61,11 +61,11 @@ public void WaitForState(string expectedState, string[] errorStates, int refresh
         /// <param name="expectedStates">The set expected <see cref="ImageState"/>s</param>
         /// <param name="errorStates">A list of <see cref="ImageState"/>s in which to throw an exception if the server enters. </param>
         /// <param name="refreshCount">Number of times to check the images status</param>
-        /// <param name="refreshDelayInMS">The number of milliseconds to wait each time before requesting the status for the image.</param>
+        /// <param name="refreshDelay">The time to wait each time before requesting the status for the image. If this value is <c>null</c>, the default is 2.4 seconds.</param>
         /// <param name="progressUpdatedCallback">A callback delegate to execute each time the <see cref="SimpleServer"/>s Progress value increases.</param>
-        public void WaitForState(string[] expectedStates, string[] errorStates, int refreshCount = 600, int refreshDelayInMS = 2400, Action<int> progressUpdatedCallback = null)
+        public void WaitForState(string[] expectedStates, string[] errorStates, int refreshCount = 600, TimeSpan? refreshDelay = null, Action<int> progressUpdatedCallback = null)
         {
-            var details = Provider.WaitForImageState(Id, expectedStates, errorStates, refreshCount, refreshDelayInMS, progressUpdatedCallback, Region);
+            var details = Provider.WaitForImageState(Id, expectedStates, errorStates, refreshCount, refreshDelay, progressUpdatedCallback, Region);
             UpdateThis(details);
         }