Update

Author: huangpf

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

@@ -12,7 +12,8 @@
 # limitations under the License.
 # ----------------------------------------------------------------------------------
 
-param(
+param
+(
     # VirtualMachine, VirtualMachineScaleSet, etc.
     [Parameter(Mandatory = $true)]
     [string]$OperationName,
@@ -27,7 +28,7 @@ param(
     [string]$FileOutputFolder,
 
     [Parameter(Mandatory = $false)]
-    [System.Reflection.MethodInfo]$FriendMethodInfo
+    [System.Reflection.MethodInfo]$FriendMethodInfo = $null
 )
 
 . "$PSScriptRoot\Import-StringFunction.ps1";
@@ -37,22 +38,27 @@ param(
 # Sample: VirtualMachineGetMethod.cs
 function Generate-PsFunctionCommandImpl
 {
-    param(
+    param
+    (
         [Parameter(Mandatory = $true)]
         [string]$opShortName,
 
         [Parameter(Mandatory = $true)]
         [System.Reflection.MethodInfo]$operation_method_info,
 
         [Parameter(Mandatory = $true)]
-        [string]$fileOutputFolder
+        [string]$fileOutputFolder,
+
+        [Parameter(Mandatory = $false)]
+        [System.Reflection.MethodInfo]$FriendMethodInfo = $null
     )
 
     $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;
     $cmdlet_verb = "Invoke";
@@ -73,6 +79,13 @@ function Generate-PsFunctionCommandImpl
 
     $invoke_param_set_name = $cmdlet_op_short_name + $methodName;
 
+    # Process Friend Parameter Set and Method Names
+    if ($FriendMethodInfo -ne $null -and $FriendMethodInfo.Name -ne $null)
+    {
+        $friendMethodName = ($FriendMethodInfo.Name.Replace('Async', ''));
+        $friend_param_set_name = $cmdlet_op_short_name + $friendMethodName;
+    }
+
     $file_full_path = $fileOutputFolder + '/' + $cmdlet_class_name + '.cs';
     if (Test-Path $file_full_path)
     {
@@ -547,7 +560,8 @@ ${cmdlet_partial_class_code}
 # azure vm get
 function Generate-CliFunctionCommandImpl
 {
-    param(
+    param
+    (
         # VirtualMachine, VirtualMachineScaleSet, etc.
         [Parameter(Mandatory = $true)]
         [string]$OperationName,
@@ -948,7 +962,7 @@ function Generate-CliFunctionCommandImpl
     return $code;
 }
 
-Generate-PsFunctionCommandImpl $OperationName $MethodInfo $FileOutputFolder;
+Generate-PsFunctionCommandImpl $OperationName $MethodInfo $FileOutputFolder $FriendMethodInfo;
 
 # CLI Function Command Code
 Generate-CliFunctionCommandImpl $OperationName $MethodInfo $ModelClassNameSpace $FileOutputFolder;

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

@@ -1172,7 +1172,7 @@ else
 
         $qualified_methods = @();
         $total_method_count = 0;
-        $friendMethodDict = @{};
+        [System.Collections.Hashtable]$friendMethodDict = @{};
         foreach ($mtItem in $methods)
         {
             [System.Reflection.MethodInfo]$methodInfo = $mtItem;
@@ -1215,11 +1215,24 @@ else
         {
             [System.Reflection.MethodInfo]$methodInfo = $mtItem;
             $method_count++;
+            
+            # Get Friend Method (if any)
+            $friendMethodInfo = $null;
+            if ($friendMethodDict.ContainsKey($methodInfo.Name))
+            {
+                $friendMethodInfo = $friendMethodDict[$methodInfo.Name];
+            }
+            
+            $friendMethodMessage = '';
+            if ($friendMethodInfo -ne $null -and $friendMethodInfo.Name -ne $null)
+            {
+                $friendMethodMessage = '(Friend: ' + ($friendMethodInfo.Name.Replace('Async', '')) + ')';
+            }
 
             # Output Info for Method Signature
             Write-Verbose "";
             Write-Verbose $SEC_LINE;
-            Write-Verbose ("[${operation_type_count}] ${method_count}/${total_method_count} " + $methodInfo.Name.Replace('Async', ''));
+            Write-Verbose ("[${operation_type_count}] ${method_count}/${total_method_count} " + $methodInfo.Name.Replace('Async', '') + ' ' + $friendMethodMessage);
             foreach ($paramInfoItem in $methodInfo.GetParameters())
             {
                 [System.Reflection.ParameterInfo]$paramInfo = $paramInfoItem;
@@ -1236,7 +1249,6 @@ else
             }
             Write-Verbose $SEC_LINE;
 
-            $friendMethodInfo = $friendMethodDict[$methodInfo.Name];
             $outputs = (. $PSScriptRoot\Generate-FunctionCommand.ps1 -OperationName $opShortName `
                                                                      -MethodInfo $methodInfo `
                                                                      -ModelClassNameSpace $client_model_namespace `