Add autoscale eval parameter for New-AzureBatchPool

Author: jasper-schneider

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.ps1

@@ -47,6 +47,7 @@ function Test-NewPool
         # Create a complicated pool using AutoScale parameter set
         $maxTasksPerComputeNode = 2
         $autoScaleFormula = '$TargetDedicated=2'
+        $evalInterval = [TimeSpan]::FromMinutes(7)
 
         $startTask = New-Object Microsoft.Azure.Commands.Batch.Models.PSStartTask
         $startTaskCmd = "cmd /c dir /s"
@@ -69,7 +70,7 @@ function Test-NewPool
 
         $displayName = "displayName"
 
-        New-AzureBatchPool -Id $poolId2 -VirtualMachineSize $vmSize -OSFamily $osFamily -TargetOSVersion $targetOSVersion -DisplayName $displayName -MaxTasksPerComputeNode $maxTasksPerComputeNode -AutoScaleFormula $autoScaleFormula -StartTask $startTask -TaskSchedulingPolicy $schedulingPolicy -InterComputeNodeCommunicationEnabled -Metadata $metadata -BatchContext $context
+        New-AzureBatchPool -Id $poolId2 -VirtualMachineSize $vmSize -OSFamily $osFamily -TargetOSVersion $targetOSVersion -DisplayName $displayName -MaxTasksPerComputeNode $maxTasksPerComputeNode -AutoScaleFormula $autoScaleFormula -AutoScaleEvaluationInterval $evalInterval -StartTask $startTask -TaskSchedulingPolicy $schedulingPolicy -InterComputeNodeCommunicationEnabled -Metadata $metadata -BatchContext $context
 
         $pool2 = Get-AzureBatchPool -Id $poolId2 -BatchContext $context
 
@@ -82,6 +83,7 @@ function Test-NewPool
         Assert-AreEqual $maxTasksPerComputeNOde $pool2.MaxTasksPerComputeNode
         Assert-AreEqual $true $pool2.AutoScaleEnabled
         Assert-AreEqual $autoScaleFormula $pool2.AutoScaleFormula
+        Assert-AreEqual $evalInterval $pool2.AutoScaleEvaluationInterval
         Assert-AreEqual $true $pool2.InterComputeNodeCommunicationEnabled
         Assert-AreEqual $startTaskCmd $pool2.StartTask.CommandLine
         Assert-AreEqual $resourceFileCount $pool2.StartTask.ResourceFiles.Count

src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.PoolTests/TestNewPool.json

@@ -6119,6 +6119,13 @@
           </maml:description>
           <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
+          <maml:name>AutoScaleEvaluationInterval</maml:name>
+          <maml:description>
+            <maml:para>Specifies time interval at which to automatically adjust the pool size according to the AutoScale formula. The default value is 15 minutes. The minimum allowed value is 5 minutes.</maml:para>
+          </maml:description>
+          <command:parameterValue required="true" variableLength="false">TimeSpan</command:parameterValue>
+        </command:parameter>
         <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
           <maml:name>AutoScaleFormula</maml:name>
           <maml:description>
@@ -6335,6 +6342,18 @@
       </command:syntaxItem>
     </command:syntax>
     <command:parameters>
+      <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
+        <maml:name>AutoScaleEvaluationInterval</maml:name>
+        <maml:description>
+          <maml:para>Specifies time interval at which to automatically adjust the pool size according to the AutoScale formula. The default value is 15 minutes. The minimum allowed value is 5 minutes.</maml:para>
+        </maml:description>
+        <command:parameterValue required="true" variableLength="false">TimeSpan</command:parameterValue>
+        <dev:type>
+          <maml:name>TimeSpan</maml:name>
+          <maml:uri />
+        </dev:type>
+        <dev:defaultValue>none</dev:defaultValue>
+      </command:parameter>
       <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
         <maml:name>AutoScaleFormula</maml:name>
         <maml:description>

src/ResourceManager/AzureBatch/Commands.Batch/Microsoft.Azure.Commands.Batch.dll-Help.xml

@@ -92,6 +92,7 @@ public void CreatePool(NewPoolParameters parameters)
             if (!string.IsNullOrEmpty(parameters.AutoScaleFormula))
             {
                 pool.AutoScaleEnabled = true;
+                pool.AutoScaleEvaluationInterval = parameters.AutoScaleEvaluationInterval;
                 pool.AutoScaleFormula = parameters.AutoScaleFormula;
             }
             else if (parameters.TargetDedicated.HasValue)

src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.Pools.cs

@@ -67,6 +67,11 @@ public NewPoolParameters(BatchAccountContext context, string poolId, IEnumerable
         /// </summary>
         public int? TargetDedicated { get; set; }
 
+        /// <summary>
+        /// The time interval at which to automatically adjust the pool size according to the AutoScaleFormula.
+        /// </summary>
+        public TimeSpan? AutoScaleEvaluationInterval { get; set; }
+
         /// <summary>
         /// The AutoScale formula to use with the pool.
         /// </summary>

src/ResourceManager/AzureBatch/Commands.Batch/Models/NewPoolParameters.cs

@@ -56,6 +56,10 @@ public class NewBatchPoolCommand : BatchObjectModelCmdletBase
         [ValidateNotNullOrEmpty]
         public int? TargetDedicated { get; set; }
 
+        [Parameter(ParameterSetName = AutoScaleParameterSet)]
+        [ValidateNotNullOrEmpty]
+        public TimeSpan? AutoScaleEvaluationInterval { get; set; }
+
         [Parameter(ParameterSetName = AutoScaleParameterSet)]
         [ValidateNotNullOrEmpty]
         public string AutoScaleFormula { get; set; }
@@ -93,6 +97,7 @@ public override void ExecuteCmdlet()
                 TargetOSVersion = this.TargetOSVersion,
                 ResizeTimeout = this.ResizeTimeout,
                 TargetDedicated = this.TargetDedicated,
+                AutoScaleEvaluationInterval = this.AutoScaleEvaluationInterval,
                 AutoScaleFormula = this.AutoScaleFormula,
                 MaxTasksPerComputeNode = this.MaxTasksPerComputeNode,
                 TaskSchedulingPolicy = this.TaskSchedulingPolicy,

src/ResourceManager/AzureBatch/Commands.Batch/Pools/NewBatchPoolCommand.cs

@@ -265,10 +265,10 @@
     <value>Getting accounts in resource group {0}</value>
   </data>
   <data name="GetSubtaskNoFilter" xml:space="preserve">
-    <value>Getting all subtasks under task {0}.</value>
+    <value>Getting all subtask information for task {0}.</value>
   </data>
   <data name="GetSubtaskOData" xml:space="preserve">
-    <value>Getting subtasks matching the specified OData filter under task {0}.</value>
+    <value>Getting subtask information matching the specified OData filter for task {0}.</value>
   </data>
   <data name="GetTaskById" xml:space="preserve">
     <value>Getting task "{0}" from job "{1}"</value>