Combine ListAll Methods

Author: huangpf

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

@@ -28,7 +28,6 @@ Add-AzureRmVmssNetworkInterfaceConfiguration    1.2.3   AzureRM.Compute
 Add-AzureRmVmssPublicKey                        1.2.3   AzureRM.Compute
 Add-AzureRmVmssSecret                           1.2.3   AzureRM.Compute
 Get-AzureRmVmss                                 1.2.3   AzureRM.Compute
-Get-AzureRmVmssAllList                          1.2.3   AzureRM.Compute
 Get-AzureRmVmssList                             1.2.3   AzureRM.Compute
 Get-AzureRmVmssSkusList                         1.2.3   AzureRM.Compute
 Get-AzureRmVmssVM                               1.2.3   AzureRM.Compute
@@ -124,7 +123,7 @@ function Test-VirtualMachineScaleSet
 
         $argList = New-AzureComputeArgumentList -MethodName VirtualMachineScaleSetsListAll;
         $args = ($argList | select -ExpandProperty Value);
-        $vmssList = Get-AzureRmVmssAllList;
+        $vmssList = Get-AzureRmVmssList -All;
         Assert-True { ($vmssList | select -ExpandProperty Name) -contains $vmssName };
         $output = $vmssList | Out-String;
         Write-Verbose ($output);

src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListAllMethod.cs

@@ -76,38 +76,4 @@ protected PSArgument[] CreateVirtualMachineScaleSetListAllParameters()
             return ConvertFromObjectsToArguments(new string[0], new object[0]);
         }
     }
-
-    [Cmdlet("Get", "AzureRmVmssAllList", DefaultParameterSetName = "InvokeByDynamicParameters")]
-    public partial class GetAzureRmVMSSAllList : InvokeAzureComputeMethodCmdlet
-    {
-        public GetAzureRmVMSSAllList()
-        {
-        }
-
-        public override string MethodName { get; set; }
-
-        protected override void ProcessRecord()
-        {
-            this.MethodName = "VirtualMachineScaleSetListAll";
-            base.ProcessRecord();
-        }
-
-        public override object GetDynamicParameters()
-        {
-            dynamicParameters = new RuntimeDefinedParameterDictionary();
-            var pArgumentList = new RuntimeDefinedParameter();
-            pArgumentList.Name = "ArgumentList";
-            pArgumentList.ParameterType = typeof(object[]);
-            pArgumentList.Attributes.Add(new ParameterAttribute
-            {
-                ParameterSetName = "InvokeByStaticParameters",
-                Position = 1,
-                Mandatory = true
-            });
-            pArgumentList.Attributes.Add(new AllowNullAttribute());
-            dynamicParameters.Add("ArgumentList", pArgumentList);
-
-            return dynamicParameters;
-        }
-    }
 }

src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListMethod.cs

@@ -105,7 +105,14 @@ public GetAzureRmVMSSList()
 
         protected override void ProcessRecord()
         {
-            this.MethodName = "VirtualMachineScaleSetList";
+            if (this.ParameterSetName == "InvokeByDynamicParameters")
+            {
+                this.MethodName = "VirtualMachineScaleSetList";
+            }
+            else
+            {
+                this.MethodName = "VirtualMachineScaleSetListAll";
+            }
             base.ProcessRecord();
         }
 
@@ -121,6 +128,12 @@ public override object GetDynamicParameters()
                 Position = 1,
                 Mandatory = false
             });
+            pResourceGroupName.Attributes.Add(new ParameterAttribute
+            {
+                ParameterSetName = "InvokeByDynamicParametersForFriendMethod",
+                Position = 1,
+                Mandatory = false
+            });
             pResourceGroupName.Attributes.Add(new AllowNullAttribute());
             dynamicParameters.Add("ResourceGroupName", pResourceGroupName);
 
@@ -133,9 +146,33 @@ public override object GetDynamicParameters()
                 Position = 2,
                 Mandatory = true
             });
+            pArgumentList.Attributes.Add(new ParameterAttribute
+            {
+                ParameterSetName = "InvokeByStaticParametersForFriendMethod",
+                Position = 2,
+                Mandatory = true
+            });
             pArgumentList.Attributes.Add(new AllowNullAttribute());
             dynamicParameters.Add("ArgumentList", pArgumentList);
 
+            var pAll = new RuntimeDefinedParameter();
+            pAll.Name = "All";
+            pAll.ParameterType = typeof(SwitchParameter);
+            pAll.Attributes.Add(new ParameterAttribute
+            {
+                ParameterSetName = "InvokeByDynamicParametersForFriendMethod",
+                Position = 2,
+                Mandatory = true
+            });
+            pAll.Attributes.Add(new ParameterAttribute
+            {
+                ParameterSetName = "InvokeByStaticParametersForFriendMethod",
+                Position = 3,
+                Mandatory = true
+            });
+            pAll.Attributes.Add(new AllowNullAttribute());
+            dynamicParameters.Add("All", pAll);
+
             return dynamicParameters;
         }
     }

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

@@ -79,7 +79,7 @@ $component_name = $client_library_namespace.Substring($client_library_namespace.
 
 $all_return_type_names = @();
 
-$SKIP_VERB_NOUN_CMDLET_LIST = @('PowerOff', 'ListNext', 'ListAllNext', 'ListSkusNext', 'GetInstanceView');
+$SKIP_VERB_NOUN_CMDLET_LIST = @('PowerOff', 'ListNext', 'ListAllNext', 'ListSkusNext', 'GetInstanceView', 'ListAll');
 
 Write-Verbose $BAR_LINE;
 Write-Verbose "Input Parameters:";

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

@@ -1197,13 +1197,16 @@ else
             if (-not $friendMethodDict.ContainsKey($mtItem.Name))
             {
                 $searchName = $null;
+                $matchedMethodInfo = $null;
                 if ($mtItem.Name -eq 'Deallocate')
                 {
                     $searchName = 'PowerOff';
+                    $matchedMethodInfo = $methodInfo;
                 }
                 elseif ($mtItem.Name -eq 'Get')
                 {
                     $searchName = 'GetInstanceView';
+                    $matchedMethodInfo = $methodInfo;
                 }
                 elseif ($mtItem.Name -eq 'List')
                 {
@@ -1213,7 +1216,7 @@ else
                 if ($searchName -ne $null)
                 {
                     $methods2 = Get-OperationMethods $operation_type;
-                    $foundMethod = Find-MatchedMethod $searchName $methods2 $methodInfo;
+                    $foundMethod = Find-MatchedMethod $searchName $methods2 $matchedMethodInfo;
                     if ($foundMethod -ne $null)
                     {
                         $friendMethodDict.Add($mtItem.Name, $foundMethod);