Skip to content

Commit 2d5f1d2

Browse files
hyonholeehyonholee
committed
Re-generate VMSS and ACS cmdlets with update Powershell auto-generator.
Now it supports piping scenario and table formats for list operations
1 parent 43dd149 commit 2d5f1d2

File tree

44 files changed

+693
-155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+693
-155
lines changed

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ContainerServiceTests.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ function Test-ContainerService
2727
$loc = 'australiasoutheast';
2828
New-AzureRMResourceGroup -Name $rgname -Location $loc -Force;
2929

30-
3130
$csName = 'cs' + $rgname;
3231
$masterDnsPrefixName = 'master' + $rgname;
3332
$agentPoolDnsPrefixName = 'ap' + $rgname;
@@ -63,10 +62,13 @@ function Test-ContainerService
6362
| Add-AzureRmContainerServiceAgentPoolProfile -Name $agentPoolProfileName -VmSize $vmSize -DnsPrefix $agentPoolDnsPrefixName `
6463
| New-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
6564

66-
6765
$cs = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
66+
$output = $cs | Out-String;
67+
Assert-True { $output.Contains("AgentPoolProfiles") };
6868

6969
$cslist = Get-AzureRmContainerService -ResourceGroupName $rgname;
70+
$output = $cslist | Out-String;
71+
Assert-False { $output.Contains("AgentPoolProfiles") };
7072

7173
$st = Remove-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
7274
}
@@ -92,7 +94,6 @@ function Test-ContainerServiceUpdate
9294
$loc = 'australiasoutheast';
9395
New-AzureRMResourceGroup -Name $rgname -Location $loc -Force;
9496

95-
9697
$csName = 'cs' + $rgname;
9798
$masterDnsPrefixName = 'master' + $rgname;
9899
$agentPoolDnsPrefixName = 'ap' + $rgname;
@@ -141,10 +142,9 @@ function Test-ContainerServiceUpdate
141142
-VmSize $vmSize `
142143
-DnsPrefix $agentPoolDnsPrefixName `
143144
-Count 2 `
144-
| Update-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
145+
| Update-AzureRmContainerService;
145146

146-
$cs = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
147-
$st = Remove-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
147+
$st = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName | Remove-AzureRmContainerService;
148148
}
149149
finally
150150
{

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ function Test-VirtualMachineScaleSet
131131

132132
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmss');
133133
$vmssResult = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
134+
Assert-AreEqual $vmssName $vmssResult.Name;
134135
Assert-True { $vmssName -eq $vmssResult.Name };
135136
$output = $vmssResult | Out-String;
136137
Write-Verbose ($output);
@@ -142,18 +143,15 @@ function Test-VirtualMachineScaleSet
142143
Assert-True { ($vmssList | select -ExpandProperty Name) -contains $vmssName };
143144
$output = $vmssList | Out-String;
144145
Write-Verbose ($output);
145-
Assert-True { $output.Contains("VirtualMachineProfile") };
146-
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmss | Format-Table');
147-
$output = $vmssList | Format-Table | Out-String;
148-
Write-Verbose ($output);
146+
Assert-False { $output.Contains("VirtualMachineProfile") };
149147

150148
# List from RG
151149
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmss List');
152150
$vmssList = Get-AzureRmVmss -ResourceGroupName $rgname;
153151
Assert-True { ($vmssList | select -ExpandProperty Name) -contains $vmssName };
154152
$output = $vmssList | Out-String;
155153
Write-Verbose ($output);
156-
Assert-True { $output.Contains("VirtualMachineProfile") };
154+
Assert-False { $output.Contains("VirtualMachineProfile") };
157155

158156
# List Skus
159157
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmssSku');
@@ -170,10 +168,7 @@ function Test-VirtualMachineScaleSet
170168
$vmListResult = Get-AzureRmVmssVM -ResourceGroupName $rgname -VMScaleSetName $vmssName;
171169
$output = $vmListResult | Out-String;
172170
Write-Verbose ($output);
173-
Assert-True { $output.Contains("StorageProfile") };
174-
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmssVM | Format-Table');
175-
$output = $vmListResult | Format-Table | Out-String;
176-
Write-Verbose ($output);
171+
Assert-False { $output.Contains("StorageProfile") };
177172

178173
# List each VM
179174
for ($i = 0; $i -lt 2; $i++)
@@ -189,29 +184,30 @@ function Test-VirtualMachineScaleSet
189184
$vmInstance = Get-AzureRmVmssVM -InstanceView -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $i;
190185
Assert-NotNull $vmInstance;
191186
$output = $vmInstance | Out-String;
187+
192188
Write-Verbose($output);
193189
Assert-True { $output.Contains("PlatformUpdateDomain") };
194190
}
195191

196-
$st = Stop-AzureRmVmss -StayProvision -ResourceGroupName $rgname -VMScaleSetName $vmssName;
197-
$st = Stop-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
198-
$st = Start-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
199-
$st = Restart-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
192+
$st = $vmssResult | Stop-AzureRmVmss -StayProvision;
193+
$st = $vmssResult | Stop-AzureRmVmss;
194+
$st = $vmssResult | Start-AzureRmVmss;
195+
$st = $vmssResult | Restart-AzureRmVmss;
200196

201197
$instanceListParam = @();
202198
for ($i = 0; $i -lt 2; $i++)
203199
{
204200
$instanceListParam += $i.ToString();
205201
}
206202

207-
$st = Stop-AzureRmVmss -StayProvision -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $instanceListParam;
208-
$st = Stop-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $instanceListParam;
209-
$st = Start-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $instanceListParam;
210-
$st = Restart-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $instanceListParam;
203+
$st = $vmssResult | Stop-AzureRmVmss -StayProvision -InstanceId $instanceListParam;
204+
$st = $vmssResult | Stop-AzureRmVmss -InstanceId $instanceListParam;
205+
$st = $vmssResult | Start-AzureRmVmss -InstanceId $instanceListParam;
206+
$st = $vmssResult | Restart-AzureRmVmss -InstanceId $instanceListParam;
211207

212208
# Remove
213209
$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId 1;
214-
$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
210+
$st = $vmssResult | Remove-AzureRmVmss;
215211
}
216212
finally
217213
{
@@ -491,15 +487,15 @@ function Test-VirtualMachineScaleSetLB
491487
Assert-True { ($vmssList | select -ExpandProperty Name) -contains $vmssName };
492488
$output = $vmssList | Out-String;
493489
Write-Verbose ($output);
494-
Assert-True { $output.Contains("VirtualMachineProfile") };
490+
Assert-False { $output.Contains("VirtualMachineProfile") };
495491

496492
# List from RG
497493
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmss List');
498494
$vmssList = Get-AzureRmVmss -ResourceGroupName $rgname;
499495
Assert-True { ($vmssList | select -ExpandProperty Name) -contains $vmssName };
500496
$output = $vmssList | Out-String;
501497
Write-Verbose ($output);
502-
Assert-True { $output.Contains("VirtualMachineProfile") };
498+
Assert-False { $output.Contains("VirtualMachineProfile") };
503499

504500
# List Skus
505501
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmssSku');
@@ -512,7 +508,7 @@ function Test-VirtualMachineScaleSetLB
512508
$vmListResult = Get-AzureRmVmssVM -ResourceGroupName $rgname -VMScaleSetName $vmssName; # -Select $null;
513509
$output = $vmListResult | Out-String;
514510
Write-Verbose ($output);
515-
Assert-True { $output.Contains("StorageProfile") };
511+
Assert-False { $output.Contains("StorageProfile") };
516512

517513
# List each VM
518514
for ($i = 0; $i -lt 2; $i++)

‎src/ResourceManager/Compute/Commands.Compute/Generated/ComputeAutomationBaseCmdlet.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
// Changes to this file may cause incorrect behavior and will be lost if the
2020
// code is regenerated.
2121

22-
using Microsoft.Azure;
2322
using Microsoft.Azure.Commands.Compute.Automation.Models;
2423
using Microsoft.Azure.Management.Compute;
2524
using Microsoft.Azure.Management.Compute.Models;
@@ -34,6 +33,12 @@ namespace Microsoft.Azure.Commands.Compute.Automation
3433
{
3534
public abstract class ComputeAutomationBaseCmdlet : Microsoft.Azure.Commands.Compute.ComputeClientBaseCmdlet
3635
{
36+
public override void ExecuteCmdlet()
37+
{
38+
base.ExecuteCmdlet();
39+
ComputeAutomationAutoMapperProfile.Initialize();
40+
}
41+
3742
protected static PSArgument[] ConvertFromObjectsToArguments(string[] names, object[] objects)
3843
{
3944
var arguments = new PSArgument[objects.Length];

‎src/ResourceManager/Compute/Commands.Compute/Generated/ContainerService/ContainerServiceCreateOrUpdateMethod.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
// Changes to this file may cause incorrect behavior and will be lost if the
2020
// code is regenerated.
2121

22-
using Microsoft.Azure;
2322
using Microsoft.Azure.Commands.Compute.Automation.Models;
2423
using Microsoft.Azure.Management.Compute;
2524
using Microsoft.Azure.Management.Compute.Models;
@@ -28,7 +27,6 @@
2827
using System.Collections.Generic;
2928
using System.Linq;
3029
using System.Management.Automation;
31-
using System.Reflection;
3230

3331
namespace Microsoft.Azure.Commands.Compute.Automation
3432
{
@@ -138,6 +136,7 @@ public override object GetDynamicParameters()
138136
ParameterSetName = "InvokeByDynamicParameters",
139137
Position = 1,
140138
Mandatory = true,
139+
ValueFromPipelineByPropertyName = true,
141140
ValueFromPipeline = false
142141
});
143142
pResourceGroupName.Attributes.Add(new AllowNullAttribute());
@@ -151,6 +150,7 @@ public override object GetDynamicParameters()
151150
ParameterSetName = "InvokeByDynamicParameters",
152151
Position = 2,
153152
Mandatory = true,
153+
ValueFromPipelineByPropertyName = true,
154154
ValueFromPipeline = false
155155
});
156156
pContainerServiceName.Attributes.Add(new AllowNullAttribute());
@@ -164,6 +164,7 @@ public override object GetDynamicParameters()
164164
ParameterSetName = "InvokeByDynamicParameters",
165165
Position = 3,
166166
Mandatory = true,
167+
ValueFromPipelineByPropertyName = false,
167168
ValueFromPipeline = true
168169
});
169170
pParameters.Attributes.Add(new AllowNullAttribute());
@@ -198,6 +199,7 @@ public override object GetDynamicParameters()
198199
ParameterSetName = "InvokeByDynamicParameters",
199200
Position = 1,
200201
Mandatory = true,
202+
ValueFromPipelineByPropertyName = true,
201203
ValueFromPipeline = false
202204
});
203205
pResourceGroupName.Attributes.Add(new AllowNullAttribute());
@@ -211,6 +213,7 @@ public override object GetDynamicParameters()
211213
ParameterSetName = "InvokeByDynamicParameters",
212214
Position = 2,
213215
Mandatory = true,
216+
ValueFromPipelineByPropertyName = true,
214217
ValueFromPipeline = false
215218
});
216219
pContainerServiceName.Attributes.Add(new AllowNullAttribute());
@@ -224,6 +227,7 @@ public override object GetDynamicParameters()
224227
ParameterSetName = "InvokeByDynamicParameters",
225228
Position = 3,
226229
Mandatory = true,
230+
ValueFromPipelineByPropertyName = false,
227231
ValueFromPipeline = true
228232
});
229233
pParameters.Attributes.Add(new AllowNullAttribute());

‎src/ResourceManager/Compute/Commands.Compute/Generated/ContainerService/ContainerServiceDeleteMethod.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
// Changes to this file may cause incorrect behavior and will be lost if the
2020
// code is regenerated.
2121

22-
using Microsoft.Azure;
2322
using Microsoft.Azure.Commands.Compute.Automation.Models;
2423
using Microsoft.Azure.Management.Compute;
2524
using Microsoft.Azure.Management.Compute.Models;
@@ -28,7 +27,6 @@
2827
using System.Collections.Generic;
2928
using System.Linq;
3029
using System.Management.Automation;
31-
using System.Reflection;
3230

3331
namespace Microsoft.Azure.Commands.Compute.Automation
3432
{
@@ -120,6 +118,7 @@ public override object GetDynamicParameters()
120118
ParameterSetName = "InvokeByDynamicParameters",
121119
Position = 1,
122120
Mandatory = true,
121+
ValueFromPipelineByPropertyName = true,
123122
ValueFromPipeline = false
124123
});
125124
pResourceGroupName.Attributes.Add(new AllowNullAttribute());
@@ -133,6 +132,7 @@ public override object GetDynamicParameters()
133132
ParameterSetName = "InvokeByDynamicParameters",
134133
Position = 2,
135134
Mandatory = true,
135+
ValueFromPipelineByPropertyName = true,
136136
ValueFromPipeline = false
137137
});
138138
pContainerServiceName.Attributes.Add(new AllowNullAttribute());

‎src/ResourceManager/Compute/Commands.Compute/Generated/ContainerService/ContainerServiceGetMethod.cs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
// Changes to this file may cause incorrect behavior and will be lost if the
2020
// code is regenerated.
2121

22-
using Microsoft.Azure;
22+
using AutoMapper;
2323
using Microsoft.Azure.Commands.Compute.Automation.Models;
2424
using Microsoft.Azure.Management.Compute;
2525
using Microsoft.Azure.Management.Compute.Models;
@@ -28,7 +28,6 @@
2828
using System.Collections.Generic;
2929
using System.Linq;
3030
using System.Management.Automation;
31-
using System.Reflection;
3231

3332
namespace Microsoft.Azure.Commands.Compute.Automation
3433
{
@@ -84,12 +83,19 @@ protected void ExecuteContainerServiceGetMethod(object[] invokeMethodInputParame
8483
if (!string.IsNullOrEmpty(resourceGroupName) && !string.IsNullOrEmpty(containerServiceName))
8584
{
8685
var result = ContainerServiceClient.Get(resourceGroupName, containerServiceName);
87-
WriteObject(result);
86+
var psObject = new PSContainerService();
87+
Mapper.Map<ContainerService, PSContainerService>(result, psObject);
88+
WriteObject(psObject);
8889
}
8990
else if (!string.IsNullOrEmpty(resourceGroupName))
9091
{
9192
var result = ContainerServiceClient.List(resourceGroupName);
92-
WriteObject(result);
93+
var psObject = new List<PSContainerServiceList>();
94+
foreach (var r in result)
95+
{
96+
psObject.Add(Mapper.Map<ContainerService, PSContainerServiceList>(r));
97+
}
98+
WriteObject(psObject);
9399
}
94100
}
95101

@@ -130,6 +136,7 @@ public override object GetDynamicParameters()
130136
ParameterSetName = "InvokeByDynamicParameters",
131137
Position = 1,
132138
Mandatory = false,
139+
ValueFromPipelineByPropertyName = true,
133140
ValueFromPipeline = false
134141
});
135142
pResourceGroupName.Attributes.Add(new AllowNullAttribute());
@@ -143,6 +150,7 @@ public override object GetDynamicParameters()
143150
ParameterSetName = "InvokeByDynamicParameters",
144151
Position = 2,
145152
Mandatory = false,
153+
ValueFromPipelineByPropertyName = true,
146154
ValueFromPipeline = false
147155
});
148156
pContainerServiceName.Attributes.Add(new AllowNullAttribute());

‎src/ResourceManager/Compute/Commands.Compute/Generated/ContainerService/ContainerServiceListMethod.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
// Changes to this file may cause incorrect behavior and will be lost if the
2020
// code is regenerated.
2121

22-
using Microsoft.Azure;
2322
using Microsoft.Azure.Commands.Compute.Automation.Models;
2423
using Microsoft.Azure.Management.Compute;
2524
using Microsoft.Azure.Management.Compute.Models;
@@ -28,7 +27,6 @@
2827
using System.Collections.Generic;
2928
using System.Linq;
3029
using System.Management.Automation;
31-
using System.Reflection;
3230

3331
namespace Microsoft.Azure.Commands.Compute.Automation
3432
{

‎src/ResourceManager/Compute/Commands.Compute/Generated/InvokeAzureComputeMethodCmdlet.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,8 @@
1919
// Changes to this file may cause incorrect behavior and will be lost if the
2020
// code is regenerated.
2121

22-
using Microsoft.Azure;
23-
using Microsoft.Azure.Commands.Compute.Automation.Models;
24-
using Microsoft.Azure.Management.Compute;
25-
using Microsoft.Azure.Management.Compute.Models;
26-
using System;
27-
using System.Collections;
2822
using System.Collections.Generic;
29-
using System.Linq;
3023
using System.Management.Automation;
31-
using System.Reflection;
3224

3325
namespace Microsoft.Azure.Commands.Compute.Automation
3426
{

0 commit comments

Comments
 (0)