Skip to content

Commit ad1cf6f

Browse files
author
jasper-schneider
committed
Merge dev branch changes into Batch update cmdlets
1 parent 6950060 commit ad1cf6f

16 files changed

+30
-30
lines changed

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeUserTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@ protected override void ProcessRecord()
142142
[Cmdlet(VerbsCommon.Set, "AzureBatchComputeNodeUser_ST")]
143143
public class SetBatchComputeNodeUserScenarioTestCommand : SetBatchComputeNodeUserCommand
144144
{
145-
public override void ExecuteCmdlet()
145+
protected override void ProcessRecord()
146146
{
147147
AdditionalBehaviors = new List<BatchClientBehavior>() { ScenarioTestHelpers.CreateHttpRecordingInterceptor() };
148-
base.ExecuteCmdlet();
148+
base.ProcessRecord();
149149
}
150150
}
151151
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function Test-UpdateComputeNodeUser
4949
{
5050
param([string]$accountName, [string]$poolId, [string]$computeNodeId, [string]$userName)
5151

52-
$context = Get-AzureBatchAccountKeys -Name $accountName
52+
$context = Get-AzureRMBatchAccountKeys -Name $accountName
5353

5454
# Basically just validating that we can set the parameters and execute the cmdlet without error.
5555
# If a Get user API is added, we can validate that the properties were actually updated.

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobScheduleTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,10 @@ protected override void ProcessRecord()
329329
[Cmdlet(VerbsCommon.Set, "AzureBatchJobSchedule_ST")]
330330
public class SetBatchJobScheduleScenarioTestCommand : SetBatchJobScheduleCommand
331331
{
332-
public override void ExecuteCmdlet()
332+
protected override void ProcessRecord()
333333
{
334334
AdditionalBehaviors = new List<BatchClientBehavior>() { ScenarioTestHelpers.CreateHttpRecordingInterceptor() };
335-
base.ExecuteCmdlet();
335+
base.ProcessRecord();
336336
}
337337
}
338338
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ function Test-UpdateJobSchedule
336336
{
337337
param([string]$accountName, [string]$jobScheduleId)
338338

339-
$context = Get-AzureBatchAccountKeys -Name $accountName
339+
$context = Get-AzureRMBatchAccountKeys -Name $accountName
340340

341341
$jobSchedule = Get-AzureBatchJobSchedule_ST $jobScheduleId -BatchContext $context
342342

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,10 @@ protected override void ProcessRecord()
312312
[Cmdlet(VerbsCommon.Set, "AzureBatchJob_ST")]
313313
public class SetBatchJobScenarioTestCommand : SetBatchJobCommand
314314
{
315-
public override void ExecuteCmdlet()
315+
protected override void ProcessRecord()
316316
{
317317
AdditionalBehaviors = new List<BatchClientBehavior>() { ScenarioTestHelpers.CreateHttpRecordingInterceptor() };
318-
base.ExecuteCmdlet();
318+
base.ProcessRecord();
319319
}
320320
}
321321

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ function Test-UpdateJob
333333
{
334334
param([string]$accountName, [string]$jobId)
335335

336-
$context = Get-AzureBatchAccountKeys -Name $accountName
336+
$context = Get-AzureRMBatchAccountKeys -Name $accountName
337337

338338
# Create the job with an auto pool
339339
$poolSpec = New-Object Microsoft.Azure.Commands.Batch.Models.PSPoolSpecification

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,10 +467,10 @@ protected override void ProcessRecord()
467467
[Cmdlet(VerbsCommon.Set, "AzureBatchPool_ST")]
468468
public class SetBatchPoolScenarioTestCommand : SetBatchPoolCommand
469469
{
470-
public override void ExecuteCmdlet()
470+
protected override void ProcessRecord()
471471
{
472472
AdditionalBehaviors = new List<BatchClientBehavior>() { ScenarioTestHelpers.CreateHttpRecordingInterceptor() };
473-
base.ExecuteCmdlet();
473+
base.ProcessRecord();
474474
}
475475
}
476476

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ function Test-UpdatePool
172172
{
173173
param([string]$accountName, [string]$poolId)
174174

175-
$context = Get-AzureBatchAccountKeys -Name $accountName
175+
$context = Get-AzureRMBatchAccountKeys -Name $accountName
176176

177177
$pool = Get-AzureBatchPool_ST $poolId -BatchContext $context
178178

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,10 +313,10 @@ protected override void ProcessRecord()
313313
[Cmdlet(VerbsCommon.Set, "AzureBatchTask_ST")]
314314
public class SetBatchTaskScenarioTestCommand : SetBatchTaskCommand
315315
{
316-
public override void ExecuteCmdlet()
316+
protected override void ProcessRecord()
317317
{
318318
AdditionalBehaviors = new List<BatchClientBehavior>() { ScenarioTestHelpers.CreateHttpRecordingInterceptor() };
319-
base.ExecuteCmdlet();
319+
base.ProcessRecord();
320320
}
321321
}
322322

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ function Test-UpdateTask
183183
{
184184
param([string]$accountName, [string]$jobId, [string]$taskId)
185185

186-
$context = Get-AzureBatchAccountKeys -Name $accountName
186+
$context = Get-AzureRMBatchAccountKeys -Name $accountName
187187

188188
$task = Get-AzureBatchTask_ST $jobId $taskId -BatchContext $context
189189

src/ResourceManager/AzureBatch/Commands.Batch/ComputeNodeUsers/SetBatchComputeNodeUserCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class SetBatchComputeNodeUserCommand : BatchObjectModelCmdletBase
4545
[ValidateNotNullOrEmpty]
4646
public DateTime ExpiryTime { get; set; }
4747

48-
public override void ExecuteCmdlet()
48+
protected override void ProcessRecord()
4949
{
5050
UpdateComputeNodeUserParameters parameters = new UpdateComputeNodeUserParameters(this.BatchContext,
5151
this.PoolId, this.ComputeNodeId, this.Name, this.AdditionalBehaviors)

src/ResourceManager/AzureBatch/Commands.Batch/JobSchedules/SetBatchJobScheduleCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class SetBatchJobScheduleCommand : BatchObjectModelCmdletBase
2626
[ValidateNotNullOrEmpty]
2727
public PSCloudJobSchedule JobSchedule { get; set; }
2828

29-
public override void ExecuteCmdlet()
29+
protected override void ProcessRecord()
3030
{
3131
this.BatchClient.UpdateJobSchedule(this.BatchContext, this.JobSchedule, this.AdditionalBehaviors);
3232
}

src/ResourceManager/AzureBatch/Commands.Batch/Jobs/SetBatchJobCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class SetBatchJobCommand : BatchObjectModelCmdletBase
2626
[ValidateNotNullOrEmpty]
2727
public PSCloudJob Job { get; set; }
2828

29-
public override void ExecuteCmdlet()
29+
protected override void ProcessRecord()
3030
{
3131
this.BatchClient.UpdateJob(this.BatchContext, this.Job, this.AdditionalBehaviors);
3232
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9468,7 +9468,7 @@ cmdletexample westus cmdletexamplerg {System.Collection https:
94689468
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByValue)" position="named">
94699469
<maml:name>BatchContext</maml:name>
94709470
<maml:description>
9471-
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
9471+
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
94729472
</maml:description>
94739473
<command:parameterValue required="true" variableLength="false">BatchAccountContext</command:parameterValue>
94749474
</command:parameter>
@@ -9486,7 +9486,7 @@ cmdletexample westus cmdletexamplerg {System.Collection https:
94869486
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByValue)" position="named">
94879487
<maml:name>BatchContext</maml:name>
94889488
<maml:description>
9489-
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
9489+
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
94909490

94919491
</maml:description>
94929492
<command:parameterValue required="true" variableLength="false">BatchAccountContext</command:parameterValue>
@@ -9677,7 +9677,7 @@ cmdletexample westus cmdletexamplerg {System.Collection https:
96779677
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByValue)" position="named">
96789678
<maml:name>BatchContext</maml:name>
96799679
<maml:description>
9680-
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
9680+
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
96819681
</maml:description>
96829682
<command:parameterValue required="true" variableLength="false">BatchAccountContext</command:parameterValue>
96839683
</command:parameter>
@@ -9688,7 +9688,7 @@ cmdletexample westus cmdletexamplerg {System.Collection https:
96889688
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByValue)" position="named">
96899689
<maml:name>BatchContext</maml:name>
96909690
<maml:description>
9691-
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
9691+
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
96929692

96939693
</maml:description>
96949694
<command:parameterValue required="true" variableLength="false">BatchAccountContext</command:parameterValue>
@@ -9829,7 +9829,7 @@ cmdletexample westus cmdletexamplerg {System.Collection https:
98299829
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByValue)" position="named">
98309830
<maml:name>BatchContext</maml:name>
98319831
<maml:description>
9832-
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
9832+
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
98339833
</maml:description>
98349834
<command:parameterValue required="true" variableLength="false">BatchAccountContext</command:parameterValue>
98359835
</command:parameter>
@@ -9840,7 +9840,7 @@ cmdletexample westus cmdletexamplerg {System.Collection https:
98409840
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByValue)" position="named">
98419841
<maml:name>BatchContext</maml:name>
98429842
<maml:description>
9843-
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
9843+
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
98449844

98459845
</maml:description>
98469846
<command:parameterValue required="true" variableLength="false">BatchAccountContext</command:parameterValue>
@@ -9984,7 +9984,7 @@ cmdletexample westus cmdletexamplerg {System.Collection https:
99849984
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByValue)" position="named">
99859985
<maml:name>BatchContext</maml:name>
99869986
<maml:description>
9987-
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
9987+
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
99889988
</maml:description>
99899989
<command:parameterValue required="true" variableLength="false">BatchAccountContext</command:parameterValue>
99909990
</command:parameter>
@@ -9995,7 +9995,7 @@ cmdletexample westus cmdletexamplerg {System.Collection https:
99959995
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByValue)" position="named">
99969996
<maml:name>BatchContext</maml:name>
99979997
<maml:description>
9998-
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
9998+
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
99999999

1000010000
</maml:description>
1000110001
<command:parameterValue required="true" variableLength="false">BatchAccountContext</command:parameterValue>
@@ -10138,7 +10138,7 @@ cmdletexample westus cmdletexamplerg {System.Collection https:
1013810138
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByValue)" position="named">
1013910139
<maml:name>BatchContext</maml:name>
1014010140
<maml:description>
10141-
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
10141+
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
1014210142
</maml:description>
1014310143
<command:parameterValue required="true" variableLength="false">BatchAccountContext</command:parameterValue>
1014410144
</command:parameter>
@@ -10149,7 +10149,7 @@ cmdletexample westus cmdletexamplerg {System.Collection https:
1014910149
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByValue)" position="named">
1015010150
<maml:name>BatchContext</maml:name>
1015110151
<maml:description>
10152-
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
10152+
<maml:para>The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated.</maml:para>
1015310153

1015410154
</maml:description>
1015510155
<command:parameterValue required="true" variableLength="false">BatchAccountContext</command:parameterValue>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class SetBatchPoolCommand : BatchObjectModelCmdletBase
2626
[ValidateNotNullOrEmpty]
2727
public PSCloudPool Pool { get; set; }
2828

29-
public override void ExecuteCmdlet()
29+
protected override void ProcessRecord()
3030
{
3131
this.BatchClient.UpdatePool(this.BatchContext, this.Pool, this.AdditionalBehaviors);
3232
}

src/ResourceManager/AzureBatch/Commands.Batch/Tasks/SetBatchTaskCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class SetBatchTaskCommand : BatchObjectModelCmdletBase
2626
[ValidateNotNullOrEmpty]
2727
public PSCloudTask Task { get; set; }
2828

29-
public override void ExecuteCmdlet()
29+
protected override void ProcessRecord()
3030
{
3131
this.BatchClient.UpdateTask(this.BatchContext, this.Task, this.AdditionalBehaviors);
3232
}

0 commit comments

Comments
 (0)