Skip to content

Commit 033098f

Browse files
huangpfhuangpf
committed
BuildGenerateRDFE
1 parent d00d5a7 commit 033098f

File tree

4 files changed

+34
-7
lines changed

4 files changed

+34
-7
lines changed

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,15 @@ function Generate-CliFunctionCommandImpl
216216
}
217217
}
218218
$code += " var subscription = profile.current.getSubscription(options.subscription);" + $NEW_LINE;
219-
$code += " var computeManagementClient = utils.createComputeResourceProviderClient(subscription);" + $NEW_LINE;
219+
220+
if ($ModelNameSpace.Contains(".WindowsAzure."))
221+
{
222+
$code += " var computeManagementClient = utils.createComputeClient(subscription);" + $NEW_LINE;
223+
}
224+
else
225+
{
226+
$code += " var computeManagementClient = utils.createComputeResourceProviderClient(subscription);" + $NEW_LINE;
227+
}
220228

221229
if ($cliMethodName -eq 'delete')
222230
{
@@ -232,8 +240,6 @@ function Generate-CliFunctionCommandImpl
232240
for ($index = 0; $index -lt $methodParamNameList.Count; $index++)
233241
{
234242
# Function Call - For Each Method Parameter
235-
if ($index -gt 0) { $code += ", "; }
236-
237243
$cli_param_name = Get-CliNormalizedName $methodParamNameList[$index];
238244
if ((${cli_param_name} -eq 'Parameters') -or (${cli_param_name} -like '*InstanceIds'))
239245
{
@@ -243,8 +249,11 @@ function Generate-CliFunctionCommandImpl
243249
{
244250
$code += "options.${cli_param_name}";
245251
}
252+
253+
$code += ", ";
246254
}
247-
$code += ", _);" + $NEW_LINE;
255+
256+
$code += "_);" + $NEW_LINE;
248257
$code += " cli.output.json(result);" + $NEW_LINE;
249258
$code += " });" + $NEW_LINE;
250259

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ function Generate-CliParameterCommandImpl
107107
$params_generate_category_name = 'set';
108108
$params_generate_category_var_name = $params_generate_category_name + $params_category_var_name;
109109
$code = " //$params_category_name set ${cli_method_option_name}" + $NEW_LINE;
110-
$code += " var ${cat_params_category_var_name} = cli.category('vmss');" + $NEW_LINE;
110+
$code += " var ${cat_params_category_var_name} = cli.category('${category_name}');" + $NEW_LINE;
111111
$code += " var ${params_category_var_name} = ${cat_params_category_var_name}.category('${params_category_name}')" + $NEW_LINE;
112112
$code += " .description(`$('Commands to manage parameter for your ${cli_op_description}.'));" + $NEW_LINE;
113113
$code += " var ${params_generate_category_var_name} = ${params_category_var_name}.category('${params_generate_category_name}')" + $NEW_LINE;
@@ -213,7 +213,7 @@ function Generate-CliParameterCommandImpl
213213
$params_generate_category_name = 'remove';
214214
$params_generate_category_var_name = $params_generate_category_name + $params_category_var_name;
215215
$code += " //$params_category_name ${params_generate_category_name} ${cli_method_option_name}" + $NEW_LINE;
216-
$code += " var ${cat_params_category_var_name} = cli.category('vmss');" + $NEW_LINE;
216+
$code += " var ${cat_params_category_var_name} = cli.category('${category_name}');" + $NEW_LINE;
217217
$code += " var ${params_category_var_name} = ${cat_params_category_var_name}.category('${params_category_name}')" + $NEW_LINE;
218218
$code += " .description(`$('Commands to remove parameter for your ${cli_op_description}.'));" + $NEW_LINE;
219219
$code += " var ${params_generate_category_var_name} = ${params_category_var_name}.category('${params_generate_category_name}')" + $NEW_LINE;
@@ -264,7 +264,7 @@ function Generate-CliParameterCommandImpl
264264
$params_generate_category_name = 'add';
265265
$params_generate_category_var_name = $params_generate_category_name + $params_category_var_name;
266266
$code += " //$params_category_name ${params_generate_category_name} ${cli_method_option_name}" + $NEW_LINE;
267-
$code += " var ${cat_params_category_var_name} = cli.category('vmss');" + $NEW_LINE;
267+
$code += " var ${cat_params_category_var_name} = cli.category('${category_name}');" + $NEW_LINE;
268268
$code += " var ${params_category_var_name} = ${cat_params_category_var_name}.category('${params_category_name}')" + $NEW_LINE;
269269
$code += " .description(`$('Commands to add parameter for your ${cli_op_description}.'));" + $NEW_LINE;
270270
$code += " var ${params_generate_category_var_name} = ${params_category_var_name}.category('${params_generate_category_name}')" + $NEW_LINE;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ function Get-CliCategoryName
9393
{
9494
$outName = 'vmssvm';
9595
}
96+
elseif ($inName -eq 'HostedService')
97+
{
98+
$outName = 'hs';
99+
}
96100
else
97101
{
98102
$outName = Get-CliNormalizedName $inName;

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,20 @@
359359
</PropertyGroup>
360360
<Exec Command="$(PowerShellExe) $(PSCodeGenScriptPath) $(PSCodeGenTargetFolder) $(MSBuildProjectDirectory) $(ClientLibraryNamesSpace) $(BaseCmdletFullName) $(BaseCmdletClientName) $(ASMCmdletFlavor)" />
361361
</Target>
362+
<Target Name="BuildGenerateRDFE">
363+
<PropertyGroup>
364+
<PowerShellExe Condition=" '$(PowerShellExe)'=='' ">%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellExe>
365+
<PSCodeGenScriptPath>".\Automation\RunCodeGeneration.ps1"</PSCodeGenScriptPath>
366+
<PSCodeGenTargetFolder>$(OutputPath)</PSCodeGenTargetFolder>
367+
<ClientLibraryNamesSpace>"Microsoft.WindowsAzure.Management.Compute"</ClientLibraryNamesSpace>
368+
<BaseCmdletFullName>"Microsoft.WindowsAzure.Commands.Utilities.Common.ServiceManagementBaseCmdlet"</BaseCmdletFullName>
369+
<BaseCmdletClientName>"ComputeClient"</BaseCmdletClientName>
370+
<ASMCmdletFlavor>Invoke</ASMCmdletFlavor>
371+
<CliCmdletFlavor>Verb</CliCmdletFlavor>
372+
<OperationNameFilter>"HostedService"</OperationNameFilter>
373+
</PropertyGroup>
374+
<Exec Command="$(PowerShellExe) $(PSCodeGenScriptPath) $(PSCodeGenTargetFolder) $(MSBuildProjectDirectory) $(ClientLibraryNamesSpace) $(BaseCmdletFullName) $(BaseCmdletClientName) $(ASMCmdletFlavor) $(CliCmdletFlavor) $(OperationNameFilter)" />
375+
</Target>
362376
<Target Name="BuildGenerateARM">
363377
<PropertyGroup>
364378
<PowerShellExe Condition=" '$(PowerShellExe)'=='' ">%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellExe>

0 commit comments

Comments
 (0)