Update

Author: huangpf

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

@@ -23,9 +23,6 @@ param(
     [Parameter(Mandatory = $true)]
     [string]$ModelClassNameSpace,
 
-    [Parameter(Mandatory = $false)]
-    [string]$CmdletNounPrefix = "Azure",
-
     [Parameter(Mandatory = $false)]
     [string]$FileOutputFolder = $null
 )
@@ -38,22 +35,20 @@ param(
 function Generate-PsFunctionCommandImpl
 {
     param(
-        [Parameter(Mandatory = $True)]
-        [string]$fileOutputFolder,
-
-        [Parameter(Mandatory = $True)]
-        $opShortName,
+        [Parameter(Mandatory = $true)]
+        [string]$opShortName,
 
-        [Parameter(Mandatory = $True)]
+        [Parameter(Mandatory = $true)]
         [System.Reflection.MethodInfo]$operation_method_info,
 
-        [Parameter(Mandatory = $True)]
-        [string]$invoke_cmdlet_class_name,
-
-        [Parameter(Mandatory = $True)]
-        [string]$parameter_cmdlet_class_name
+        [Parameter(Mandatory = $true)]
+        [string]$fileOutputFolder
     )
 
+    $componentName = Get-ComponentName $ModelClassNameSpace;
+    $invoke_cmdlet_class_name = 'InvokeAzure' + $componentName + 'MethodCmdlet';
+    $parameter_cmdlet_class_name = 'NewAzure' + $componentName + 'ArgumentListCmdlet';
+
     $methodName = ($operation_method_info.Name.Replace('Async', ''));
     $return_type_info = $operation_method_info.ReturnType;
     $normalized_output_type_name = Get-NormalizedTypeName $return_type_info;
@@ -950,14 +945,7 @@ function Generate-CliFunctionCommandImpl
     return $code;
 }
 
-$componentName = Get-ComponentName $ModelClassNameSpace;
-$invoke_cmdlet_class_name = 'InvokeAzure' + $componentName + 'MethodCmdlet';
-$parameter_cmdlet_class_name = 'NewAzure' + $componentName + 'ArgumentListCmdlet';
-Generate-PsFunctionCommandImpl -fileOutputFolder $FileOutputFolder `
-                               -opShortName $OperationName `
-                               -operation_method_info $MethodInfo `
-                               -invoke_cmdlet_class_name $invoke_cmdlet_class_name `
-                               -parameter_cmdlet_class_name $parameter_cmdlet_class_name;
+Generate-PsFunctionCommandImpl $OperationName $MethodInfo $FileOutputFolder;
 
 # CLI Function Command Code
-Write-Output (Generate-CliFunctionCommandImpl $OperationName $MethodInfo $ModelClassNameSpace $FileOutputFolder);
+Generate-CliFunctionCommandImpl $OperationName $MethodInfo $ModelClassNameSpace $FileOutputFolder;

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

@@ -1221,7 +1221,6 @@ else
             $outputs = (. $PSScriptRoot\Generate-FunctionCommand.ps1 -OperationName $opShortName `
                                                                      -MethodInfo $methodInfo `
                                                                      -ModelClassNameSpace $client_model_namespace `
-                                                                     -CmdletNounPrefix 'Azure' `
                                                                      -FileOutputFolder $opOutFolder);
 
             if ($outputs.Count -ne $null)