Skip to content

Commit faa71ef

Browse files
huangpfhuangpf
committed
Merge pull request #143 from huangpf/vmss
Combine InstanceView Methods
2 parents 402dcb2 + 174b580 commit faa71ef

File tree

8 files changed

+124
-144
lines changed

8 files changed

+124
-144
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@ Add-AzureRmVmssPublicKey 1.2.3 AzureRM.Compute
2929
Add-AzureRmVmssSecret 1.2.3 AzureRM.Compute
3030
Get-AzureRmVmss 1.2.3 AzureRM.Compute
3131
Get-AzureRmVmssAllList 1.2.3 AzureRM.Compute
32-
Get-AzureRmVmssInstanceView 1.2.3 AzureRM.Compute
3332
Get-AzureRmVmssList 1.2.3 AzureRM.Compute
3433
Get-AzureRmVmssSkusList 1.2.3 AzureRM.Compute
3534
Get-AzureRmVmssVM 1.2.3 AzureRM.Compute
36-
Get-AzureRmVmssVMInstanceView 1.2.3 AzureRM.Compute
3735
Get-AzureRmVmssVMList 1.2.3 AzureRM.Compute
3836
New-AzureRmVmss 1.2.3 AzureRM.Compute
3937
New-AzureRmVmssConfig 1.2.3 AzureRM.Compute
@@ -169,8 +167,8 @@ function Test-VirtualMachineScaleSet
169167
Write-Verbose ($output);
170168
Assert-True { $output.Contains("StorageProfile") };
171169

172-
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmssVMInstanceView');
173-
$vmInstance = Get-AzureRmVmssVMInstanceView -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $i;
170+
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmssVM -InstanceView');
171+
$vmInstance = Get-AzureRmVmssVM -InstanceView -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $i;
174172
Assert-NotNull $vmInstance;
175173
$output = $vmInstance | Out-String;
176174
Write-Verbose($output);

‎src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetInstanceViewMethod.cs‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -96,62 +96,4 @@ protected PSArgument[] CreateVirtualMachineScaleSetGetInstanceViewParameters()
9696
new object[] { resourceGroupName, vmScaleSetName });
9797
}
9898
}
99-
100-
[Cmdlet("Get", "AzureRmVmssInstanceView", DefaultParameterSetName = "InvokeByDynamicParameters")]
101-
public partial class GetAzureRmVMSSInstanceView : InvokeAzureComputeMethodCmdlet
102-
{
103-
public GetAzureRmVMSSInstanceView()
104-
{
105-
}
106-
107-
public override string MethodName { get; set; }
108-
109-
protected override void ProcessRecord()
110-
{
111-
this.MethodName = "VirtualMachineScaleSetGetInstanceView";
112-
base.ProcessRecord();
113-
}
114-
115-
public override object GetDynamicParameters()
116-
{
117-
dynamicParameters = new RuntimeDefinedParameterDictionary();
118-
var pResourceGroupName = new RuntimeDefinedParameter();
119-
pResourceGroupName.Name = "ResourceGroupName";
120-
pResourceGroupName.ParameterType = typeof(string);
121-
pResourceGroupName.Attributes.Add(new ParameterAttribute
122-
{
123-
ParameterSetName = "InvokeByDynamicParameters",
124-
Position = 1,
125-
Mandatory = false
126-
});
127-
pResourceGroupName.Attributes.Add(new AllowNullAttribute());
128-
dynamicParameters.Add("ResourceGroupName", pResourceGroupName);
129-
130-
var pVMScaleSetName = new RuntimeDefinedParameter();
131-
pVMScaleSetName.Name = "VMScaleSetName";
132-
pVMScaleSetName.ParameterType = typeof(string);
133-
pVMScaleSetName.Attributes.Add(new ParameterAttribute
134-
{
135-
ParameterSetName = "InvokeByDynamicParameters",
136-
Position = 2,
137-
Mandatory = false
138-
});
139-
pVMScaleSetName.Attributes.Add(new AllowNullAttribute());
140-
dynamicParameters.Add("VMScaleSetName", pVMScaleSetName);
141-
142-
var pArgumentList = new RuntimeDefinedParameter();
143-
pArgumentList.Name = "ArgumentList";
144-
pArgumentList.ParameterType = typeof(object[]);
145-
pArgumentList.Attributes.Add(new ParameterAttribute
146-
{
147-
ParameterSetName = "InvokeByStaticParameters",
148-
Position = 3,
149-
Mandatory = true
150-
});
151-
pArgumentList.Attributes.Add(new AllowNullAttribute());
152-
dynamicParameters.Add("ArgumentList", pArgumentList);
153-
154-
return dynamicParameters;
155-
}
156-
}
15799
}

‎src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetMethod.cs‎

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,14 @@ public GetAzureRmVMSS()
108108

109109
protected override void ProcessRecord()
110110
{
111-
this.MethodName = "VirtualMachineScaleSetGet";
111+
if (this.ParameterSetName == "InvokeByDynamicParameters")
112+
{
113+
this.MethodName = "VirtualMachineScaleSetGet";
114+
}
115+
else
116+
{
117+
this.MethodName = "VirtualMachineScaleSetGetInstanceView";
118+
}
112119
base.ProcessRecord();
113120
}
114121

@@ -124,6 +131,12 @@ public override object GetDynamicParameters()
124131
Position = 1,
125132
Mandatory = false
126133
});
134+
pResourceGroupName.Attributes.Add(new ParameterAttribute
135+
{
136+
ParameterSetName = "InvokeByDynamicParametersForFriendMethod",
137+
Position = 1,
138+
Mandatory = false
139+
});
127140
pResourceGroupName.Attributes.Add(new AllowNullAttribute());
128141
dynamicParameters.Add("ResourceGroupName", pResourceGroupName);
129142

@@ -136,6 +149,12 @@ public override object GetDynamicParameters()
136149
Position = 2,
137150
Mandatory = false
138151
});
152+
pVMScaleSetName.Attributes.Add(new ParameterAttribute
153+
{
154+
ParameterSetName = "InvokeByDynamicParametersForFriendMethod",
155+
Position = 2,
156+
Mandatory = false
157+
});
139158
pVMScaleSetName.Attributes.Add(new AllowNullAttribute());
140159
dynamicParameters.Add("VMScaleSetName", pVMScaleSetName);
141160

@@ -148,9 +167,33 @@ public override object GetDynamicParameters()
148167
Position = 3,
149168
Mandatory = true
150169
});
170+
pArgumentList.Attributes.Add(new ParameterAttribute
171+
{
172+
ParameterSetName = "InvokeByStaticParametersForFriendMethod",
173+
Position = 3,
174+
Mandatory = true
175+
});
151176
pArgumentList.Attributes.Add(new AllowNullAttribute());
152177
dynamicParameters.Add("ArgumentList", pArgumentList);
153178

179+
var pInstanceView = new RuntimeDefinedParameter();
180+
pInstanceView.Name = "InstanceView";
181+
pInstanceView.ParameterType = typeof(SwitchParameter);
182+
pInstanceView.Attributes.Add(new ParameterAttribute
183+
{
184+
ParameterSetName = "InvokeByDynamicParametersForFriendMethod",
185+
Position = 3,
186+
Mandatory = true
187+
});
188+
pInstanceView.Attributes.Add(new ParameterAttribute
189+
{
190+
ParameterSetName = "InvokeByStaticParametersForFriendMethod",
191+
Position = 4,
192+
Mandatory = true
193+
});
194+
pInstanceView.Attributes.Add(new AllowNullAttribute());
195+
dynamicParameters.Add("InstanceView", pInstanceView);
196+
154197
return dynamicParameters;
155198
}
156199
}

‎src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetInstanceViewMethod.cs‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -110,74 +110,4 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMGetInstanceViewParameters()
110110
new object[] { resourceGroupName, vmScaleSetName, instanceId });
111111
}
112112
}
113-
114-
[Cmdlet("Get", "AzureRmVmssVMInstanceView", DefaultParameterSetName = "InvokeByDynamicParameters")]
115-
public partial class GetAzureRmVMSSVMInstanceView : InvokeAzureComputeMethodCmdlet
116-
{
117-
public GetAzureRmVMSSVMInstanceView()
118-
{
119-
}
120-
121-
public override string MethodName { get; set; }
122-
123-
protected override void ProcessRecord()
124-
{
125-
this.MethodName = "VirtualMachineScaleSetVMGetInstanceView";
126-
base.ProcessRecord();
127-
}
128-
129-
public override object GetDynamicParameters()
130-
{
131-
dynamicParameters = new RuntimeDefinedParameterDictionary();
132-
var pResourceGroupName = new RuntimeDefinedParameter();
133-
pResourceGroupName.Name = "ResourceGroupName";
134-
pResourceGroupName.ParameterType = typeof(string);
135-
pResourceGroupName.Attributes.Add(new ParameterAttribute
136-
{
137-
ParameterSetName = "InvokeByDynamicParameters",
138-
Position = 1,
139-
Mandatory = false
140-
});
141-
pResourceGroupName.Attributes.Add(new AllowNullAttribute());
142-
dynamicParameters.Add("ResourceGroupName", pResourceGroupName);
143-
144-
var pVMScaleSetName = new RuntimeDefinedParameter();
145-
pVMScaleSetName.Name = "VMScaleSetName";
146-
pVMScaleSetName.ParameterType = typeof(string);
147-
pVMScaleSetName.Attributes.Add(new ParameterAttribute
148-
{
149-
ParameterSetName = "InvokeByDynamicParameters",
150-
Position = 2,
151-
Mandatory = false
152-
});
153-
pVMScaleSetName.Attributes.Add(new AllowNullAttribute());
154-
dynamicParameters.Add("VMScaleSetName", pVMScaleSetName);
155-
156-
var pInstanceId = new RuntimeDefinedParameter();
157-
pInstanceId.Name = "InstanceId";
158-
pInstanceId.ParameterType = typeof(string);
159-
pInstanceId.Attributes.Add(new ParameterAttribute
160-
{
161-
ParameterSetName = "InvokeByDynamicParameters",
162-
Position = 3,
163-
Mandatory = false
164-
});
165-
pInstanceId.Attributes.Add(new AllowNullAttribute());
166-
dynamicParameters.Add("InstanceId", pInstanceId);
167-
168-
var pArgumentList = new RuntimeDefinedParameter();
169-
pArgumentList.Name = "ArgumentList";
170-
pArgumentList.ParameterType = typeof(object[]);
171-
pArgumentList.Attributes.Add(new ParameterAttribute
172-
{
173-
ParameterSetName = "InvokeByStaticParameters",
174-
Position = 4,
175-
Mandatory = true
176-
});
177-
pArgumentList.Attributes.Add(new AllowNullAttribute());
178-
dynamicParameters.Add("ArgumentList", pArgumentList);
179-
180-
return dynamicParameters;
181-
}
182-
}
183113
}

‎src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetMethod.cs‎

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,14 @@ public GetAzureRmVMSSVM()
122122

123123
protected override void ProcessRecord()
124124
{
125-
this.MethodName = "VirtualMachineScaleSetVMGet";
125+
if (this.ParameterSetName == "InvokeByDynamicParameters")
126+
{
127+
this.MethodName = "VirtualMachineScaleSetVMGet";
128+
}
129+
else
130+
{
131+
this.MethodName = "VirtualMachineScaleSetVMGetInstanceView";
132+
}
126133
base.ProcessRecord();
127134
}
128135

@@ -138,6 +145,12 @@ public override object GetDynamicParameters()
138145
Position = 1,
139146
Mandatory = false
140147
});
148+
pResourceGroupName.Attributes.Add(new ParameterAttribute
149+
{
150+
ParameterSetName = "InvokeByDynamicParametersForFriendMethod",
151+
Position = 1,
152+
Mandatory = false
153+
});
141154
pResourceGroupName.Attributes.Add(new AllowNullAttribute());
142155
dynamicParameters.Add("ResourceGroupName", pResourceGroupName);
143156

@@ -150,6 +163,12 @@ public override object GetDynamicParameters()
150163
Position = 2,
151164
Mandatory = false
152165
});
166+
pVMScaleSetName.Attributes.Add(new ParameterAttribute
167+
{
168+
ParameterSetName = "InvokeByDynamicParametersForFriendMethod",
169+
Position = 2,
170+
Mandatory = false
171+
});
153172
pVMScaleSetName.Attributes.Add(new AllowNullAttribute());
154173
dynamicParameters.Add("VMScaleSetName", pVMScaleSetName);
155174

@@ -162,6 +181,12 @@ public override object GetDynamicParameters()
162181
Position = 3,
163182
Mandatory = false
164183
});
184+
pInstanceId.Attributes.Add(new ParameterAttribute
185+
{
186+
ParameterSetName = "InvokeByDynamicParametersForFriendMethod",
187+
Position = 3,
188+
Mandatory = false
189+
});
165190
pInstanceId.Attributes.Add(new AllowNullAttribute());
166191
dynamicParameters.Add("InstanceId", pInstanceId);
167192

@@ -174,9 +199,33 @@ public override object GetDynamicParameters()
174199
Position = 4,
175200
Mandatory = true
176201
});
202+
pArgumentList.Attributes.Add(new ParameterAttribute
203+
{
204+
ParameterSetName = "InvokeByStaticParametersForFriendMethod",
205+
Position = 4,
206+
Mandatory = true
207+
});
177208
pArgumentList.Attributes.Add(new AllowNullAttribute());
178209
dynamicParameters.Add("ArgumentList", pArgumentList);
179210

211+
var pInstanceView = new RuntimeDefinedParameter();
212+
pInstanceView.Name = "InstanceView";
213+
pInstanceView.ParameterType = typeof(SwitchParameter);
214+
pInstanceView.Attributes.Add(new ParameterAttribute
215+
{
216+
ParameterSetName = "InvokeByDynamicParametersForFriendMethod",
217+
Position = 4,
218+
Mandatory = true
219+
});
220+
pInstanceView.Attributes.Add(new ParameterAttribute
221+
{
222+
ParameterSetName = "InvokeByStaticParametersForFriendMethod",
223+
Position = 5,
224+
Mandatory = true
225+
});
226+
pInstanceView.Attributes.Add(new AllowNullAttribute());
227+
dynamicParameters.Add("InstanceView", pInstanceView);
228+
180229
return dynamicParameters;
181230
}
182231
}

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/Generate-FunctionCommand.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ function Get-VerbNounCmdletCode
800800
}
801801
else
802802
{
803-
$param_name = $expose_param_name = 'Friend';
803+
$param_name = $expose_param_name = $FriendMethodInfo.Name.Replace($methodName, '');
804804
}
805805

806806
$param_type_full_name = 'SwitchParameter';

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/Import-CommonVariables.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ $component_name = $client_library_namespace.Substring($client_library_namespace.
7979

8080
$all_return_type_names = @();
8181

82-
$SKIP_METHOD_NAME_LIST = @('PowerOff', 'ListNext', 'ListAllNext', 'ListSkusNext');
82+
$SKIP_VERB_NOUN_CMDLET_LIST = @('PowerOff', 'ListNext', 'ListAllNext', 'ListSkusNext', 'GetInstanceView');
8383

8484
Write-Verbose $BAR_LINE;
8585
Write-Verbose "Input Parameters:";

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,17 +1194,35 @@ else
11941194
$total_method_count++;
11951195

11961196
# Handle Friend Methods
1197-
if ($mtItem.Name -eq 'Deallocate' -and (-not $friendMethodDict.ContainsKey($mtItem.Name)))
1197+
if (-not $friendMethodDict.ContainsKey($mtItem.Name))
11981198
{
1199-
$methods2 = Get-OperationMethods $operation_type;
1200-
foreach ($friendMethodInfo in $methods2)
1199+
if ($mtItem.Name -eq 'Deallocate')
12011200
{
1202-
if ($friendMethodInfo.Name -eq 'PowerOff')
1201+
$methods2 = Get-OperationMethods $operation_type;
1202+
foreach ($friendMethodInfo in $methods2)
12031203
{
1204-
if (CheckIf-SameParameterList $methodInfo $friendMethodInfo)
1204+
if ($friendMethodInfo.Name -eq 'PowerOff')
12051205
{
1206-
$friendMethodDict.Add($mtItem.Name, $friendMethodInfo);
1207-
break;
1206+
if (CheckIf-SameParameterList $methodInfo $friendMethodInfo)
1207+
{
1208+
$friendMethodDict.Add($mtItem.Name, $friendMethodInfo);
1209+
break;
1210+
}
1211+
}
1212+
}
1213+
}
1214+
elseif ($mtItem.Name -eq 'Get')
1215+
{
1216+
$methods2 = Get-OperationMethods $operation_type;
1217+
foreach ($friendMethodInfo in $methods2)
1218+
{
1219+
if ($friendMethodInfo.Name -eq 'GetInstanceView')
1220+
{
1221+
if (CheckIf-SameParameterList $methodInfo $friendMethodInfo)
1222+
{
1223+
$friendMethodDict.Add($mtItem.Name, $friendMethodInfo);
1224+
break;
1225+
}
12081226
}
12091227
}
12101228
}
@@ -1293,7 +1311,7 @@ else
12931311
Write-Verbose $SEC_LINE;
12941312

12951313
$opCmdletFlavor = $cmdletFlavor;
1296-
if ($SKIP_METHOD_NAME_LIST -contains $methodInfo.Name)
1314+
if ($SKIP_VERB_NOUN_CMDLET_LIST -contains $methodInfo.Name)
12971315
{
12981316
#Overwrite and skip these method's 'Verb' cmdlet flavor
12991317
$opCmdletFlavor = 'None';

0 commit comments

Comments
 (0)