From 5b356596231d560351cdf281efcb334c9987a569 Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Thu, 8 Oct 2015 18:20:31 -0700 Subject: [PATCH 1/5] Update Powershell Autogenerator for VMSS --- .../VirtualMachineScaleSetTests.ps1 | 34 +- .../Generated/ComputeAutomationBaseCmdlet.cs | 5 + ...tualMachineScaleSetCreateOrUpdateMethod.cs | 18 +- ...achineScaleSetDeallocateInstancesMethod.cs | 28 +- .../VirtualMachineScaleSetDeallocateMethod.cs | 18 +- ...ualMachineScaleSetDeleteInstancesMethod.cs | 28 +- .../VirtualMachineScaleSetDeleteMethod.cs | 18 +- ...ualMachineScaleSetGetInstanceViewMethod.cs | 18 +- .../VirtualMachineScaleSetGetMethod.cs | 18 +- .../VirtualMachineScaleSetListAllMethod.cs | 40 +-- .../VirtualMachineScaleSetListMethod.cs | 14 +- .../VirtualMachineScaleSetListNextMethod.cs | 14 +- .../VirtualMachineScaleSetListSkusMethod.cs | 18 +- ...lMachineScaleSetPowerOffInstancesMethod.cs | 28 +- .../VirtualMachineScaleSetPowerOffMethod.cs | 18 +- ...alMachineScaleSetRestartInstancesMethod.cs | 28 +- .../VirtualMachineScaleSetRestartMethod.cs | 18 +- ...tualMachineScaleSetStartInstancesMethod.cs | 28 +- .../VirtualMachineScaleSetStartMethod.cs | 18 +- ...ualMachineScaleSetUpdateInstancesMethod.cs | 28 +- ...irtualMachineScaleSetVMDeallocateMethod.cs | 22 +- .../VirtualMachineScaleSetVMDeleteMethod.cs | 22 +- ...lMachineScaleSetVMGetInstanceViewMethod.cs | 22 +- .../VirtualMachineScaleSetVMGetMethod.cs | 22 +- .../VirtualMachineScaleSetVMListMethod.cs | 156 +++++++-- .../VirtualMachineScaleSetVMPowerOffMethod.cs | 22 +- .../VirtualMachineScaleSetVMRestartMethod.cs | 22 +- .../VirtualMachineScaleSetVMStartMethod.cs | 22 +- .../Compute/Commands.Compute/Generated/cli.js | 315 +----------------- .../Automation/RunCodeGeneration.ps1 | 237 +++++++++++-- 30 files changed, 688 insertions(+), 611 deletions(-) diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1 index 79506a8d4bb5..c39263a05c6f 100644 --- a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1 +++ b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1 @@ -133,7 +133,11 @@ function Test-VirtualMachineScaleSet # List All Write-Verbose ('Running Command : ' + 'Get-AzureVMSSAllList'); - $vmssList = Get-AzureVMSSAllList -VirtualMachineScaleSetListAllParameters $null; + + $argList = New-AzureComputeArgumentList -MethodName VirtualMachineScaleSetListAll; + $args = ($argList | select -ExpandProperty Value); + #$vmssList = Invoke-AzureComputeMethod -MethodName VirtualMachineScaleSetListAll -ArgumentList $args; + $vmssList = Get-AzureVMSSAllList; Assert-True { ($vmssList.VirtualMachineScaleSets | select -ExpandProperty Name) -contains $vmss.Name }; $output = $vmssList | Out-String; Write-Verbose ($output); @@ -155,12 +159,14 @@ function Test-VirtualMachineScaleSet Assert-True { $output.Contains("VirtualMachineScaleSetSku") }; # List All VMs - $vmListParams = New-AzureComputeParameterObject -FriendlyName VirtualMachineScaleSetVMListParameters; - $vmListParams.ResourceGroupName = $rgname; - $vmListParams.VirtualMachineScaleSetName = $vmss.Name; - Write-Verbose ('Running Command : ' + 'Get-AzureVMSSVMList'); - $vmListResult = Get-AzureVMSSVMList -VirtualMachineScaleSetVMListParameters $vmListParams; + + $argList = New-AzureComputeArgumentList -MethodName VirtualMachineScaleSetVMList; + $argList[2].Value = $rgname; + $argList[4].Value = $vmss.Name; + $args = ($argList | select -ExpandProperty Value); + #$vmListResult = Invoke-AzureComputeMethod -MethodName VirtualMachineScaleSetVMList -ArgumentList $args; + $vmListResult = Get-AzureVMSSVMList -ResourceGroupName $rgname -VirtualMachineScaleSetName $vmss.Name; $output = $vmListResult | Out-String; Write-Verbose ($output); Assert-True { $output.Contains("VirtualMachineScaleSetVM") }; @@ -202,11 +208,23 @@ function Test-VirtualMachineScaleSet $st = Start-AzureVMSS -ResourceGroupName $rgname -VMScaleSetName $vmss.Name; $st = Restart-AzureVMSS -ResourceGroupName $rgname -VMScaleSetName $vmss.Name; - $instanceListParam = New-AzureComputeParameterObject -FriendlyName VirtualMachineScaleSetVMInstanceIDs; + $instanceListParam = @(); for ($i = 0; $i -lt $vmList.Count; $i++) { - $instanceListParam.InstanceIDs.Add($i); + $instanceListParam += $i.ToString(); } + + $argList = New-AzureComputeArgumentList -MethodName VirtualMachineScaleSetPowerOffInstances; + $argList[0].Value = $rgname; + $argList[1].Value = $vmss.Name; + $argList[2].Value = $instanceListParam; + $args = @() + for ($i = 0; $i -lt $argList.Length; $i++) + { + $args += , $argList[$i].Value; + } + + #$vmssResult = Invoke-AzureComputeMethod -MethodName VirtualMachineScaleSetPowerOffInstances -ArgumentList $args; $st = Stop-AzureVMSSInstances -ResourceGroupName $rgname -VMScaleSetName $vmss.Name -VMInstanceIDs $instanceListParam; $st = Stop-AzureVMSSInstancesWithDeallocation -ResourceGroupName $rgname -VMScaleSetName $vmss.Name -VMInstanceIDs $instanceListParam; $st = Start-AzureVMSSInstances -ResourceGroupName $rgname -VMScaleSetName $vmss.Name -VMInstanceIDs $instanceListParam; diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/ComputeAutomationBaseCmdlet.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/ComputeAutomationBaseCmdlet.cs index e396956edd2f..3922cf35318b 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/ComputeAutomationBaseCmdlet.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/ComputeAutomationBaseCmdlet.cs @@ -51,6 +51,11 @@ protected static PSArgument[] ConvertFromObjectsToArguments(string[] names, obje protected static object[] ConvertFromArgumentsToObjects(object[] arguments) { + if (arguments == null) + { + return null; + } + var objects = new object[arguments.Length]; for (int index = 0; index < arguments.Length; index++) diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetCreateOrUpdateMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetCreateOrUpdateMethod.cs index 0e3a4a6a3098..be644ce9a0fb 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetCreateOrUpdateMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetCreateOrUpdateMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetCreateOrUpdateDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetCreateOrUpdateDynamicParameters() var pParameters = new RuntimeDefinedParameter(); pParameters.Name = "VirtualMachineScaleSetCreateOrUpdateParameters"; - pParameters.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSet); + pParameters.ParameterType = typeof(VirtualMachineScaleSet); pParameters.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -91,14 +91,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetCreateOrUpdateParameters() string resourceGroupName = string.Empty; VirtualMachineScaleSet parameters = new VirtualMachineScaleSet(); - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "Parameters" }, new object[] { resourceGroupName, parameters }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "Parameters" }, + new object[] { resourceGroupName, parameters }); } } - [Cmdlet("New", "AzureVMSS")] - public partial class NewAzureVMSS : InvokeAzureComputeMethodCmdlet + [Cmdlet("New", "AzureVmss", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class NewAzureVmss : InvokeAzureComputeMethodCmdlet { - public NewAzureVMSS() + public NewAzureVmss() { this.MethodName = "VirtualMachineScaleSetCreateOrUpdate"; } @@ -115,7 +117,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -127,7 +129,7 @@ public override object GetDynamicParameters() var pParameters = new RuntimeDefinedParameter(); pParameters.Name = "VirtualMachineScaleSetCreateOrUpdateParameters"; - pParameters.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSet); + pParameters.ParameterType = typeof(VirtualMachineScaleSet); pParameters.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateInstancesMethod.cs index d5e37f4480fd..7dcdd1224b83 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateInstancesMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetDeallocateInstancesDynamicParameter dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetDeallocateInstancesDynamicParameter var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetDeallocateInstancesDynamicParameter var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs); + pVMInstanceIDs.ParameterType = typeof(string []); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -90,7 +90,9 @@ protected void ExecuteVirtualMachineScaleSetDeallocateInstancesMethod(object[] i { string resourceGroupName = (string)ParseParameter(invokeMethodInputParameters[0]); string vmScaleSetName = (string)ParseParameter(invokeMethodInputParameters[1]); - VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = (VirtualMachineScaleSetVMInstanceIDs)ParseParameter(invokeMethodInputParameters[2]); + var inputArray2 = Array.ConvertAll((object []) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); + VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); + vmInstanceIDs.InstanceIDs = inputArray2.ToList(); var result = VirtualMachineScaleSetClient.DeallocateInstances(resourceGroupName, vmScaleSetName, vmInstanceIDs); WriteObject(result); @@ -103,16 +105,18 @@ protected PSArgument[] CreateVirtualMachineScaleSetDeallocateInstancesParameters { string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); + var vmInstanceIDs = new string [] {}; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, new object[] { resourceGroupName, vmScaleSetName, vmInstanceIDs }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, + new object[] { resourceGroupName, vmScaleSetName, vmInstanceIDs }); } } - [Cmdlet("Stop", "AzureVMSSInstancesWithDeallocation")] - public partial class StopAzureVMSSInstancesWithDeallocation : InvokeAzureComputeMethodCmdlet + [Cmdlet("Stop", "AzureVmssInstancesWithDeallocation", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class StopAzureVmssInstancesWithDeallocation : InvokeAzureComputeMethodCmdlet { - public StopAzureVMSSInstancesWithDeallocation() + public StopAzureVmssInstancesWithDeallocation() { this.MethodName = "VirtualMachineScaleSetDeallocateInstances"; } @@ -129,7 +133,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -141,7 +145,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -153,7 +157,7 @@ public override object GetDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs); + pVMInstanceIDs.ParameterType = typeof(string []); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateMethod.cs index 9a851b057f98..25256751e16f 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetDeallocateDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetDeallocateDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -91,14 +91,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetDeallocateParameters() string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName" }, new object[] { resourceGroupName, vmScaleSetName }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName" }, + new object[] { resourceGroupName, vmScaleSetName }); } } - [Cmdlet("Stop", "AzureVMSSWithDeallocation")] - public partial class StopAzureVMSSWithDeallocation : InvokeAzureComputeMethodCmdlet + [Cmdlet("Stop", "AzureVmssWithDeallocation", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class StopAzureVmssWithDeallocation : InvokeAzureComputeMethodCmdlet { - public StopAzureVMSSWithDeallocation() + public StopAzureVmssWithDeallocation() { this.MethodName = "VirtualMachineScaleSetDeallocate"; } @@ -115,7 +117,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -127,7 +129,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteInstancesMethod.cs index 90dbf0ed88b2..d06a7dbf8c7b 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteInstancesMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetDeleteInstancesDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetDeleteInstancesDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetDeleteInstancesDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs); + pVMInstanceIDs.ParameterType = typeof(string []); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -90,7 +90,9 @@ protected void ExecuteVirtualMachineScaleSetDeleteInstancesMethod(object[] invok { string resourceGroupName = (string)ParseParameter(invokeMethodInputParameters[0]); string vmScaleSetName = (string)ParseParameter(invokeMethodInputParameters[1]); - VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = (VirtualMachineScaleSetVMInstanceIDs)ParseParameter(invokeMethodInputParameters[2]); + var inputArray2 = Array.ConvertAll((object []) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); + VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); + vmInstanceIDs.InstanceIDs = inputArray2.ToList(); var result = VirtualMachineScaleSetClient.DeleteInstances(resourceGroupName, vmScaleSetName, vmInstanceIDs); WriteObject(result); @@ -103,16 +105,18 @@ protected PSArgument[] CreateVirtualMachineScaleSetDeleteInstancesParameters() { string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); + var vmInstanceIDs = new string [] {}; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, new object[] { resourceGroupName, vmScaleSetName, vmInstanceIDs }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, + new object[] { resourceGroupName, vmScaleSetName, vmInstanceIDs }); } } - [Cmdlet("Remove", "AzureVMSSInstances")] - public partial class RemoveAzureVMSSInstances : InvokeAzureComputeMethodCmdlet + [Cmdlet("Remove", "AzureVmssInstances", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class RemoveAzureVmssInstances : InvokeAzureComputeMethodCmdlet { - public RemoveAzureVMSSInstances() + public RemoveAzureVmssInstances() { this.MethodName = "VirtualMachineScaleSetDeleteInstances"; } @@ -129,7 +133,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -141,7 +145,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -153,7 +157,7 @@ public override object GetDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs); + pVMInstanceIDs.ParameterType = typeof(string []); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteMethod.cs index 5355aadcb40c..24dcdadebe0a 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetDeleteDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetDeleteDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -91,14 +91,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetDeleteParameters() string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName" }, new object[] { resourceGroupName, vmScaleSetName }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName" }, + new object[] { resourceGroupName, vmScaleSetName }); } } - [Cmdlet("Remove", "AzureVMSS")] - public partial class RemoveAzureVMSS : InvokeAzureComputeMethodCmdlet + [Cmdlet("Remove", "AzureVmss", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class RemoveAzureVmss : InvokeAzureComputeMethodCmdlet { - public RemoveAzureVMSS() + public RemoveAzureVmss() { this.MethodName = "VirtualMachineScaleSetDelete"; } @@ -115,7 +117,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -127,7 +129,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetInstanceViewMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetInstanceViewMethod.cs index ad92ece25b4f..76b72320a06a 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetInstanceViewMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetInstanceViewMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetGetInstanceViewDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetGetInstanceViewDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -91,14 +91,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetGetInstanceViewParameters() string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName" }, new object[] { resourceGroupName, vmScaleSetName }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName" }, + new object[] { resourceGroupName, vmScaleSetName }); } } - [Cmdlet("Get", "AzureVMSSInstanceView")] - public partial class GetAzureVMSSInstanceView : InvokeAzureComputeMethodCmdlet + [Cmdlet("Get", "AzureVmssInstanceView", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class GetAzureVmssInstanceView : InvokeAzureComputeMethodCmdlet { - public GetAzureVMSSInstanceView() + public GetAzureVmssInstanceView() { this.MethodName = "VirtualMachineScaleSetGetInstanceView"; } @@ -115,7 +117,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -127,7 +129,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetMethod.cs index 3d162de98bc8..6f7d8ebe9155 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetGetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetGetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -91,14 +91,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetGetParameters() string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName" }, new object[] { resourceGroupName, vmScaleSetName }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName" }, + new object[] { resourceGroupName, vmScaleSetName }); } } - [Cmdlet("Get", "AzureVMSS")] - public partial class GetAzureVMSS : InvokeAzureComputeMethodCmdlet + [Cmdlet("Get", "AzureVmss", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class GetAzureVmss : InvokeAzureComputeMethodCmdlet { - public GetAzureVMSS() + public GetAzureVmss() { this.MethodName = "VirtualMachineScaleSetGet"; } @@ -115,7 +117,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -127,7 +129,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListAllMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListAllMethod.cs index 4c3292a4a83d..ebbc7be8035c 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListAllMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListAllMethod.cs @@ -35,25 +35,13 @@ public partial class InvokeAzureComputeMethodCmdlet : ComputeAutomationBaseCmdle protected object CreateVirtualMachineScaleSetListAllDynamicParameters() { dynamicParameters = new RuntimeDefinedParameterDictionary(); - var pParameters = new RuntimeDefinedParameter(); - pParameters.Name = "VirtualMachineScaleSetListAllParameters"; - pParameters.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.ListParameters); - pParameters.Attributes.Add(new ParameterAttribute - { - ParameterSetName = "InvokeByDynamicParameters", - Position = 1, - Mandatory = true - }); - pParameters.Attributes.Add(new AllowNullAttribute()); - dynamicParameters.Add("VirtualMachineScaleSetListAllParameters", pParameters); - var pArgumentList = new RuntimeDefinedParameter(); pArgumentList.Name = "ArgumentList"; pArgumentList.ParameterType = typeof(object[]); pArgumentList.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByStaticParameters", - Position = 2, + Position = 1, Mandatory = true }); pArgumentList.Attributes.Add(new AllowNullAttribute()); @@ -64,7 +52,7 @@ protected object CreateVirtualMachineScaleSetListAllDynamicParameters() protected void ExecuteVirtualMachineScaleSetListAllMethod(object[] invokeMethodInputParameters) { - ListParameters parameters = (ListParameters)ParseParameter(invokeMethodInputParameters[0]); + ListParameters parameters = new ListParameters(); var result = VirtualMachineScaleSetClient.ListAll(parameters); WriteObject(result); @@ -75,16 +63,14 @@ public partial class NewAzureComputeArgumentListCmdlet : ComputeAutomationBaseCm { protected PSArgument[] CreateVirtualMachineScaleSetListAllParameters() { - ListParameters parameters = new ListParameters(); - - return ConvertFromObjectsToArguments(new string[] { "Parameters" }, new object[] { parameters }); + return ConvertFromObjectsToArguments(new string[] {}, new object[] {}); } } - [Cmdlet("Get", "AzureVMSSAllList")] - public partial class GetAzureVMSSAllList : InvokeAzureComputeMethodCmdlet + [Cmdlet("Get", "AzureVmssAllList", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class GetAzureVmssAllList : InvokeAzureComputeMethodCmdlet { - public GetAzureVMSSAllList() + public GetAzureVmssAllList() { this.MethodName = "VirtualMachineScaleSetListAll"; } @@ -99,25 +85,13 @@ protected override void ProcessRecord() public override object GetDynamicParameters() { dynamicParameters = new RuntimeDefinedParameterDictionary(); - var pParameters = new RuntimeDefinedParameter(); - pParameters.Name = "VirtualMachineScaleSetListAllParameters"; - pParameters.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.ListParameters); - pParameters.Attributes.Add(new ParameterAttribute - { - ParameterSetName = "InvokeByDynamicParameters", - Position = 1, - Mandatory = true - }); - pParameters.Attributes.Add(new AllowNullAttribute()); - dynamicParameters.Add("VirtualMachineScaleSetListAllParameters", pParameters); - var pArgumentList = new RuntimeDefinedParameter(); pArgumentList.Name = "ArgumentList"; pArgumentList.ParameterType = typeof(object[]); pArgumentList.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByStaticParameters", - Position = 2, + Position = 1, Mandatory = true }); pArgumentList.Attributes.Add(new AllowNullAttribute()); diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListMethod.cs index 3bbae503bdf7..a3599d0f2199 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetListDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -77,14 +77,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetListParameters() { string resourceGroupName = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName" }, new object[] { resourceGroupName }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName" }, + new object[] { resourceGroupName }); } } - [Cmdlet("Get", "AzureVMSSList")] - public partial class GetAzureVMSSList : InvokeAzureComputeMethodCmdlet + [Cmdlet("Get", "AzureVmssList", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class GetAzureVmssList : InvokeAzureComputeMethodCmdlet { - public GetAzureVMSSList() + public GetAzureVmssList() { this.MethodName = "VirtualMachineScaleSetList"; } @@ -101,7 +103,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListNextMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListNextMethod.cs index b36b8e65fbce..4f2ab86dc46b 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListNextMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListNextMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetListNextDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pNextLink = new RuntimeDefinedParameter(); pNextLink.Name = "NextLink"; - pNextLink.ParameterType = typeof(System.String); + pNextLink.ParameterType = typeof(string); pNextLink.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -77,14 +77,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetListNextParameters() { string nextLink = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "NextLink" }, new object[] { nextLink }); + return ConvertFromObjectsToArguments( + new string[] { "NextLink" }, + new object[] { nextLink }); } } - [Cmdlet("Get", "AzureVMSSNextList")] - public partial class GetAzureVMSSNextList : InvokeAzureComputeMethodCmdlet + [Cmdlet("Get", "AzureVmssNextList", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class GetAzureVmssNextList : InvokeAzureComputeMethodCmdlet { - public GetAzureVMSSNextList() + public GetAzureVmssNextList() { this.MethodName = "VirtualMachineScaleSetListNext"; } @@ -101,7 +103,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pNextLink = new RuntimeDefinedParameter(); pNextLink.Name = "NextLink"; - pNextLink.ParameterType = typeof(System.String); + pNextLink.ParameterType = typeof(string); pNextLink.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListSkusMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListSkusMethod.cs index dc87958f365e..1bf2990628b5 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListSkusMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListSkusMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetListSkusDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetListSkusDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -91,14 +91,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetListSkusParameters() string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName" }, new object[] { resourceGroupName, vmScaleSetName }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName" }, + new object[] { resourceGroupName, vmScaleSetName }); } } - [Cmdlet("Get", "AzureVMSSSkusList")] - public partial class GetAzureVMSSSkusList : InvokeAzureComputeMethodCmdlet + [Cmdlet("Get", "AzureVmssSkusList", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class GetAzureVmssSkusList : InvokeAzureComputeMethodCmdlet { - public GetAzureVMSSSkusList() + public GetAzureVmssSkusList() { this.MethodName = "VirtualMachineScaleSetListSkus"; } @@ -115,7 +117,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -127,7 +129,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffInstancesMethod.cs index f0121df1fcb8..bcf19aed8ab4 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffInstancesMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetPowerOffInstancesDynamicParameters( dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetPowerOffInstancesDynamicParameters( var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetPowerOffInstancesDynamicParameters( var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs); + pVMInstanceIDs.ParameterType = typeof(string []); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -90,7 +90,9 @@ protected void ExecuteVirtualMachineScaleSetPowerOffInstancesMethod(object[] inv { string resourceGroupName = (string)ParseParameter(invokeMethodInputParameters[0]); string vmScaleSetName = (string)ParseParameter(invokeMethodInputParameters[1]); - VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = (VirtualMachineScaleSetVMInstanceIDs)ParseParameter(invokeMethodInputParameters[2]); + var inputArray2 = Array.ConvertAll((object []) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); + VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); + vmInstanceIDs.InstanceIDs = inputArray2.ToList(); var result = VirtualMachineScaleSetClient.PowerOffInstances(resourceGroupName, vmScaleSetName, vmInstanceIDs); WriteObject(result); @@ -103,16 +105,18 @@ protected PSArgument[] CreateVirtualMachineScaleSetPowerOffInstancesParameters() { string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); + var vmInstanceIDs = new string [] {}; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, new object[] { resourceGroupName, vmScaleSetName, vmInstanceIDs }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, + new object[] { resourceGroupName, vmScaleSetName, vmInstanceIDs }); } } - [Cmdlet("Stop", "AzureVMSSInstances")] - public partial class StopAzureVMSSInstances : InvokeAzureComputeMethodCmdlet + [Cmdlet("Stop", "AzureVmssInstances", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class StopAzureVmssInstances : InvokeAzureComputeMethodCmdlet { - public StopAzureVMSSInstances() + public StopAzureVmssInstances() { this.MethodName = "VirtualMachineScaleSetPowerOffInstances"; } @@ -129,7 +133,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -141,7 +145,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -153,7 +157,7 @@ public override object GetDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs); + pVMInstanceIDs.ParameterType = typeof(string []); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffMethod.cs index a927f9f46b81..8f9054e6dd5a 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetPowerOffDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetPowerOffDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -91,14 +91,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetPowerOffParameters() string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName" }, new object[] { resourceGroupName, vmScaleSetName }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName" }, + new object[] { resourceGroupName, vmScaleSetName }); } } - [Cmdlet("Stop", "AzureVMSS")] - public partial class StopAzureVMSS : InvokeAzureComputeMethodCmdlet + [Cmdlet("Stop", "AzureVmss", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class StopAzureVmss : InvokeAzureComputeMethodCmdlet { - public StopAzureVMSS() + public StopAzureVmss() { this.MethodName = "VirtualMachineScaleSetPowerOff"; } @@ -115,7 +117,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -127,7 +129,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartInstancesMethod.cs index cae943e814d0..dd5638fa1c2a 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartInstancesMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetRestartInstancesDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetRestartInstancesDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetRestartInstancesDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs); + pVMInstanceIDs.ParameterType = typeof(string []); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -90,7 +90,9 @@ protected void ExecuteVirtualMachineScaleSetRestartInstancesMethod(object[] invo { string resourceGroupName = (string)ParseParameter(invokeMethodInputParameters[0]); string vmScaleSetName = (string)ParseParameter(invokeMethodInputParameters[1]); - VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = (VirtualMachineScaleSetVMInstanceIDs)ParseParameter(invokeMethodInputParameters[2]); + var inputArray2 = Array.ConvertAll((object []) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); + VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); + vmInstanceIDs.InstanceIDs = inputArray2.ToList(); var result = VirtualMachineScaleSetClient.RestartInstances(resourceGroupName, vmScaleSetName, vmInstanceIDs); WriteObject(result); @@ -103,16 +105,18 @@ protected PSArgument[] CreateVirtualMachineScaleSetRestartInstancesParameters() { string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); + var vmInstanceIDs = new string [] {}; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, new object[] { resourceGroupName, vmScaleSetName, vmInstanceIDs }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, + new object[] { resourceGroupName, vmScaleSetName, vmInstanceIDs }); } } - [Cmdlet("Restart", "AzureVMSSInstances")] - public partial class RestartAzureVMSSInstances : InvokeAzureComputeMethodCmdlet + [Cmdlet("Restart", "AzureVmssInstances", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class RestartAzureVmssInstances : InvokeAzureComputeMethodCmdlet { - public RestartAzureVMSSInstances() + public RestartAzureVmssInstances() { this.MethodName = "VirtualMachineScaleSetRestartInstances"; } @@ -129,7 +133,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -141,7 +145,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -153,7 +157,7 @@ public override object GetDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs); + pVMInstanceIDs.ParameterType = typeof(string []); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartMethod.cs index 55912f24f1db..96412eb52c9d 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetRestartDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetRestartDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -91,14 +91,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetRestartParameters() string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName" }, new object[] { resourceGroupName, vmScaleSetName }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName" }, + new object[] { resourceGroupName, vmScaleSetName }); } } - [Cmdlet("Restart", "AzureVMSS")] - public partial class RestartAzureVMSS : InvokeAzureComputeMethodCmdlet + [Cmdlet("Restart", "AzureVmss", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class RestartAzureVmss : InvokeAzureComputeMethodCmdlet { - public RestartAzureVMSS() + public RestartAzureVmss() { this.MethodName = "VirtualMachineScaleSetRestart"; } @@ -115,7 +117,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -127,7 +129,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartInstancesMethod.cs index 85ecdc3d4c71..6fd889e4e046 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartInstancesMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetStartInstancesDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetStartInstancesDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetStartInstancesDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs); + pVMInstanceIDs.ParameterType = typeof(string []); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -90,7 +90,9 @@ protected void ExecuteVirtualMachineScaleSetStartInstancesMethod(object[] invoke { string resourceGroupName = (string)ParseParameter(invokeMethodInputParameters[0]); string vmScaleSetName = (string)ParseParameter(invokeMethodInputParameters[1]); - VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = (VirtualMachineScaleSetVMInstanceIDs)ParseParameter(invokeMethodInputParameters[2]); + var inputArray2 = Array.ConvertAll((object []) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); + VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); + vmInstanceIDs.InstanceIDs = inputArray2.ToList(); var result = VirtualMachineScaleSetClient.StartInstances(resourceGroupName, vmScaleSetName, vmInstanceIDs); WriteObject(result); @@ -103,16 +105,18 @@ protected PSArgument[] CreateVirtualMachineScaleSetStartInstancesParameters() { string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); + var vmInstanceIDs = new string [] {}; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, new object[] { resourceGroupName, vmScaleSetName, vmInstanceIDs }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, + new object[] { resourceGroupName, vmScaleSetName, vmInstanceIDs }); } } - [Cmdlet("Start", "AzureVMSSInstances")] - public partial class StartAzureVMSSInstances : InvokeAzureComputeMethodCmdlet + [Cmdlet("Start", "AzureVmssInstances", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class StartAzureVmssInstances : InvokeAzureComputeMethodCmdlet { - public StartAzureVMSSInstances() + public StartAzureVmssInstances() { this.MethodName = "VirtualMachineScaleSetStartInstances"; } @@ -129,7 +133,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -141,7 +145,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -153,7 +157,7 @@ public override object GetDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs); + pVMInstanceIDs.ParameterType = typeof(string []); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartMethod.cs index ced2e5794db8..2e54d333a232 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetStartDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetStartDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -91,14 +91,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetStartParameters() string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName" }, new object[] { resourceGroupName, vmScaleSetName }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName" }, + new object[] { resourceGroupName, vmScaleSetName }); } } - [Cmdlet("Start", "AzureVMSS")] - public partial class StartAzureVMSS : InvokeAzureComputeMethodCmdlet + [Cmdlet("Start", "AzureVmss", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class StartAzureVmss : InvokeAzureComputeMethodCmdlet { - public StartAzureVMSS() + public StartAzureVmss() { this.MethodName = "VirtualMachineScaleSetStart"; } @@ -115,7 +117,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -127,7 +129,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateInstancesMethod.cs index ea84ae51ece4..760ca083c5b9 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateInstancesMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetUpdateInstancesDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetUpdateInstancesDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetUpdateInstancesDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs); + pVMInstanceIDs.ParameterType = typeof(string []); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -90,7 +90,9 @@ protected void ExecuteVirtualMachineScaleSetUpdateInstancesMethod(object[] invok { string resourceGroupName = (string)ParseParameter(invokeMethodInputParameters[0]); string vmScaleSetName = (string)ParseParameter(invokeMethodInputParameters[1]); - VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = (VirtualMachineScaleSetVMInstanceIDs)ParseParameter(invokeMethodInputParameters[2]); + var inputArray2 = Array.ConvertAll((object []) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); + VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); + vmInstanceIDs.InstanceIDs = inputArray2.ToList(); var result = VirtualMachineScaleSetClient.UpdateInstances(resourceGroupName, vmScaleSetName, vmInstanceIDs); WriteObject(result); @@ -103,16 +105,18 @@ protected PSArgument[] CreateVirtualMachineScaleSetUpdateInstancesParameters() { string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); + var vmInstanceIDs = new string [] {}; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, new object[] { resourceGroupName, vmScaleSetName, vmInstanceIDs }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, + new object[] { resourceGroupName, vmScaleSetName, vmInstanceIDs }); } } - [Cmdlet("Update", "AzureVMSSInstances")] - public partial class UpdateAzureVMSSInstances : InvokeAzureComputeMethodCmdlet + [Cmdlet("Update", "AzureVmssInstances", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class UpdateAzureVmssInstances : InvokeAzureComputeMethodCmdlet { - public UpdateAzureVMSSInstances() + public UpdateAzureVmssInstances() { this.MethodName = "VirtualMachineScaleSetUpdateInstances"; } @@ -129,7 +133,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -141,7 +145,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -153,7 +157,7 @@ public override object GetDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs); + pVMInstanceIDs.ParameterType = typeof(string []); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMDeallocateMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMDeallocateMethod.cs index bd7b176a158c..88f2fdf7b13f 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMDeallocateMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMDeallocateMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetVMDeallocateDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetVMDeallocateDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetVMDeallocateDynamicParameters() var pInstanceId = new RuntimeDefinedParameter(); pInstanceId.Name = "InstanceId"; - pInstanceId.ParameterType = typeof(System.String); + pInstanceId.ParameterType = typeof(string); pInstanceId.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -105,14 +105,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMDeallocateParameters() string vmScaleSetName = string.Empty; string instanceId = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName", "InstanceId" }, new object[] { resourceGroupName, vmScaleSetName, instanceId }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName", "InstanceId" }, + new object[] { resourceGroupName, vmScaleSetName, instanceId }); } } - [Cmdlet("Stop", "AzureVMSSVMWithDeallocation")] - public partial class StopAzureVMSSVMWithDeallocation : InvokeAzureComputeMethodCmdlet + [Cmdlet("Stop", "AzureVmssVMWithDeallocation", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class StopAzureVmssVMWithDeallocation : InvokeAzureComputeMethodCmdlet { - public StopAzureVMSSVMWithDeallocation() + public StopAzureVmssVMWithDeallocation() { this.MethodName = "VirtualMachineScaleSetVMDeallocate"; } @@ -129,7 +131,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -141,7 +143,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -153,7 +155,7 @@ public override object GetDynamicParameters() var pInstanceId = new RuntimeDefinedParameter(); pInstanceId.Name = "InstanceId"; - pInstanceId.ParameterType = typeof(System.String); + pInstanceId.ParameterType = typeof(string); pInstanceId.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMDeleteMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMDeleteMethod.cs index 4f8720603044..3cea5c531470 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMDeleteMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMDeleteMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetVMDeleteDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetVMDeleteDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetVMDeleteDynamicParameters() var pInstanceId = new RuntimeDefinedParameter(); pInstanceId.Name = "InstanceId"; - pInstanceId.ParameterType = typeof(System.String); + pInstanceId.ParameterType = typeof(string); pInstanceId.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -105,14 +105,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMDeleteParameters() string vmScaleSetName = string.Empty; string instanceId = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName", "InstanceId" }, new object[] { resourceGroupName, vmScaleSetName, instanceId }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName", "InstanceId" }, + new object[] { resourceGroupName, vmScaleSetName, instanceId }); } } - [Cmdlet("Remove", "AzureVMSSVM")] - public partial class RemoveAzureVMSSVM : InvokeAzureComputeMethodCmdlet + [Cmdlet("Remove", "AzureVmssVM", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class RemoveAzureVmssVM : InvokeAzureComputeMethodCmdlet { - public RemoveAzureVMSSVM() + public RemoveAzureVmssVM() { this.MethodName = "VirtualMachineScaleSetVMDelete"; } @@ -129,7 +131,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -141,7 +143,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -153,7 +155,7 @@ public override object GetDynamicParameters() var pInstanceId = new RuntimeDefinedParameter(); pInstanceId.Name = "InstanceId"; - pInstanceId.ParameterType = typeof(System.String); + pInstanceId.ParameterType = typeof(string); pInstanceId.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetInstanceViewMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetInstanceViewMethod.cs index b79a845bdfb6..bafb5d198ec4 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetInstanceViewMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetInstanceViewMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetVMGetInstanceViewDynamicParameters( dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetVMGetInstanceViewDynamicParameters( var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetVMGetInstanceViewDynamicParameters( var pInstanceId = new RuntimeDefinedParameter(); pInstanceId.Name = "InstanceId"; - pInstanceId.ParameterType = typeof(System.String); + pInstanceId.ParameterType = typeof(string); pInstanceId.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -105,14 +105,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMGetInstanceViewParameters() string vmScaleSetName = string.Empty; string instanceId = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName", "InstanceId" }, new object[] { resourceGroupName, vmScaleSetName, instanceId }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName", "InstanceId" }, + new object[] { resourceGroupName, vmScaleSetName, instanceId }); } } - [Cmdlet("Get", "AzureVMSSVMInstanceView")] - public partial class GetAzureVMSSVMInstanceView : InvokeAzureComputeMethodCmdlet + [Cmdlet("Get", "AzureVmssVMInstanceView", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class GetAzureVmssVMInstanceView : InvokeAzureComputeMethodCmdlet { - public GetAzureVMSSVMInstanceView() + public GetAzureVmssVMInstanceView() { this.MethodName = "VirtualMachineScaleSetVMGetInstanceView"; } @@ -129,7 +131,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -141,7 +143,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -153,7 +155,7 @@ public override object GetDynamicParameters() var pInstanceId = new RuntimeDefinedParameter(); pInstanceId.Name = "InstanceId"; - pInstanceId.ParameterType = typeof(System.String); + pInstanceId.ParameterType = typeof(string); pInstanceId.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetMethod.cs index 9cbebe1ac5d7..b2f37a69d723 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetVMGetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetVMGetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetVMGetDynamicParameters() var pInstanceId = new RuntimeDefinedParameter(); pInstanceId.Name = "InstanceId"; - pInstanceId.ParameterType = typeof(System.String); + pInstanceId.ParameterType = typeof(string); pInstanceId.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -105,14 +105,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMGetParameters() string vmScaleSetName = string.Empty; string instanceId = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName", "InstanceId" }, new object[] { resourceGroupName, vmScaleSetName, instanceId }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName", "InstanceId" }, + new object[] { resourceGroupName, vmScaleSetName, instanceId }); } } - [Cmdlet("Get", "AzureVMSSVM")] - public partial class GetAzureVMSSVM : InvokeAzureComputeMethodCmdlet + [Cmdlet("Get", "AzureVmssVM", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class GetAzureVmssVM : InvokeAzureComputeMethodCmdlet { - public GetAzureVMSSVM() + public GetAzureVmssVM() { this.MethodName = "VirtualMachineScaleSetVMGet"; } @@ -129,7 +131,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -141,7 +143,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -153,7 +155,7 @@ public override object GetDynamicParameters() var pInstanceId = new RuntimeDefinedParameter(); pInstanceId.Name = "InstanceId"; - pInstanceId.ParameterType = typeof(System.String); + pInstanceId.ParameterType = typeof(string); pInstanceId.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMListMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMListMethod.cs index eb00f4e60eba..3b4ed740bad9 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMListMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMListMethod.cs @@ -35,17 +35,65 @@ public partial class InvokeAzureComputeMethodCmdlet : ComputeAutomationBaseCmdle protected object CreateVirtualMachineScaleSetVMListDynamicParameters() { dynamicParameters = new RuntimeDefinedParameterDictionary(); - var pParameters = new RuntimeDefinedParameter(); - pParameters.Name = "VirtualMachineScaleSetVMListParameters"; - pParameters.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetVMListParameters); - pParameters.Attributes.Add(new ParameterAttribute + var pExpandExpression = new RuntimeDefinedParameter(); + pExpandExpression.Name = "ExpandExpression"; + pExpandExpression.ParameterType = typeof(string); + pExpandExpression.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", Position = 1, - Mandatory = true + Mandatory = false + }); + pExpandExpression.Attributes.Add(new AllowNullAttribute()); + dynamicParameters.Add("ExpandExpression", pExpandExpression); + + var pFilterExpression = new RuntimeDefinedParameter(); + pFilterExpression.Name = "FilterExpression"; + pFilterExpression.ParameterType = typeof(string); + pFilterExpression.Attributes.Add(new ParameterAttribute + { + ParameterSetName = "InvokeByDynamicParameters", + Position = 2, + Mandatory = false + }); + pFilterExpression.Attributes.Add(new AllowNullAttribute()); + dynamicParameters.Add("FilterExpression", pFilterExpression); + + var pResourceGroupName = new RuntimeDefinedParameter(); + pResourceGroupName.Name = "ResourceGroupName"; + pResourceGroupName.ParameterType = typeof(string); + pResourceGroupName.Attributes.Add(new ParameterAttribute + { + ParameterSetName = "InvokeByDynamicParameters", + Position = 3, + Mandatory = false }); - pParameters.Attributes.Add(new AllowNullAttribute()); - dynamicParameters.Add("VirtualMachineScaleSetVMListParameters", pParameters); + pResourceGroupName.Attributes.Add(new AllowNullAttribute()); + dynamicParameters.Add("ResourceGroupName", pResourceGroupName); + + var pSelectExpression = new RuntimeDefinedParameter(); + pSelectExpression.Name = "SelectExpression"; + pSelectExpression.ParameterType = typeof(string); + pSelectExpression.Attributes.Add(new ParameterAttribute + { + ParameterSetName = "InvokeByDynamicParameters", + Position = 4, + Mandatory = false + }); + pSelectExpression.Attributes.Add(new AllowNullAttribute()); + dynamicParameters.Add("SelectExpression", pSelectExpression); + + var pVirtualMachineScaleSetName = new RuntimeDefinedParameter(); + pVirtualMachineScaleSetName.Name = "VirtualMachineScaleSetName"; + pVirtualMachineScaleSetName.ParameterType = typeof(string); + pVirtualMachineScaleSetName.Attributes.Add(new ParameterAttribute + { + ParameterSetName = "InvokeByDynamicParameters", + Position = 5, + Mandatory = false + }); + pVirtualMachineScaleSetName.Attributes.Add(new AllowNullAttribute()); + dynamicParameters.Add("VirtualMachineScaleSetName", pVirtualMachineScaleSetName); var pArgumentList = new RuntimeDefinedParameter(); pArgumentList.Name = "ArgumentList"; @@ -53,7 +101,7 @@ protected object CreateVirtualMachineScaleSetVMListDynamicParameters() pArgumentList.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByStaticParameters", - Position = 2, + Position = 6, Mandatory = true }); pArgumentList.Attributes.Add(new AllowNullAttribute()); @@ -64,7 +112,17 @@ protected object CreateVirtualMachineScaleSetVMListDynamicParameters() protected void ExecuteVirtualMachineScaleSetVMListMethod(object[] invokeMethodInputParameters) { - VirtualMachineScaleSetVMListParameters parameters = (VirtualMachineScaleSetVMListParameters)ParseParameter(invokeMethodInputParameters[0]); + var parameters = new VirtualMachineScaleSetVMListParameters(); + var pExpandExpression = (string) ParseParameter(invokeMethodInputParameters[0]); + parameters.ExpandExpression = string.IsNullOrEmpty(pExpandExpression) ? null : pExpandExpression; + var pFilterExpression = (string) ParseParameter(invokeMethodInputParameters[1]); + parameters.FilterExpression = string.IsNullOrEmpty(pFilterExpression) ? null : pFilterExpression; + var pResourceGroupName = (string) ParseParameter(invokeMethodInputParameters[2]); + parameters.ResourceGroupName = string.IsNullOrEmpty(pResourceGroupName) ? null : pResourceGroupName; + var pSelectExpression = (string) ParseParameter(invokeMethodInputParameters[3]); + parameters.SelectExpression = string.IsNullOrEmpty(pSelectExpression) ? null : pSelectExpression; + var pVirtualMachineScaleSetName = (string) ParseParameter(invokeMethodInputParameters[4]); + parameters.VirtualMachineScaleSetName = string.IsNullOrEmpty(pVirtualMachineScaleSetName) ? null : pVirtualMachineScaleSetName; var result = VirtualMachineScaleSetVMClient.List(parameters); WriteObject(result); @@ -75,16 +133,22 @@ public partial class NewAzureComputeArgumentListCmdlet : ComputeAutomationBaseCm { protected PSArgument[] CreateVirtualMachineScaleSetVMListParameters() { - VirtualMachineScaleSetVMListParameters parameters = new VirtualMachineScaleSetVMListParameters(); + var pExpandExpression = string.Empty; + var pFilterExpression = string.Empty; + var pResourceGroupName = string.Empty; + var pSelectExpression = string.Empty; + var pVirtualMachineScaleSetName = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "Parameters" }, new object[] { parameters }); + return ConvertFromObjectsToArguments( + new string[] { "ExpandExpression", "FilterExpression", "ResourceGroupName", "SelectExpression", "VirtualMachineScaleSetName" }, + new object[] { pExpandExpression, pFilterExpression, pResourceGroupName, pSelectExpression, pVirtualMachineScaleSetName }); } } - [Cmdlet("Get", "AzureVMSSVMList")] - public partial class GetAzureVMSSVMList : InvokeAzureComputeMethodCmdlet + [Cmdlet("Get", "AzureVmssVMList", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class GetAzureVmssVMList : InvokeAzureComputeMethodCmdlet { - public GetAzureVMSSVMList() + public GetAzureVmssVMList() { this.MethodName = "VirtualMachineScaleSetVMList"; } @@ -99,17 +163,65 @@ protected override void ProcessRecord() public override object GetDynamicParameters() { dynamicParameters = new RuntimeDefinedParameterDictionary(); - var pParameters = new RuntimeDefinedParameter(); - pParameters.Name = "VirtualMachineScaleSetVMListParameters"; - pParameters.ParameterType = typeof(Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetVMListParameters); - pParameters.Attributes.Add(new ParameterAttribute + var pExpandExpression = new RuntimeDefinedParameter(); + pExpandExpression.Name = "ExpandExpression"; + pExpandExpression.ParameterType = typeof(string); + pExpandExpression.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", Position = 1, - Mandatory = true + Mandatory = false + }); + pExpandExpression.Attributes.Add(new AllowNullAttribute()); + dynamicParameters.Add("ExpandExpression", pExpandExpression); + + var pFilterExpression = new RuntimeDefinedParameter(); + pFilterExpression.Name = "FilterExpression"; + pFilterExpression.ParameterType = typeof(string); + pFilterExpression.Attributes.Add(new ParameterAttribute + { + ParameterSetName = "InvokeByDynamicParameters", + Position = 2, + Mandatory = false + }); + pFilterExpression.Attributes.Add(new AllowNullAttribute()); + dynamicParameters.Add("FilterExpression", pFilterExpression); + + var pResourceGroupName = new RuntimeDefinedParameter(); + pResourceGroupName.Name = "ResourceGroupName"; + pResourceGroupName.ParameterType = typeof(string); + pResourceGroupName.Attributes.Add(new ParameterAttribute + { + ParameterSetName = "InvokeByDynamicParameters", + Position = 3, + Mandatory = false }); - pParameters.Attributes.Add(new AllowNullAttribute()); - dynamicParameters.Add("VirtualMachineScaleSetVMListParameters", pParameters); + pResourceGroupName.Attributes.Add(new AllowNullAttribute()); + dynamicParameters.Add("ResourceGroupName", pResourceGroupName); + + var pSelectExpression = new RuntimeDefinedParameter(); + pSelectExpression.Name = "SelectExpression"; + pSelectExpression.ParameterType = typeof(string); + pSelectExpression.Attributes.Add(new ParameterAttribute + { + ParameterSetName = "InvokeByDynamicParameters", + Position = 4, + Mandatory = false + }); + pSelectExpression.Attributes.Add(new AllowNullAttribute()); + dynamicParameters.Add("SelectExpression", pSelectExpression); + + var pVirtualMachineScaleSetName = new RuntimeDefinedParameter(); + pVirtualMachineScaleSetName.Name = "VirtualMachineScaleSetName"; + pVirtualMachineScaleSetName.ParameterType = typeof(string); + pVirtualMachineScaleSetName.Attributes.Add(new ParameterAttribute + { + ParameterSetName = "InvokeByDynamicParameters", + Position = 5, + Mandatory = false + }); + pVirtualMachineScaleSetName.Attributes.Add(new AllowNullAttribute()); + dynamicParameters.Add("VirtualMachineScaleSetName", pVirtualMachineScaleSetName); var pArgumentList = new RuntimeDefinedParameter(); pArgumentList.Name = "ArgumentList"; @@ -117,7 +229,7 @@ public override object GetDynamicParameters() pArgumentList.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByStaticParameters", - Position = 2, + Position = 6, Mandatory = true }); pArgumentList.Attributes.Add(new AllowNullAttribute()); diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMPowerOffMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMPowerOffMethod.cs index 2c4ff56b9ddd..78a9a28249ba 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMPowerOffMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMPowerOffMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetVMPowerOffDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetVMPowerOffDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetVMPowerOffDynamicParameters() var pInstanceId = new RuntimeDefinedParameter(); pInstanceId.Name = "InstanceId"; - pInstanceId.ParameterType = typeof(System.String); + pInstanceId.ParameterType = typeof(string); pInstanceId.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -105,14 +105,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMPowerOffParameters() string vmScaleSetName = string.Empty; string instanceId = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName", "InstanceId" }, new object[] { resourceGroupName, vmScaleSetName, instanceId }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName", "InstanceId" }, + new object[] { resourceGroupName, vmScaleSetName, instanceId }); } } - [Cmdlet("Stop", "AzureVMSSVM")] - public partial class StopAzureVMSSVM : InvokeAzureComputeMethodCmdlet + [Cmdlet("Stop", "AzureVmssVM", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class StopAzureVmssVM : InvokeAzureComputeMethodCmdlet { - public StopAzureVMSSVM() + public StopAzureVmssVM() { this.MethodName = "VirtualMachineScaleSetVMPowerOff"; } @@ -129,7 +131,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -141,7 +143,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -153,7 +155,7 @@ public override object GetDynamicParameters() var pInstanceId = new RuntimeDefinedParameter(); pInstanceId.Name = "InstanceId"; - pInstanceId.ParameterType = typeof(System.String); + pInstanceId.ParameterType = typeof(string); pInstanceId.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMRestartMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMRestartMethod.cs index 6b05b1cf12ac..d29d5d0bb8be 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMRestartMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMRestartMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetVMRestartDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetVMRestartDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetVMRestartDynamicParameters() var pInstanceId = new RuntimeDefinedParameter(); pInstanceId.Name = "InstanceId"; - pInstanceId.ParameterType = typeof(System.String); + pInstanceId.ParameterType = typeof(string); pInstanceId.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -105,14 +105,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMRestartParameters() string vmScaleSetName = string.Empty; string instanceId = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName", "InstanceId" }, new object[] { resourceGroupName, vmScaleSetName, instanceId }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName", "InstanceId" }, + new object[] { resourceGroupName, vmScaleSetName, instanceId }); } } - [Cmdlet("Restart", "AzureVMSSVM")] - public partial class RestartAzureVMSSVM : InvokeAzureComputeMethodCmdlet + [Cmdlet("Restart", "AzureVmssVM", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class RestartAzureVmssVM : InvokeAzureComputeMethodCmdlet { - public RestartAzureVMSSVM() + public RestartAzureVmssVM() { this.MethodName = "VirtualMachineScaleSetVMRestart"; } @@ -129,7 +131,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -141,7 +143,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -153,7 +155,7 @@ public override object GetDynamicParameters() var pInstanceId = new RuntimeDefinedParameter(); pInstanceId.Name = "InstanceId"; - pInstanceId.ParameterType = typeof(System.String); + pInstanceId.ParameterType = typeof(string); pInstanceId.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMStartMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMStartMethod.cs index ce51b57dbe33..dec9d753ec59 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMStartMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMStartMethod.cs @@ -37,7 +37,7 @@ protected object CreateVirtualMachineScaleSetVMStartDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -49,7 +49,7 @@ protected object CreateVirtualMachineScaleSetVMStartDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetVMStartDynamicParameters() var pInstanceId = new RuntimeDefinedParameter(); pInstanceId.Name = "InstanceId"; - pInstanceId.ParameterType = typeof(System.String); + pInstanceId.ParameterType = typeof(string); pInstanceId.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -105,14 +105,16 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMStartParameters() string vmScaleSetName = string.Empty; string instanceId = string.Empty; - return ConvertFromObjectsToArguments(new string[] { "ResourceGroupName", "VMScaleSetName", "InstanceId" }, new object[] { resourceGroupName, vmScaleSetName, instanceId }); + return ConvertFromObjectsToArguments( + new string[] { "ResourceGroupName", "VMScaleSetName", "InstanceId" }, + new object[] { resourceGroupName, vmScaleSetName, instanceId }); } } - [Cmdlet("Start", "AzureVMSSVM")] - public partial class StartAzureVMSSVM : InvokeAzureComputeMethodCmdlet + [Cmdlet("Start", "AzureVmssVM", DefaultParameterSetName = "InvokeByDynamicParameters")] + public partial class StartAzureVmssVM : InvokeAzureComputeMethodCmdlet { - public StartAzureVMSSVM() + public StartAzureVmssVM() { this.MethodName = "VirtualMachineScaleSetVMStart"; } @@ -129,7 +131,7 @@ public override object GetDynamicParameters() dynamicParameters = new RuntimeDefinedParameterDictionary(); var pResourceGroupName = new RuntimeDefinedParameter(); pResourceGroupName.Name = "ResourceGroupName"; - pResourceGroupName.ParameterType = typeof(System.String); + pResourceGroupName.ParameterType = typeof(string); pResourceGroupName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -141,7 +143,7 @@ public override object GetDynamicParameters() var pVMScaleSetName = new RuntimeDefinedParameter(); pVMScaleSetName.Name = "VMScaleSetName"; - pVMScaleSetName.ParameterType = typeof(System.String); + pVMScaleSetName.ParameterType = typeof(string); pVMScaleSetName.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -153,7 +155,7 @@ public override object GetDynamicParameters() var pInstanceId = new RuntimeDefinedParameter(); pInstanceId.Name = "InstanceId"; - pInstanceId.ParameterType = typeof(System.String); + pInstanceId.ParameterType = typeof(string); pInstanceId.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/cli.js b/src/ResourceManager/Compute/Commands.Compute/Generated/cli.js index 6e43b22260c9..db69bd6fd3d2 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/cli.js +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/cli.js @@ -5875,315 +5875,24 @@ exports.init = function (cli) { vmssvm.command('list') .description($('list method to manage your virtual machine scale set vm.')) .usage('[options]') - .option('--parameters ', $('parameters')) + .option('--expand-expression ', $('expand-expression')) + .option('--filter-expression ', $('filter-expression')) + .option('--resource-group-name ', $('resource-group-name')) + .option('--select-expression ', $('select-expression')) + .option('--virtual-machine-scale-set-name ', $('virtual-machine-scale-set-name')) .option('--parameter-file ', $('the input parameter file')) .option('-s, --subscription ', $('the subscription identifier')) - .execute(function (parameters, options, _) { - cli.output.info('parameters = ' + options.parameters); - if (options.parameterFile) { - cli.output.info("Reading file content from: \"" + options.parameterFile + "\""); - var fileContent = fs.readFileSync(options.parameterFile, 'utf8'); - var parametersObj = JSON.parse(fileContent); - } - else { - var parametersObj = JSON.parse(options.parameters); - } - cli.output.info('parametersObj = ' + JSON.stringify(parametersObj)); + .execute(function (expandExpression, filterExpression, resourceGroupName, selectExpression, virtualMachineScaleSetName, options, _) { + cli.output.info('expandExpression = ' + options.expandExpression); + cli.output.info('filterExpression = ' + options.filterExpression); + cli.output.info('resourceGroupName = ' + options.resourceGroupName); + cli.output.info('selectExpression = ' + options.selectExpression); + cli.output.info('virtualMachineScaleSetName = ' + options.virtualMachineScaleSetName); var subscription = profile.current.getSubscription(options.subscription); var computeManagementClient = utils.createComputeResourceProviderClient(subscription); - var result = computeManagementClient.virtualMachineScaleSetVMs.list(parametersObj, _); + var result = computeManagementClient.virtualMachineScaleSetVMs.list(options.expandExpression, options.filterExpression, options.resourceGroupName, options.selectExpression, options.virtualMachineScaleSetName, _); cli.output.json(result); }); - var parameters = vmssvm.category('parameters') - .description($('Commands to manage parameter for your virtual machine scale set vm.')); - var generate = parameters.category('generate') - .description($('Commands to generate parameter file for your virtual machine scale set vm.')); - generate.command('list') - .description($('Generate vmssvm parameter string or files.')) - .usage('[options]') - .option('--parameter-file ', $('The parameter file path.')) - .execute(function (parameterFile, options, _) { - cli.output.info("{\"expandExpression\":\"\",\"filterExpression\":\"\",\"resourceGroupName\":\"\",\"selectExpression\":\"\",\"virtualMachineScaleSetName\":\"\"}"); - var filePath = "vmssvm_list.json"; - if (options.parameterFile) { filePath = options.parameterFile; }; - fs.writeFileSync(filePath, beautify("{\r\n\"expandExpression\":\"\",\r\n\"filterExpression\":\"\",\r\n\"resourceGroupName\":\"\",\r\n\"selectExpression\":\"\",\r\n\"virtualMachineScaleSetName\":\"\"\r\n}")); - cli.output.info("====================================="); - cli.output.info("Parameter file output to: " + filePath); - cli.output.info("====================================="); - }); - - parameters.command('patch') - .description($('Command to patch vmssvm parameter JSON file.')) - .usage('[options]') - .option('--parameter-file ', $('The parameter file path.')) - .option('--operation ', $('The JSON patch operation: add, remove, or replace.')) - .option('--path ', $('The JSON data path, e.g.: \"foo/1\".')) - .option('--value ', $('The JSON value.')) - .option('--parse', $('Parse the JSON value to object.')) - .execute(function (parameterFile, operation, path, value, parse, options, _) { - cli.output.info(options.parameterFile); - cli.output.info(options.operation); - cli.output.info(options.path); - cli.output.info(options.value); - cli.output.info(options.parse); - if (options.parse) { - options.value = JSON.parse(options.value); - } - cli.output.info(options.value); - cli.output.info("====================================="); - cli.output.info("Reading file content from: \"" + options.parameterFile + "\""); - cli.output.info("====================================="); - var fileContent = fs.readFileSync(options.parameterFile, 'utf8'); - var parametersObj = JSON.parse(fileContent); - cli.output.info("JSON object:"); - cli.output.info(JSON.stringify(parametersObj)); - if (options.operation == 'add') { - jsonpatch.apply(parametersObj, [{op: options.operation, path: options.path, value: options.value}]); - } - else if (options.operation == 'remove') { - jsonpatch.apply(parametersObj, [{op: options.operation, path: options.path}]); - } - else if (options.operation == 'replace') { - jsonpatch.apply(parametersObj, [{op: options.operation, path: options.path, value: options.value}]); - } - var updatedContent = JSON.stringify(parametersObj); - cli.output.info("====================================="); - cli.output.info("JSON object (updated):"); - cli.output.info(JSON.stringify(parametersObj)); - cli.output.info("====================================="); - fs.writeFileSync(options.parameterFile, beautify(updatedContent)); - cli.output.info("====================================="); - cli.output.info("Parameter file updated at: " + options.parameterFile); - cli.output.info("====================================="); - }); - - //parameters set virtual-machine-scale-set-vm-list-parameters - var parameters = vmssvm.category('parameters') - .description($('Commands to manage parameter for your virtual-machine-scale-set-vm.')); - var set = parameters.category('set') - .description($('Commands to set parameter file for your virtual-machine-scale-set-vm.')); - set.command('virtual-machine-scale-set-vm-list-parameters') - .description($('Set vmssvm parameter string or files.')) - .usage('[options]') - .option('--parameter-file ', $('The parameter file path.')) - .option('--value ', $('The JSON value.')) - .option('--parse', $('Parse the JSON value to object.')) - .option('--expand-expression ', $('Set the expand-expression value.')) - .option('--filter-expression ', $('Set the filter-expression value.')) - .option('--resource-group-name ', $('Set the resource-group-name value.')) - .option('--select-expression ', $('Set the select-expression value.')) - .option('--virtual-machine-scale-set-name ', $('Set the virtual-machine-scale-set-name value.')) - .execute(function ( parameterFile , options, _) { - cli.output.info(options); - cli.output.info(options.parameterFile); - cli.output.info(options.value); - cli.output.info(options.parse); - if (options.parse && options.value) { - options.value = JSON.parse(options.value); - } - cli.output.info(options.value); - cli.output.info("====================================="); - cli.output.info("Reading file content from: \"" + options.parameterFile + "\""); - cli.output.info("====================================="); - var fileContent = fs.readFileSync(options.parameterFile, 'utf8'); - var parametersObj = JSON.parse(fileContent); - cli.output.info("JSON object:"); - cli.output.info(JSON.stringify(parametersObj)); - options.operation = 'replace'; - options.path = ""; - var paramPath = options.path + "/" + "expandExpression"; - cli.output.info("================================================"); - cli.output.info("JSON Parameters Path:" + paramPath); - cli.output.info("================================================"); - if (options.expandExpression) { - if (options.parse && options.expandExpression) { - options.expandExpression = JSON.parse(options.expandExpression); - } - jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.expandExpression}]); - } - var paramPath = options.path + "/" + "filterExpression"; - cli.output.info("================================================"); - cli.output.info("JSON Parameters Path:" + paramPath); - cli.output.info("================================================"); - if (options.filterExpression) { - if (options.parse && options.filterExpression) { - options.filterExpression = JSON.parse(options.filterExpression); - } - jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.filterExpression}]); - } - var paramPath = options.path + "/" + "resourceGroupName"; - cli.output.info("================================================"); - cli.output.info("JSON Parameters Path:" + paramPath); - cli.output.info("================================================"); - if (options.resourceGroupName) { - if (options.parse && options.resourceGroupName) { - options.resourceGroupName = JSON.parse(options.resourceGroupName); - } - jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.resourceGroupName}]); - } - var paramPath = options.path + "/" + "selectExpression"; - cli.output.info("================================================"); - cli.output.info("JSON Parameters Path:" + paramPath); - cli.output.info("================================================"); - if (options.selectExpression) { - if (options.parse && options.selectExpression) { - options.selectExpression = JSON.parse(options.selectExpression); - } - jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.selectExpression}]); - } - var paramPath = options.path + "/" + "virtualMachineScaleSetName"; - cli.output.info("================================================"); - cli.output.info("JSON Parameters Path:" + paramPath); - cli.output.info("================================================"); - if (options.virtualMachineScaleSetName) { - if (options.parse && options.virtualMachineScaleSetName) { - options.virtualMachineScaleSetName = JSON.parse(options.virtualMachineScaleSetName); - } - jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.virtualMachineScaleSetName}]); - } - var updatedContent = JSON.stringify(parametersObj); - cli.output.info("====================================="); - cli.output.info("JSON object (updated):"); - cli.output.info(JSON.stringify(parametersObj)); - cli.output.info("====================================="); - fs.writeFileSync(options.parameterFile, beautify(updatedContent)); - cli.output.info("====================================="); - cli.output.info("Parameter file updated at: " + options.parameterFile); - cli.output.info("====================================="); - }); - - //parameters remove virtual-machine-scale-set-vm-list-parameters - var parameters = vmssvm.category('parameters') - .description($('Commands to remove parameter for your virtual-machine-scale-set-vm.')); - var remove = parameters.category('remove') - .description($('Commands to remove values in the parameter file for your virtual-machine-scale-set-vm.')); - remove.command('virtual-machine-scale-set-vm-list-parameters') - .description($('Remove vmssvm parameter string or files.')) - .usage('[options]') - .option('--parameter-file ', $('The parameter file path.')) - .execute(function ( parameterFile , options, _) { - cli.output.info(options); - cli.output.info(options.parameterFile); - cli.output.info("====================================="); - cli.output.info("Reading file content from: \"" + options.parameterFile + "\""); - cli.output.info("====================================="); - var fileContent = fs.readFileSync(options.parameterFile, 'utf8'); - var parametersObj = JSON.parse(fileContent); - cli.output.info("JSON object:"); - cli.output.info(JSON.stringify(parametersObj)); - options.operation = 'remove'; - options.path = ""; - jsonpatch.apply(parametersObj, [{op: options.operation, path: options.path}]); - var updatedContent = JSON.stringify(parametersObj); - cli.output.info("====================================="); - cli.output.info("JSON object (updated):"); - cli.output.info(JSON.stringify(parametersObj)); - cli.output.info("====================================="); - fs.writeFileSync(options.parameterFile, beautify(updatedContent)); - cli.output.info("====================================="); - cli.output.info("Parameter file updated at: " + options.parameterFile); - cli.output.info("====================================="); - }); - //parameters add virtual-machine-scale-set-vm-list-parameters - var parameters = vmssvm.category('parameters') - .description($('Commands to add parameter for your virtual-machine-scale-set-vm.')); - var add = parameters.category('add') - .description($('Commands to add values in the parameter file for your virtual-machine-scale-set-vm.')); - add.command('virtual-machine-scale-set-vm-list-parameters') - .description($('Remove vmssvm parameter string or files.')) - .usage('[options]') - .option('--parameter-file ', $('The parameter file path.')) - .option('--key ', $('The JSON key.')) - .option('--value ', $('The JSON value.')) - .option('--parse', $('Parse the JSON value to object.')) - .option('--expand-expression ', $('Add the expand-expression value.')) - .option('--filter-expression ', $('Add the filter-expression value.')) - .option('--resource-group-name ', $('Add the resource-group-name value.')) - .option('--select-expression ', $('Add the select-expression value.')) - .option('--virtual-machine-scale-set-name ', $('Add the virtual-machine-scale-set-name value.')) - .execute(function ( parameterFile , options, _) { - cli.output.info(options); - cli.output.info(options.parameterFile); - cli.output.info(options.key); - cli.output.info(options.value); - cli.output.info(options.parse); - if (options.parse && options.value) { - options.value = JSON.parse(options.value); - } - cli.output.info(options.value); - cli.output.info("====================================="); - cli.output.info("Reading file content from: \"" + options.parameterFile + "\""); - cli.output.info("====================================="); - var fileContent = fs.readFileSync(options.parameterFile, 'utf8'); - var parametersObj = JSON.parse(fileContent); - cli.output.info("JSON object:"); - cli.output.info(JSON.stringify(parametersObj)); - options.operation = 'add'; - options.path = "" + "/" + options.key; - cli.output.info("options.path = " + options.path); - jsonpatch.apply(parametersObj, [{op: options.operation, path: options.path, value: options.value}]); - var paramPath = "" + "/" + "expandExpression"; - cli.output.info("================================================"); - cli.output.info("JSON Parameters Path:" + paramPath); - cli.output.info("================================================"); - if (options.expandExpression) { - if (options.parse && options.expandExpression) { - options.expandExpression = JSON.parse(options.expandExpression); - } - jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.expandExpression}]); - } - var paramPath = "" + "/" + "filterExpression"; - cli.output.info("================================================"); - cli.output.info("JSON Parameters Path:" + paramPath); - cli.output.info("================================================"); - if (options.filterExpression) { - if (options.parse && options.filterExpression) { - options.filterExpression = JSON.parse(options.filterExpression); - } - jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.filterExpression}]); - } - var paramPath = "" + "/" + "resourceGroupName"; - cli.output.info("================================================"); - cli.output.info("JSON Parameters Path:" + paramPath); - cli.output.info("================================================"); - if (options.resourceGroupName) { - if (options.parse && options.resourceGroupName) { - options.resourceGroupName = JSON.parse(options.resourceGroupName); - } - jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.resourceGroupName}]); - } - var paramPath = "" + "/" + "selectExpression"; - cli.output.info("================================================"); - cli.output.info("JSON Parameters Path:" + paramPath); - cli.output.info("================================================"); - if (options.selectExpression) { - if (options.parse && options.selectExpression) { - options.selectExpression = JSON.parse(options.selectExpression); - } - jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.selectExpression}]); - } - var paramPath = "" + "/" + "virtualMachineScaleSetName"; - cli.output.info("================================================"); - cli.output.info("JSON Parameters Path:" + paramPath); - cli.output.info("================================================"); - if (options.virtualMachineScaleSetName) { - if (options.parse && options.virtualMachineScaleSetName) { - options.virtualMachineScaleSetName = JSON.parse(options.virtualMachineScaleSetName); - } - jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.virtualMachineScaleSetName}]); - } - var updatedContent = JSON.stringify(parametersObj); - cli.output.info("====================================="); - cli.output.info("JSON object (updated):"); - cli.output.info(JSON.stringify(parametersObj)); - cli.output.info("====================================="); - fs.writeFileSync(options.parameterFile, beautify(updatedContent)); - cli.output.info("====================================="); - cli.output.info("Parameter file updated at: " + options.parameterFile); - cli.output.info("====================================="); - }); - - //virtualMachineScaleSetVM -> PowerOff var vmssvm = cli.category('vmssvm').description($('Commands to manage your virtual machine scale set vm.')); vmssvm.command('power-off') diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1 b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1 index 5658a7737792..506765517a01 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1 +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1 @@ -68,6 +68,8 @@ $verbs_common_new = "VerbsCommon.New"; $verbs_lifecycle_invoke = "VerbsLifecycle.Invoke"; $client_model_namespace = $client_library_namespace + '.Models'; +#$verbosePreference='Continue'; + $common_verb_mapping = @{ "CreateOrUpdate" = "New"; @@ -84,8 +86,7 @@ $common_verb_mapping = $common_noun_mapping = @{ -"VirtualMachine" = "VM"; -"ScaleSet" = "SS"; +"VirtualMachineScaleSet" = "Vmss"; }; $all_return_type_names = @(); @@ -198,6 +199,56 @@ function Get-NormalizedTypeName return $outputName; } +function Is-SpecialType +{ + param( + [Parameter(Mandatory = $True)] + [string]$inputName + ) + + return ($inputName.StartsWith($client_model_namespace_prefix)); +} + +function Is-ListType +{ + param( + [Parameter(Mandatory = $True)] + [System.Reflection.PropertyInfo[]]$property_info_array + ) + + if ($property_info_array.Count -eq 1) + { + if ($property_info_array[0].PropertyType.FullName -like '*List*System.String*') + { + return $property_info_array[0].Name; + } + } + return $null; +} + +function Does-ContainOnlyStringTypes +{ + param( + [Parameter(Mandatory = $True)] + [System.Reflection.PropertyInfo[]]$property_info_array + ) + + $return_string_array = @(); + foreach ($prop in $property_info_array) + { + if ($prop.PropertyType.FullName -eq "System.String") + { + $return_string_array += $prop.Name; + } + else + { + return $null; + } + } + + return $return_string_array; +} + function Get-ConstructorCodeByNormalizedTypeName { param( @@ -297,7 +348,7 @@ function Get-FilteredOperationTypes ) $op_types = $all_assembly_types | where { $_.Namespace -eq $dll_name -and $_.Name -like 'I*Operations' }; - + Write-Verbose $BAR_LINE; Write-Verbose 'All Operation Types:'; foreach ($op_type in $op_types) @@ -552,6 +603,11 @@ namespace ${code_common_namespace} protected static object[] ConvertFromArgumentsToObjects(object[] arguments) { + if (arguments == null) + { + return null; + } + var objects = new object[arguments.Length]; for (int index = 0; index < arguments.Length; index++) @@ -1300,6 +1356,7 @@ function Write-OperationCmdletFile $params = $operation_method_info.GetParameters(); [System.Collections.ArrayList]$param_names = @(); + [System.Collections.ArrayList]$pruned_params = @(); [System.Collections.ArrayList]$invoke_param_names = @(); [System.Collections.ArrayList]$invoke_local_param_names = @(); [System.Collections.ArrayList]$create_local_param_names = @(); @@ -1317,6 +1374,31 @@ function Write-OperationCmdletFile $paramTypeNormalizedName = Get-NormalizedTypeName -inputName $paramTypeFullName; $param_constructor_code = Get-ConstructorCodeByNormalizedTypeName -inputName $paramTypeNormalizedName; + $is_special_type = Is-SpecialType -inputName $paramTypeFullName; + $has_properties = $true; + if ($is_special_type) + { + $properties_of_special_type = $pt.ParameterType.GetProperties(); + if ($properties_of_special_type.Count -eq 0) + { + $has_properties = $false; + } + } + + $is_string_list = $null; + $does_contain_only_strings = $null; + if ($has_properties) + { + $is_string_list = Is-ListType -property_info_array $pt.ParameterType.GetProperties(); + $does_contain_only_strings = Does-ContainOnlyStringTypes -property_info_array $pt.ParameterType.GetProperties(); + } + + $only_strings = $true; + if (($does_contain_only_strings -eq $null) -or ($does_contain_only_strings.Count -eq 0)) + { + $only_strings = $false; + } + $param_attributes = $indents + "[Parameter(Mandatory = true"; $invoke_param_attributes = $indents + "[Parameter(ParameterSetName = `"${invoke_param_set_name}`", Position = ${position_index}, Mandatory = true"; if ((Is-PipingPropertyName $normalized_param_name) -and (Is-PipingPropertyTypeName $paramTypeNormalizedName)) @@ -1331,23 +1413,77 @@ function Write-OperationCmdletFile $param_definition = $indents + "public ${paramTypeNormalizedName} ${normalized_param_name} " + $get_set_block + $NEW_LINE; $invoke_param_definition = $indents + "public ${paramTypeNormalizedName} ${invoke_param_set_name}${normalized_param_name} " + $get_set_block + $NEW_LINE; $param_index = $position_index - 1; - $invoke_local_param_definition = $indents + (' ' * 4) + "${paramTypeNormalizedName} " + $pt.Name + " = (${paramTypeNormalizedName})ParseParameter(${invoke_input_params_name}[${param_index}]);"; - $create_local_param_definition = $indents + (' ' * 4) + "${paramTypeNormalizedName} " + $pt.Name + " = ${param_constructor_code};"; + + if ($only_strings) + { + $invoke_local_param_definition = $indents + (' ' * 4) + "var " + $pt.Name + " = new ${paramTypeNormalizedName}();" + $NEW_LINE; + + foreach ($param in $does_contain_only_strings) + { + $invoke_local_param_definition += $indents + (' ' * 4) + "var p${param} = (string) ParseParameter(${invoke_input_params_name}[${param_index}]);" + $NEW_LINE; + $invoke_local_param_definition += $indents + (' ' * 4) + $pt.Name + ".${param} = string.IsNullOrEmpty(p${param}) ? null : p${param};" + $NEW_LINE; + $param_index += 1; + $position_index += 1; + } + } + elseif ($has_properties -and ($is_string_list -eq $null)) + { + $invoke_local_param_definition = $indents + (' ' * 4) + "${paramTypeNormalizedName} " + $pt.Name + " = (${paramTypeNormalizedName})ParseParameter(${invoke_input_params_name}[${param_index}]);" + $NEW_LINE; + } + elseif ($has_properties) + { + $invoke_local_param_definition = $indents + (' ' * 4) + "var inputArray${param_index} = Array.ConvertAll((object []) ParseParameter(${invoke_input_params_name}[${param_index}]), e => e.ToString());" + $NEW_LINE; + $invoke_local_param_definition += $indents + (' ' * 4) + "${paramTypeNormalizedName} " + $pt.Name + " = new ${paramTypeNormalizedName}();" + $NEW_LINE; + $invoke_local_param_definition += $indents + (' ' * 4) + $pt.Name + ".${is_string_list} = inputArray${param_index}.ToList();" + $NEW_LINE; + } + else + { + $invoke_local_param_definition = $indents + (' ' * 4) + "${paramTypeNormalizedName} " + $pt.Name + " = new ${paramTypeNormalizedName}();" + $NEW_LINE; + } + + + if ($only_strings) + { + foreach ($param in $does_contain_only_strings) + { + $create_local_param_definition += $indents + (' ' * 4) + "var p${param} = string.Empty;" + $NEW_LINE; + $param_index += 1; + $position_index += 1; + $param_names += ${param}; + $invoke_local_param_names += "p${param}"; + } + } + elseif ($is_string_list -ne $null) + { + $create_local_param_definition = $indents + (' ' * 4) + "var " + $pt.Name + " = new string [] {};" + $NEW_LINE; + } + else + { + $create_local_param_definition = $indents + (' ' * 4) + "${paramTypeNormalizedName} " + $pt.Name + " = ${param_constructor_code};" + $NEW_LINE; + } + $param_code_content = $param_attributes + $param_definition; # For Invoke Method $invoke_param_definition = $indents + "public ${paramTypeNormalizedName} ${invoke_param_set_name}${normalized_param_name} " + $get_set_block + $NEW_LINE; $invoke_param_code_content += $invoke_param_attributes + $invoke_param_definition + $NEW_LINE; - $invoke_local_param_code_content += $invoke_local_param_definition + $NEW_LINE; - $create_local_param_code_content += $create_local_param_definition + $NEW_LINE; + $invoke_local_param_code_content += $invoke_local_param_definition; + $create_local_param_code_content += $create_local_param_definition; $cmdlet_generated_code += $param_code_content + $NEW_LINE; - $st = $param_names.Add($normalized_param_name); - $st = $invoke_param_names.Add((${invoke_param_set_name} + $normalized_param_name)); - $st = $invoke_local_param_names.Add($pt.Name); + if (-not $only_strings) + { + $st = $param_names.Add($normalized_param_name); + $st = $invoke_local_param_names.Add($pt.Name); + } + $st = $invoke_param_names.Add($pt.Name); $position_index += 1; + if ($has_properties) + { + $pruned_params.Add($pt); + } } } @@ -1374,26 +1510,50 @@ function Write-OperationCmdletFile $dynamic_param_assignment_code_lines = @(); $param_index = 1; - foreach ($pt in $params) + foreach ($pt in $pruned_params) { $param_type_full_name = $pt.ParameterType.FullName; + if ($param_type_full_name.EndsWith('CancellationToken')) { continue; } + $is_string_list = Is-ListType -property_info_array $pt.ParameterType.GetProperties(); + $does_contain_only_strings = Does-ContainOnlyStringTypes -property_info_array $pt.ParameterType.GetProperties(); + $param_name = Get-NormalizedName $pt.Name; $expose_param_name = $param_name; + + $param_type_full_name = Get-NormalizedTypeName -inputName $param_type_full_name; + + Write-Verbose("paramTypeFullName: "+ $param_type_full_name); + Write-Verbose("paramName: "+ $param_name); + if ($expose_param_name -like '*Parameters') { $expose_param_name = $invoke_param_set_name + $expose_param_name; } - $dynamic_param_assignment_code_lines += + if (($does_contain_only_strings -eq $null) -or ($does_contain_only_strings.Count -eq 0)) + { + $dynamic_param_assignment_code_lines += @" var p${param_name} = new RuntimeDefinedParameter(); p${param_name}.Name = `"${expose_param_name}`"; - p${param_name}.ParameterType = typeof($param_type_full_name); +"@; + + if ($is_string_list -eq $null) + { + $dynamic_param_assignment_code_lines += " p${param_name}.ParameterType = typeof($param_type_full_name);"; + } + else + { + $dynamic_param_assignment_code_lines += " p${param_name}.ParameterType = typeof(string []);"; + } + + $dynamic_param_assignment_code_lines += +@" p${param_name}.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -1404,7 +1564,30 @@ function Write-OperationCmdletFile dynamicParameters.Add(`"${expose_param_name}`", p${param_name}); "@; - $param_index += 1; + $param_index += 1; + } + else + { + foreach ($s in $does_contain_only_strings) + { + $dynamic_param_assignment_code_lines += +@" + var p${s} = new RuntimeDefinedParameter(); + p${s}.Name = `"${s}`"; + p${s}.ParameterType = typeof(string); + p${s}.Attributes.Add(new ParameterAttribute + { + ParameterSetName = "InvokeByDynamicParameters", + Position = $param_index, + Mandatory = false + }); + p${s}.Attributes.Add(new AllowNullAttribute()); + dynamicParameters.Add(`"${s}`", p${s}); + +"@; + $param_index += 1; + } + } } $param_name = $expose_param_name = 'ArgumentList'; @@ -1442,19 +1625,35 @@ $dynamic_param_assignment_code protected void Execute${invoke_param_set_name}Method(object[] ${invoke_input_params_name}) { ${invoke_local_param_code_content} - var result = ${opShortName}Client.${methodName}(${invoke_local_params_join_str}); + var result = ${opShortName}Client.${methodName}(${invoke_params_join_str}); WriteObject(result); } "@; - $parameter_cmdlt_source_template = + if ($has_properties) + { + $parameter_cmdlt_source_template = @" protected PSArgument[] Create${invoke_param_set_name}Parameters() { ${create_local_param_code_content} - return ConvertFromObjectsToArguments(new string[] { $invoke_local_param_names_join_str }, new object[] { ${invoke_local_params_join_str} }); + return ConvertFromObjectsToArguments( + new string[] { $invoke_local_param_names_join_str }, + new object[] { ${invoke_local_params_join_str} }); } "@; + } + else + { + $parameter_cmdlt_source_template = +@" + protected PSArgument[] Create${invoke_param_set_name}Parameters() + { + return ConvertFromObjectsToArguments(new string[] {}, new object[] {}); + } +"@; + } + # 1. Invoke Cmdlet Partial Code # 2. Param Cmdlet Partial Code @@ -1490,7 +1689,7 @@ $parameter_cmdlt_source_template @" - [Cmdlet(`"${mapped_verb_name}`", `"${mapped_noun_str}`")] + [Cmdlet(`"${mapped_verb_name}`", `"${mapped_noun_str}`", DefaultParameterSetName = `"InvokeByDynamicParameters`")] public partial class $verb_cmdlet_name : ${invoke_cmdlet_class_name} { public $verb_cmdlet_name() @@ -2210,7 +2409,7 @@ else # Skip 'Begin*ing*' Calls for Now... continue; } - + # Output Info for Method Signature Write-Verbose ""; Write-Verbose $SEC_LINE; From 0a2672c8a7e31ed97768365132072ff6b8cd7291 Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Fri, 9 Oct 2015 15:53:40 -0700 Subject: [PATCH 2/5] Update to address PR comments --- ...achineScaleSetDeallocateInstancesMethod.cs | 8 +-- ...ualMachineScaleSetDeleteInstancesMethod.cs | 8 +-- ...lMachineScaleSetPowerOffInstancesMethod.cs | 8 +-- ...alMachineScaleSetRestartInstancesMethod.cs | 8 +-- ...tualMachineScaleSetStartInstancesMethod.cs | 8 +-- ...ualMachineScaleSetUpdateInstancesMethod.cs | 8 +-- .../Automation/RunCodeGeneration.ps1 | 65 +++++++++---------- 7 files changed, 56 insertions(+), 57 deletions(-) diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateInstancesMethod.cs index 7dcdd1224b83..a30a3db52892 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateInstancesMethod.cs @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetDeallocateInstancesDynamicParameter var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(string []); + pVMInstanceIDs.ParameterType = typeof(string[]); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -90,7 +90,7 @@ protected void ExecuteVirtualMachineScaleSetDeallocateInstancesMethod(object[] i { string resourceGroupName = (string)ParseParameter(invokeMethodInputParameters[0]); string vmScaleSetName = (string)ParseParameter(invokeMethodInputParameters[1]); - var inputArray2 = Array.ConvertAll((object []) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); + var inputArray2 = Array.ConvertAll((object[]) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); vmInstanceIDs.InstanceIDs = inputArray2.ToList(); @@ -105,7 +105,7 @@ protected PSArgument[] CreateVirtualMachineScaleSetDeallocateInstancesParameters { string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - var vmInstanceIDs = new string [] {}; + var vmInstanceIDs = new string[0]; return ConvertFromObjectsToArguments( new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, @@ -157,7 +157,7 @@ public override object GetDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(string []); + pVMInstanceIDs.ParameterType = typeof(string[]); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteInstancesMethod.cs index d06a7dbf8c7b..87d5b3a28cda 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteInstancesMethod.cs @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetDeleteInstancesDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(string []); + pVMInstanceIDs.ParameterType = typeof(string[]); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -90,7 +90,7 @@ protected void ExecuteVirtualMachineScaleSetDeleteInstancesMethod(object[] invok { string resourceGroupName = (string)ParseParameter(invokeMethodInputParameters[0]); string vmScaleSetName = (string)ParseParameter(invokeMethodInputParameters[1]); - var inputArray2 = Array.ConvertAll((object []) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); + var inputArray2 = Array.ConvertAll((object[]) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); vmInstanceIDs.InstanceIDs = inputArray2.ToList(); @@ -105,7 +105,7 @@ protected PSArgument[] CreateVirtualMachineScaleSetDeleteInstancesParameters() { string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - var vmInstanceIDs = new string [] {}; + var vmInstanceIDs = new string[0]; return ConvertFromObjectsToArguments( new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, @@ -157,7 +157,7 @@ public override object GetDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(string []); + pVMInstanceIDs.ParameterType = typeof(string[]); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffInstancesMethod.cs index bcf19aed8ab4..da02f14f22d9 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffInstancesMethod.cs @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetPowerOffInstancesDynamicParameters( var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(string []); + pVMInstanceIDs.ParameterType = typeof(string[]); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -90,7 +90,7 @@ protected void ExecuteVirtualMachineScaleSetPowerOffInstancesMethod(object[] inv { string resourceGroupName = (string)ParseParameter(invokeMethodInputParameters[0]); string vmScaleSetName = (string)ParseParameter(invokeMethodInputParameters[1]); - var inputArray2 = Array.ConvertAll((object []) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); + var inputArray2 = Array.ConvertAll((object[]) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); vmInstanceIDs.InstanceIDs = inputArray2.ToList(); @@ -105,7 +105,7 @@ protected PSArgument[] CreateVirtualMachineScaleSetPowerOffInstancesParameters() { string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - var vmInstanceIDs = new string [] {}; + var vmInstanceIDs = new string[0]; return ConvertFromObjectsToArguments( new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, @@ -157,7 +157,7 @@ public override object GetDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(string []); + pVMInstanceIDs.ParameterType = typeof(string[]); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartInstancesMethod.cs index dd5638fa1c2a..2442e4126cf0 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartInstancesMethod.cs @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetRestartInstancesDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(string []); + pVMInstanceIDs.ParameterType = typeof(string[]); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -90,7 +90,7 @@ protected void ExecuteVirtualMachineScaleSetRestartInstancesMethod(object[] invo { string resourceGroupName = (string)ParseParameter(invokeMethodInputParameters[0]); string vmScaleSetName = (string)ParseParameter(invokeMethodInputParameters[1]); - var inputArray2 = Array.ConvertAll((object []) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); + var inputArray2 = Array.ConvertAll((object[]) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); vmInstanceIDs.InstanceIDs = inputArray2.ToList(); @@ -105,7 +105,7 @@ protected PSArgument[] CreateVirtualMachineScaleSetRestartInstancesParameters() { string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - var vmInstanceIDs = new string [] {}; + var vmInstanceIDs = new string[0]; return ConvertFromObjectsToArguments( new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, @@ -157,7 +157,7 @@ public override object GetDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(string []); + pVMInstanceIDs.ParameterType = typeof(string[]); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartInstancesMethod.cs index 6fd889e4e046..b53c2c00682a 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartInstancesMethod.cs @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetStartInstancesDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(string []); + pVMInstanceIDs.ParameterType = typeof(string[]); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -90,7 +90,7 @@ protected void ExecuteVirtualMachineScaleSetStartInstancesMethod(object[] invoke { string resourceGroupName = (string)ParseParameter(invokeMethodInputParameters[0]); string vmScaleSetName = (string)ParseParameter(invokeMethodInputParameters[1]); - var inputArray2 = Array.ConvertAll((object []) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); + var inputArray2 = Array.ConvertAll((object[]) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); vmInstanceIDs.InstanceIDs = inputArray2.ToList(); @@ -105,7 +105,7 @@ protected PSArgument[] CreateVirtualMachineScaleSetStartInstancesParameters() { string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - var vmInstanceIDs = new string [] {}; + var vmInstanceIDs = new string[0]; return ConvertFromObjectsToArguments( new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, @@ -157,7 +157,7 @@ public override object GetDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(string []); + pVMInstanceIDs.ParameterType = typeof(string[]); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateInstancesMethod.cs index 760ca083c5b9..1a037ecd2277 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateInstancesMethod.cs @@ -61,7 +61,7 @@ protected object CreateVirtualMachineScaleSetUpdateInstancesDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(string []); + pVMInstanceIDs.ParameterType = typeof(string[]); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", @@ -90,7 +90,7 @@ protected void ExecuteVirtualMachineScaleSetUpdateInstancesMethod(object[] invok { string resourceGroupName = (string)ParseParameter(invokeMethodInputParameters[0]); string vmScaleSetName = (string)ParseParameter(invokeMethodInputParameters[1]); - var inputArray2 = Array.ConvertAll((object []) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); + var inputArray2 = Array.ConvertAll((object[]) ParseParameter(invokeMethodInputParameters[2]), e => e.ToString()); VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = new VirtualMachineScaleSetVMInstanceIDs(); vmInstanceIDs.InstanceIDs = inputArray2.ToList(); @@ -105,7 +105,7 @@ protected PSArgument[] CreateVirtualMachineScaleSetUpdateInstancesParameters() { string resourceGroupName = string.Empty; string vmScaleSetName = string.Empty; - var vmInstanceIDs = new string [] {}; + var vmInstanceIDs = new string[0]; return ConvertFromObjectsToArguments( new string[] { "ResourceGroupName", "VMScaleSetName", "VMInstanceIDs" }, @@ -157,7 +157,7 @@ public override object GetDynamicParameters() var pVMInstanceIDs = new RuntimeDefinedParameter(); pVMInstanceIDs.Name = "VMInstanceIDs"; - pVMInstanceIDs.ParameterType = typeof(string []); + pVMInstanceIDs.ParameterType = typeof(string[]); pVMInstanceIDs.Attributes.Add(new ParameterAttribute { ParameterSetName = "InvokeByDynamicParameters", diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1 b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1 index 506765517a01..8ddf7e60a958 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1 +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1 @@ -199,18 +199,9 @@ function Get-NormalizedTypeName return $outputName; } -function Is-SpecialType -{ - param( - [Parameter(Mandatory = $True)] - [string]$inputName - ) - - return ($inputName.StartsWith($client_model_namespace_prefix)); -} - -function Is-ListType +function Is-ListStringType { + # This function returns $true if the given property info contains only a list of strings. param( [Parameter(Mandatory = $True)] [System.Reflection.PropertyInfo[]]$property_info_array @@ -218,16 +209,16 @@ function Is-ListType if ($property_info_array.Count -eq 1) { - if ($property_info_array[0].PropertyType.FullName -like '*List*System.String*') - { - return $property_info_array[0].Name; - } + return ($property_info_array[0].PropertyType.FullName -like '*List*System.String*') } - return $null; + + return $false; } -function Does-ContainOnlyStringTypes +function Get-StringTypes { + # This function returns an array of string types, if a given property info array contains only string types. + # It returns $null, otherwise. param( [Parameter(Mandatory = $True)] [System.Reflection.PropertyInfo[]]$property_info_array @@ -1374,7 +1365,7 @@ function Write-OperationCmdletFile $paramTypeNormalizedName = Get-NormalizedTypeName -inputName $paramTypeFullName; $param_constructor_code = Get-ConstructorCodeByNormalizedTypeName -inputName $paramTypeNormalizedName; - $is_special_type = Is-SpecialType -inputName $paramTypeFullName; + $is_special_type = $paramTypeFullName.StartsWith($client_model_namespace_prefix); $has_properties = $true; if ($is_special_type) { @@ -1385,12 +1376,12 @@ function Write-OperationCmdletFile } } - $is_string_list = $null; + $is_string_list = $false; $does_contain_only_strings = $null; if ($has_properties) { - $is_string_list = Is-ListType -property_info_array $pt.ParameterType.GetProperties(); - $does_contain_only_strings = Does-ContainOnlyStringTypes -property_info_array $pt.ParameterType.GetProperties(); + $is_string_list = Is-ListStringType -property_info_array $pt.ParameterType.GetProperties(); + $does_contain_only_strings = Get-StringTypes -property_info_array $pt.ParameterType.GetProperties(); } $only_strings = $true; @@ -1416,6 +1407,7 @@ function Write-OperationCmdletFile if ($only_strings) { + # Case 1: the parameter type contains only string types. $invoke_local_param_definition = $indents + (' ' * 4) + "var " + $pt.Name + " = new ${paramTypeNormalizedName}();" + $NEW_LINE; foreach ($param in $does_contain_only_strings) @@ -1426,24 +1418,29 @@ function Write-OperationCmdletFile $position_index += 1; } } - elseif ($has_properties -and ($is_string_list -eq $null)) + elseif ($has_properties -and $is_string_list) { - $invoke_local_param_definition = $indents + (' ' * 4) + "${paramTypeNormalizedName} " + $pt.Name + " = (${paramTypeNormalizedName})ParseParameter(${invoke_input_params_name}[${param_index}]);" + $NEW_LINE; + # Case 2: the parameter type contains only a list of strings. + $list_of_strings_property = ($pt.ParameterType.GetProperties())[0].Name; + $invoke_local_param_definition = $indents + (' ' * 4) + "var inputArray${param_index} = Array.ConvertAll((object[]) ParseParameter(${invoke_input_params_name}[${param_index}]), e => e.ToString());" + $NEW_LINE; + $invoke_local_param_definition += $indents + (' ' * 4) + "${paramTypeNormalizedName} " + $pt.Name + " = new ${paramTypeNormalizedName}();" + $NEW_LINE; + $invoke_local_param_definition += $indents + (' ' * 4) + $pt.Name + ".${list_of_strings_property} = inputArray${param_index}.ToList();" + $NEW_LINE; } elseif ($has_properties) { - $invoke_local_param_definition = $indents + (' ' * 4) + "var inputArray${param_index} = Array.ConvertAll((object []) ParseParameter(${invoke_input_params_name}[${param_index}]), e => e.ToString());" + $NEW_LINE; - $invoke_local_param_definition += $indents + (' ' * 4) + "${paramTypeNormalizedName} " + $pt.Name + " = new ${paramTypeNormalizedName}();" + $NEW_LINE; - $invoke_local_param_definition += $indents + (' ' * 4) + $pt.Name + ".${is_string_list} = inputArray${param_index}.ToList();" + $NEW_LINE; + # Case 3: this is the most general case. + $invoke_local_param_definition = $indents + (' ' * 4) + "${paramTypeNormalizedName} " + $pt.Name + " = (${paramTypeNormalizedName})ParseParameter(${invoke_input_params_name}[${param_index}]);" + $NEW_LINE; } else { + # Case 4: the parameter does not contain anything. $invoke_local_param_definition = $indents + (' ' * 4) + "${paramTypeNormalizedName} " + $pt.Name + " = new ${paramTypeNormalizedName}();" + $NEW_LINE; } if ($only_strings) { + # Case 1: the parameter type contains only string types. foreach ($param in $does_contain_only_strings) { $create_local_param_definition += $indents + (' ' * 4) + "var p${param} = string.Empty;" + $NEW_LINE; @@ -1453,12 +1450,14 @@ function Write-OperationCmdletFile $invoke_local_param_names += "p${param}"; } } - elseif ($is_string_list -ne $null) + elseif ($is_string_list) { - $create_local_param_definition = $indents + (' ' * 4) + "var " + $pt.Name + " = new string [] {};" + $NEW_LINE; + # Case 2: the parameter type contains only a list of strings. + $create_local_param_definition = $indents + (' ' * 4) + "var " + $pt.Name + " = new string[0];" + $NEW_LINE; } else { + # Case 3: this is the most general case. $create_local_param_definition = $indents + (' ' * 4) + "${paramTypeNormalizedName} " + $pt.Name + " = ${param_constructor_code};" + $NEW_LINE; } @@ -1519,8 +1518,8 @@ function Write-OperationCmdletFile continue; } - $is_string_list = Is-ListType -property_info_array $pt.ParameterType.GetProperties(); - $does_contain_only_strings = Does-ContainOnlyStringTypes -property_info_array $pt.ParameterType.GetProperties(); + $is_string_list = Is-ListStringType -property_info_array $pt.ParameterType.GetProperties(); + $does_contain_only_strings = Get-StringTypes -property_info_array $pt.ParameterType.GetProperties(); $param_name = Get-NormalizedName $pt.Name; $expose_param_name = $param_name; @@ -1543,13 +1542,13 @@ function Write-OperationCmdletFile p${param_name}.Name = `"${expose_param_name}`"; "@; - if ($is_string_list -eq $null) + if ($is_string_list) { - $dynamic_param_assignment_code_lines += " p${param_name}.ParameterType = typeof($param_type_full_name);"; + $dynamic_param_assignment_code_lines += " p${param_name}.ParameterType = typeof(string[]);"; } else { - $dynamic_param_assignment_code_lines += " p${param_name}.ParameterType = typeof(string []);"; + $dynamic_param_assignment_code_lines += " p${param_name}.ParameterType = typeof($param_type_full_name);"; } $dynamic_param_assignment_code_lines += From 9c119517ebb06ddbc792c18f05acb9899133194e Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Fri, 9 Oct 2015 17:20:52 -0700 Subject: [PATCH 3/5] Change CLI file back to the original --- .../Compute/Commands.Compute/Generated/cli.js | 315 +++++++++++++++++- 1 file changed, 303 insertions(+), 12 deletions(-) diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/cli.js b/src/ResourceManager/Compute/Commands.Compute/Generated/cli.js index db69bd6fd3d2..6e43b22260c9 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/cli.js +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/cli.js @@ -5875,24 +5875,315 @@ exports.init = function (cli) { vmssvm.command('list') .description($('list method to manage your virtual machine scale set vm.')) .usage('[options]') - .option('--expand-expression ', $('expand-expression')) - .option('--filter-expression ', $('filter-expression')) - .option('--resource-group-name ', $('resource-group-name')) - .option('--select-expression ', $('select-expression')) - .option('--virtual-machine-scale-set-name ', $('virtual-machine-scale-set-name')) + .option('--parameters ', $('parameters')) .option('--parameter-file ', $('the input parameter file')) .option('-s, --subscription ', $('the subscription identifier')) - .execute(function (expandExpression, filterExpression, resourceGroupName, selectExpression, virtualMachineScaleSetName, options, _) { - cli.output.info('expandExpression = ' + options.expandExpression); - cli.output.info('filterExpression = ' + options.filterExpression); - cli.output.info('resourceGroupName = ' + options.resourceGroupName); - cli.output.info('selectExpression = ' + options.selectExpression); - cli.output.info('virtualMachineScaleSetName = ' + options.virtualMachineScaleSetName); + .execute(function (parameters, options, _) { + cli.output.info('parameters = ' + options.parameters); + if (options.parameterFile) { + cli.output.info("Reading file content from: \"" + options.parameterFile + "\""); + var fileContent = fs.readFileSync(options.parameterFile, 'utf8'); + var parametersObj = JSON.parse(fileContent); + } + else { + var parametersObj = JSON.parse(options.parameters); + } + cli.output.info('parametersObj = ' + JSON.stringify(parametersObj)); var subscription = profile.current.getSubscription(options.subscription); var computeManagementClient = utils.createComputeResourceProviderClient(subscription); - var result = computeManagementClient.virtualMachineScaleSetVMs.list(options.expandExpression, options.filterExpression, options.resourceGroupName, options.selectExpression, options.virtualMachineScaleSetName, _); + var result = computeManagementClient.virtualMachineScaleSetVMs.list(parametersObj, _); cli.output.json(result); }); + var parameters = vmssvm.category('parameters') + .description($('Commands to manage parameter for your virtual machine scale set vm.')); + var generate = parameters.category('generate') + .description($('Commands to generate parameter file for your virtual machine scale set vm.')); + generate.command('list') + .description($('Generate vmssvm parameter string or files.')) + .usage('[options]') + .option('--parameter-file ', $('The parameter file path.')) + .execute(function (parameterFile, options, _) { + cli.output.info("{\"expandExpression\":\"\",\"filterExpression\":\"\",\"resourceGroupName\":\"\",\"selectExpression\":\"\",\"virtualMachineScaleSetName\":\"\"}"); + var filePath = "vmssvm_list.json"; + if (options.parameterFile) { filePath = options.parameterFile; }; + fs.writeFileSync(filePath, beautify("{\r\n\"expandExpression\":\"\",\r\n\"filterExpression\":\"\",\r\n\"resourceGroupName\":\"\",\r\n\"selectExpression\":\"\",\r\n\"virtualMachineScaleSetName\":\"\"\r\n}")); + cli.output.info("====================================="); + cli.output.info("Parameter file output to: " + filePath); + cli.output.info("====================================="); + }); + + parameters.command('patch') + .description($('Command to patch vmssvm parameter JSON file.')) + .usage('[options]') + .option('--parameter-file ', $('The parameter file path.')) + .option('--operation ', $('The JSON patch operation: add, remove, or replace.')) + .option('--path ', $('The JSON data path, e.g.: \"foo/1\".')) + .option('--value ', $('The JSON value.')) + .option('--parse', $('Parse the JSON value to object.')) + .execute(function (parameterFile, operation, path, value, parse, options, _) { + cli.output.info(options.parameterFile); + cli.output.info(options.operation); + cli.output.info(options.path); + cli.output.info(options.value); + cli.output.info(options.parse); + if (options.parse) { + options.value = JSON.parse(options.value); + } + cli.output.info(options.value); + cli.output.info("====================================="); + cli.output.info("Reading file content from: \"" + options.parameterFile + "\""); + cli.output.info("====================================="); + var fileContent = fs.readFileSync(options.parameterFile, 'utf8'); + var parametersObj = JSON.parse(fileContent); + cli.output.info("JSON object:"); + cli.output.info(JSON.stringify(parametersObj)); + if (options.operation == 'add') { + jsonpatch.apply(parametersObj, [{op: options.operation, path: options.path, value: options.value}]); + } + else if (options.operation == 'remove') { + jsonpatch.apply(parametersObj, [{op: options.operation, path: options.path}]); + } + else if (options.operation == 'replace') { + jsonpatch.apply(parametersObj, [{op: options.operation, path: options.path, value: options.value}]); + } + var updatedContent = JSON.stringify(parametersObj); + cli.output.info("====================================="); + cli.output.info("JSON object (updated):"); + cli.output.info(JSON.stringify(parametersObj)); + cli.output.info("====================================="); + fs.writeFileSync(options.parameterFile, beautify(updatedContent)); + cli.output.info("====================================="); + cli.output.info("Parameter file updated at: " + options.parameterFile); + cli.output.info("====================================="); + }); + + //parameters set virtual-machine-scale-set-vm-list-parameters + var parameters = vmssvm.category('parameters') + .description($('Commands to manage parameter for your virtual-machine-scale-set-vm.')); + var set = parameters.category('set') + .description($('Commands to set parameter file for your virtual-machine-scale-set-vm.')); + set.command('virtual-machine-scale-set-vm-list-parameters') + .description($('Set vmssvm parameter string or files.')) + .usage('[options]') + .option('--parameter-file ', $('The parameter file path.')) + .option('--value ', $('The JSON value.')) + .option('--parse', $('Parse the JSON value to object.')) + .option('--expand-expression ', $('Set the expand-expression value.')) + .option('--filter-expression ', $('Set the filter-expression value.')) + .option('--resource-group-name ', $('Set the resource-group-name value.')) + .option('--select-expression ', $('Set the select-expression value.')) + .option('--virtual-machine-scale-set-name ', $('Set the virtual-machine-scale-set-name value.')) + .execute(function ( parameterFile , options, _) { + cli.output.info(options); + cli.output.info(options.parameterFile); + cli.output.info(options.value); + cli.output.info(options.parse); + if (options.parse && options.value) { + options.value = JSON.parse(options.value); + } + cli.output.info(options.value); + cli.output.info("====================================="); + cli.output.info("Reading file content from: \"" + options.parameterFile + "\""); + cli.output.info("====================================="); + var fileContent = fs.readFileSync(options.parameterFile, 'utf8'); + var parametersObj = JSON.parse(fileContent); + cli.output.info("JSON object:"); + cli.output.info(JSON.stringify(parametersObj)); + options.operation = 'replace'; + options.path = ""; + var paramPath = options.path + "/" + "expandExpression"; + cli.output.info("================================================"); + cli.output.info("JSON Parameters Path:" + paramPath); + cli.output.info("================================================"); + if (options.expandExpression) { + if (options.parse && options.expandExpression) { + options.expandExpression = JSON.parse(options.expandExpression); + } + jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.expandExpression}]); + } + var paramPath = options.path + "/" + "filterExpression"; + cli.output.info("================================================"); + cli.output.info("JSON Parameters Path:" + paramPath); + cli.output.info("================================================"); + if (options.filterExpression) { + if (options.parse && options.filterExpression) { + options.filterExpression = JSON.parse(options.filterExpression); + } + jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.filterExpression}]); + } + var paramPath = options.path + "/" + "resourceGroupName"; + cli.output.info("================================================"); + cli.output.info("JSON Parameters Path:" + paramPath); + cli.output.info("================================================"); + if (options.resourceGroupName) { + if (options.parse && options.resourceGroupName) { + options.resourceGroupName = JSON.parse(options.resourceGroupName); + } + jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.resourceGroupName}]); + } + var paramPath = options.path + "/" + "selectExpression"; + cli.output.info("================================================"); + cli.output.info("JSON Parameters Path:" + paramPath); + cli.output.info("================================================"); + if (options.selectExpression) { + if (options.parse && options.selectExpression) { + options.selectExpression = JSON.parse(options.selectExpression); + } + jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.selectExpression}]); + } + var paramPath = options.path + "/" + "virtualMachineScaleSetName"; + cli.output.info("================================================"); + cli.output.info("JSON Parameters Path:" + paramPath); + cli.output.info("================================================"); + if (options.virtualMachineScaleSetName) { + if (options.parse && options.virtualMachineScaleSetName) { + options.virtualMachineScaleSetName = JSON.parse(options.virtualMachineScaleSetName); + } + jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.virtualMachineScaleSetName}]); + } + var updatedContent = JSON.stringify(parametersObj); + cli.output.info("====================================="); + cli.output.info("JSON object (updated):"); + cli.output.info(JSON.stringify(parametersObj)); + cli.output.info("====================================="); + fs.writeFileSync(options.parameterFile, beautify(updatedContent)); + cli.output.info("====================================="); + cli.output.info("Parameter file updated at: " + options.parameterFile); + cli.output.info("====================================="); + }); + + //parameters remove virtual-machine-scale-set-vm-list-parameters + var parameters = vmssvm.category('parameters') + .description($('Commands to remove parameter for your virtual-machine-scale-set-vm.')); + var remove = parameters.category('remove') + .description($('Commands to remove values in the parameter file for your virtual-machine-scale-set-vm.')); + remove.command('virtual-machine-scale-set-vm-list-parameters') + .description($('Remove vmssvm parameter string or files.')) + .usage('[options]') + .option('--parameter-file ', $('The parameter file path.')) + .execute(function ( parameterFile , options, _) { + cli.output.info(options); + cli.output.info(options.parameterFile); + cli.output.info("====================================="); + cli.output.info("Reading file content from: \"" + options.parameterFile + "\""); + cli.output.info("====================================="); + var fileContent = fs.readFileSync(options.parameterFile, 'utf8'); + var parametersObj = JSON.parse(fileContent); + cli.output.info("JSON object:"); + cli.output.info(JSON.stringify(parametersObj)); + options.operation = 'remove'; + options.path = ""; + jsonpatch.apply(parametersObj, [{op: options.operation, path: options.path}]); + var updatedContent = JSON.stringify(parametersObj); + cli.output.info("====================================="); + cli.output.info("JSON object (updated):"); + cli.output.info(JSON.stringify(parametersObj)); + cli.output.info("====================================="); + fs.writeFileSync(options.parameterFile, beautify(updatedContent)); + cli.output.info("====================================="); + cli.output.info("Parameter file updated at: " + options.parameterFile); + cli.output.info("====================================="); + }); + //parameters add virtual-machine-scale-set-vm-list-parameters + var parameters = vmssvm.category('parameters') + .description($('Commands to add parameter for your virtual-machine-scale-set-vm.')); + var add = parameters.category('add') + .description($('Commands to add values in the parameter file for your virtual-machine-scale-set-vm.')); + add.command('virtual-machine-scale-set-vm-list-parameters') + .description($('Remove vmssvm parameter string or files.')) + .usage('[options]') + .option('--parameter-file ', $('The parameter file path.')) + .option('--key ', $('The JSON key.')) + .option('--value ', $('The JSON value.')) + .option('--parse', $('Parse the JSON value to object.')) + .option('--expand-expression ', $('Add the expand-expression value.')) + .option('--filter-expression ', $('Add the filter-expression value.')) + .option('--resource-group-name ', $('Add the resource-group-name value.')) + .option('--select-expression ', $('Add the select-expression value.')) + .option('--virtual-machine-scale-set-name ', $('Add the virtual-machine-scale-set-name value.')) + .execute(function ( parameterFile , options, _) { + cli.output.info(options); + cli.output.info(options.parameterFile); + cli.output.info(options.key); + cli.output.info(options.value); + cli.output.info(options.parse); + if (options.parse && options.value) { + options.value = JSON.parse(options.value); + } + cli.output.info(options.value); + cli.output.info("====================================="); + cli.output.info("Reading file content from: \"" + options.parameterFile + "\""); + cli.output.info("====================================="); + var fileContent = fs.readFileSync(options.parameterFile, 'utf8'); + var parametersObj = JSON.parse(fileContent); + cli.output.info("JSON object:"); + cli.output.info(JSON.stringify(parametersObj)); + options.operation = 'add'; + options.path = "" + "/" + options.key; + cli.output.info("options.path = " + options.path); + jsonpatch.apply(parametersObj, [{op: options.operation, path: options.path, value: options.value}]); + var paramPath = "" + "/" + "expandExpression"; + cli.output.info("================================================"); + cli.output.info("JSON Parameters Path:" + paramPath); + cli.output.info("================================================"); + if (options.expandExpression) { + if (options.parse && options.expandExpression) { + options.expandExpression = JSON.parse(options.expandExpression); + } + jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.expandExpression}]); + } + var paramPath = "" + "/" + "filterExpression"; + cli.output.info("================================================"); + cli.output.info("JSON Parameters Path:" + paramPath); + cli.output.info("================================================"); + if (options.filterExpression) { + if (options.parse && options.filterExpression) { + options.filterExpression = JSON.parse(options.filterExpression); + } + jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.filterExpression}]); + } + var paramPath = "" + "/" + "resourceGroupName"; + cli.output.info("================================================"); + cli.output.info("JSON Parameters Path:" + paramPath); + cli.output.info("================================================"); + if (options.resourceGroupName) { + if (options.parse && options.resourceGroupName) { + options.resourceGroupName = JSON.parse(options.resourceGroupName); + } + jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.resourceGroupName}]); + } + var paramPath = "" + "/" + "selectExpression"; + cli.output.info("================================================"); + cli.output.info("JSON Parameters Path:" + paramPath); + cli.output.info("================================================"); + if (options.selectExpression) { + if (options.parse && options.selectExpression) { + options.selectExpression = JSON.parse(options.selectExpression); + } + jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.selectExpression}]); + } + var paramPath = "" + "/" + "virtualMachineScaleSetName"; + cli.output.info("================================================"); + cli.output.info("JSON Parameters Path:" + paramPath); + cli.output.info("================================================"); + if (options.virtualMachineScaleSetName) { + if (options.parse && options.virtualMachineScaleSetName) { + options.virtualMachineScaleSetName = JSON.parse(options.virtualMachineScaleSetName); + } + jsonpatch.apply(parametersObj, [{op: options.operation, path: paramPath, value: options.virtualMachineScaleSetName}]); + } + var updatedContent = JSON.stringify(parametersObj); + cli.output.info("====================================="); + cli.output.info("JSON object (updated):"); + cli.output.info(JSON.stringify(parametersObj)); + cli.output.info("====================================="); + fs.writeFileSync(options.parameterFile, beautify(updatedContent)); + cli.output.info("====================================="); + cli.output.info("Parameter file updated at: " + options.parameterFile); + cli.output.info("====================================="); + }); + + //virtualMachineScaleSetVM -> PowerOff var vmssvm = cli.category('vmssvm').description($('Commands to manage your virtual machine scale set vm.')); vmssvm.command('power-off') From c15aa7f5fbfb2a45174b74a0c436ec4d86f4861e Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Fri, 9 Oct 2015 17:28:18 -0700 Subject: [PATCH 4/5] Change Vmss back to VMSS except cmdlet noun --- .../VirtualMachineScaleSetCreateOrUpdateMethod.cs | 4 ++-- .../VirtualMachineScaleSetDeallocateInstancesMethod.cs | 4 ++-- .../VirtualMachineScaleSetDeallocateMethod.cs | 4 ++-- .../VirtualMachineScaleSetDeleteInstancesMethod.cs | 4 ++-- .../VirtualMachineScaleSetDeleteMethod.cs | 4 ++-- .../VirtualMachineScaleSetGetInstanceViewMethod.cs | 4 ++-- .../VirtualMachineScaleSetGetMethod.cs | 4 ++-- .../VirtualMachineScaleSetListAllMethod.cs | 6 +++--- .../VirtualMachineScaleSetListMethod.cs | 4 ++-- .../VirtualMachineScaleSetListNextMethod.cs | 4 ++-- .../VirtualMachineScaleSetListSkusMethod.cs | 4 ++-- .../VirtualMachineScaleSetPowerOffInstancesMethod.cs | 4 ++-- .../VirtualMachineScaleSetPowerOffMethod.cs | 4 ++-- .../VirtualMachineScaleSetRestartInstancesMethod.cs | 4 ++-- .../VirtualMachineScaleSetRestartMethod.cs | 4 ++-- .../VirtualMachineScaleSetStartInstancesMethod.cs | 4 ++-- .../VirtualMachineScaleSetStartMethod.cs | 4 ++-- .../VirtualMachineScaleSetUpdateInstancesMethod.cs | 4 ++-- .../VirtualMachineScaleSetVMDeallocateMethod.cs | 4 ++-- .../VirtualMachineScaleSetVMDeleteMethod.cs | 4 ++-- .../VirtualMachineScaleSetVMGetInstanceViewMethod.cs | 4 ++-- .../VirtualMachineScaleSetVMGetMethod.cs | 4 ++-- .../VirtualMachineScaleSetVMListMethod.cs | 4 ++-- .../VirtualMachineScaleSetVMPowerOffMethod.cs | 4 ++-- .../VirtualMachineScaleSetVMRestartMethod.cs | 4 ++-- .../VirtualMachineScaleSetVMStartMethod.cs | 4 ++-- .../Automation/RunCodeGeneration.ps1 | 9 ++++----- 27 files changed, 57 insertions(+), 58 deletions(-) diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetCreateOrUpdateMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetCreateOrUpdateMethod.cs index be644ce9a0fb..4ffff9813456 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetCreateOrUpdateMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetCreateOrUpdateMethod.cs @@ -98,9 +98,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetCreateOrUpdateParameters() } [Cmdlet("New", "AzureVmss", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class NewAzureVmss : InvokeAzureComputeMethodCmdlet + public partial class NewAzureVMSS : InvokeAzureComputeMethodCmdlet { - public NewAzureVmss() + public NewAzureVMSS() { this.MethodName = "VirtualMachineScaleSetCreateOrUpdate"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateInstancesMethod.cs index a30a3db52892..452248a95481 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateInstancesMethod.cs @@ -114,9 +114,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetDeallocateInstancesParameters } [Cmdlet("Stop", "AzureVmssInstancesWithDeallocation", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class StopAzureVmssInstancesWithDeallocation : InvokeAzureComputeMethodCmdlet + public partial class StopAzureVMSSInstancesWithDeallocation : InvokeAzureComputeMethodCmdlet { - public StopAzureVmssInstancesWithDeallocation() + public StopAzureVMSSInstancesWithDeallocation() { this.MethodName = "VirtualMachineScaleSetDeallocateInstances"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateMethod.cs index 25256751e16f..73e52344ba0e 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeallocateMethod.cs @@ -98,9 +98,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetDeallocateParameters() } [Cmdlet("Stop", "AzureVmssWithDeallocation", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class StopAzureVmssWithDeallocation : InvokeAzureComputeMethodCmdlet + public partial class StopAzureVMSSWithDeallocation : InvokeAzureComputeMethodCmdlet { - public StopAzureVmssWithDeallocation() + public StopAzureVMSSWithDeallocation() { this.MethodName = "VirtualMachineScaleSetDeallocate"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteInstancesMethod.cs index 87d5b3a28cda..abee8a2629c1 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteInstancesMethod.cs @@ -114,9 +114,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetDeleteInstancesParameters() } [Cmdlet("Remove", "AzureVmssInstances", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class RemoveAzureVmssInstances : InvokeAzureComputeMethodCmdlet + public partial class RemoveAzureVMSSInstances : InvokeAzureComputeMethodCmdlet { - public RemoveAzureVmssInstances() + public RemoveAzureVMSSInstances() { this.MethodName = "VirtualMachineScaleSetDeleteInstances"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteMethod.cs index 24dcdadebe0a..fc66e8859a77 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetDeleteMethod.cs @@ -98,9 +98,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetDeleteParameters() } [Cmdlet("Remove", "AzureVmss", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class RemoveAzureVmss : InvokeAzureComputeMethodCmdlet + public partial class RemoveAzureVMSS : InvokeAzureComputeMethodCmdlet { - public RemoveAzureVmss() + public RemoveAzureVMSS() { this.MethodName = "VirtualMachineScaleSetDelete"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetInstanceViewMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetInstanceViewMethod.cs index 76b72320a06a..4285c9c017db 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetInstanceViewMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetInstanceViewMethod.cs @@ -98,9 +98,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetGetInstanceViewParameters() } [Cmdlet("Get", "AzureVmssInstanceView", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class GetAzureVmssInstanceView : InvokeAzureComputeMethodCmdlet + public partial class GetAzureVMSSInstanceView : InvokeAzureComputeMethodCmdlet { - public GetAzureVmssInstanceView() + public GetAzureVMSSInstanceView() { this.MethodName = "VirtualMachineScaleSetGetInstanceView"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetMethod.cs index 6f7d8ebe9155..5805edfc1015 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetMethod.cs @@ -98,9 +98,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetGetParameters() } [Cmdlet("Get", "AzureVmss", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class GetAzureVmss : InvokeAzureComputeMethodCmdlet + public partial class GetAzureVMSS : InvokeAzureComputeMethodCmdlet { - public GetAzureVmss() + public GetAzureVMSS() { this.MethodName = "VirtualMachineScaleSetGet"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListAllMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListAllMethod.cs index ebbc7be8035c..9f840b22ac11 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListAllMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListAllMethod.cs @@ -63,14 +63,14 @@ public partial class NewAzureComputeArgumentListCmdlet : ComputeAutomationBaseCm { protected PSArgument[] CreateVirtualMachineScaleSetListAllParameters() { - return ConvertFromObjectsToArguments(new string[] {}, new object[] {}); + return ConvertFromObjectsToArguments(new string[0], new object[0]); } } [Cmdlet("Get", "AzureVmssAllList", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class GetAzureVmssAllList : InvokeAzureComputeMethodCmdlet + public partial class GetAzureVMSSAllList : InvokeAzureComputeMethodCmdlet { - public GetAzureVmssAllList() + public GetAzureVMSSAllList() { this.MethodName = "VirtualMachineScaleSetListAll"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListMethod.cs index a3599d0f2199..50cdfe2c85c8 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListMethod.cs @@ -84,9 +84,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetListParameters() } [Cmdlet("Get", "AzureVmssList", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class GetAzureVmssList : InvokeAzureComputeMethodCmdlet + public partial class GetAzureVMSSList : InvokeAzureComputeMethodCmdlet { - public GetAzureVmssList() + public GetAzureVMSSList() { this.MethodName = "VirtualMachineScaleSetList"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListNextMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListNextMethod.cs index 4f2ab86dc46b..232259f53500 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListNextMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListNextMethod.cs @@ -84,9 +84,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetListNextParameters() } [Cmdlet("Get", "AzureVmssNextList", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class GetAzureVmssNextList : InvokeAzureComputeMethodCmdlet + public partial class GetAzureVMSSNextList : InvokeAzureComputeMethodCmdlet { - public GetAzureVmssNextList() + public GetAzureVMSSNextList() { this.MethodName = "VirtualMachineScaleSetListNext"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListSkusMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListSkusMethod.cs index 1bf2990628b5..e2b9bffa05cc 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListSkusMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListSkusMethod.cs @@ -98,9 +98,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetListSkusParameters() } [Cmdlet("Get", "AzureVmssSkusList", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class GetAzureVmssSkusList : InvokeAzureComputeMethodCmdlet + public partial class GetAzureVMSSSkusList : InvokeAzureComputeMethodCmdlet { - public GetAzureVmssSkusList() + public GetAzureVMSSSkusList() { this.MethodName = "VirtualMachineScaleSetListSkus"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffInstancesMethod.cs index da02f14f22d9..d8e58b58717e 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffInstancesMethod.cs @@ -114,9 +114,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetPowerOffInstancesParameters() } [Cmdlet("Stop", "AzureVmssInstances", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class StopAzureVmssInstances : InvokeAzureComputeMethodCmdlet + public partial class StopAzureVMSSInstances : InvokeAzureComputeMethodCmdlet { - public StopAzureVmssInstances() + public StopAzureVMSSInstances() { this.MethodName = "VirtualMachineScaleSetPowerOffInstances"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffMethod.cs index 8f9054e6dd5a..19647871924f 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetPowerOffMethod.cs @@ -98,9 +98,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetPowerOffParameters() } [Cmdlet("Stop", "AzureVmss", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class StopAzureVmss : InvokeAzureComputeMethodCmdlet + public partial class StopAzureVMSS : InvokeAzureComputeMethodCmdlet { - public StopAzureVmss() + public StopAzureVMSS() { this.MethodName = "VirtualMachineScaleSetPowerOff"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartInstancesMethod.cs index 2442e4126cf0..83db07e0889d 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartInstancesMethod.cs @@ -114,9 +114,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetRestartInstancesParameters() } [Cmdlet("Restart", "AzureVmssInstances", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class RestartAzureVmssInstances : InvokeAzureComputeMethodCmdlet + public partial class RestartAzureVMSSInstances : InvokeAzureComputeMethodCmdlet { - public RestartAzureVmssInstances() + public RestartAzureVMSSInstances() { this.MethodName = "VirtualMachineScaleSetRestartInstances"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartMethod.cs index 96412eb52c9d..a7a318829b1b 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetRestartMethod.cs @@ -98,9 +98,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetRestartParameters() } [Cmdlet("Restart", "AzureVmss", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class RestartAzureVmss : InvokeAzureComputeMethodCmdlet + public partial class RestartAzureVMSS : InvokeAzureComputeMethodCmdlet { - public RestartAzureVmss() + public RestartAzureVMSS() { this.MethodName = "VirtualMachineScaleSetRestart"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartInstancesMethod.cs index b53c2c00682a..5381b7f60af5 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartInstancesMethod.cs @@ -114,9 +114,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetStartInstancesParameters() } [Cmdlet("Start", "AzureVmssInstances", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class StartAzureVmssInstances : InvokeAzureComputeMethodCmdlet + public partial class StartAzureVMSSInstances : InvokeAzureComputeMethodCmdlet { - public StartAzureVmssInstances() + public StartAzureVMSSInstances() { this.MethodName = "VirtualMachineScaleSetStartInstances"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartMethod.cs index 2e54d333a232..04d7680a5ac0 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetStartMethod.cs @@ -98,9 +98,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetStartParameters() } [Cmdlet("Start", "AzureVmss", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class StartAzureVmss : InvokeAzureComputeMethodCmdlet + public partial class StartAzureVMSS : InvokeAzureComputeMethodCmdlet { - public StartAzureVmss() + public StartAzureVMSS() { this.MethodName = "VirtualMachineScaleSetStart"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateInstancesMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateInstancesMethod.cs index 1a037ecd2277..661598f52e8a 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateInstancesMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateInstancesMethod.cs @@ -114,9 +114,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetUpdateInstancesParameters() } [Cmdlet("Update", "AzureVmssInstances", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class UpdateAzureVmssInstances : InvokeAzureComputeMethodCmdlet + public partial class UpdateAzureVMSSInstances : InvokeAzureComputeMethodCmdlet { - public UpdateAzureVmssInstances() + public UpdateAzureVMSSInstances() { this.MethodName = "VirtualMachineScaleSetUpdateInstances"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMDeallocateMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMDeallocateMethod.cs index 88f2fdf7b13f..830794fc8b32 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMDeallocateMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMDeallocateMethod.cs @@ -112,9 +112,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMDeallocateParameters() } [Cmdlet("Stop", "AzureVmssVMWithDeallocation", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class StopAzureVmssVMWithDeallocation : InvokeAzureComputeMethodCmdlet + public partial class StopAzureVMSSVMWithDeallocation : InvokeAzureComputeMethodCmdlet { - public StopAzureVmssVMWithDeallocation() + public StopAzureVMSSVMWithDeallocation() { this.MethodName = "VirtualMachineScaleSetVMDeallocate"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMDeleteMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMDeleteMethod.cs index 3cea5c531470..391db9734f2a 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMDeleteMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMDeleteMethod.cs @@ -112,9 +112,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMDeleteParameters() } [Cmdlet("Remove", "AzureVmssVM", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class RemoveAzureVmssVM : InvokeAzureComputeMethodCmdlet + public partial class RemoveAzureVMSSVM : InvokeAzureComputeMethodCmdlet { - public RemoveAzureVmssVM() + public RemoveAzureVMSSVM() { this.MethodName = "VirtualMachineScaleSetVMDelete"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetInstanceViewMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetInstanceViewMethod.cs index bafb5d198ec4..6798265e3fd9 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetInstanceViewMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetInstanceViewMethod.cs @@ -112,9 +112,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMGetInstanceViewParameters() } [Cmdlet("Get", "AzureVmssVMInstanceView", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class GetAzureVmssVMInstanceView : InvokeAzureComputeMethodCmdlet + public partial class GetAzureVMSSVMInstanceView : InvokeAzureComputeMethodCmdlet { - public GetAzureVmssVMInstanceView() + public GetAzureVMSSVMInstanceView() { this.MethodName = "VirtualMachineScaleSetVMGetInstanceView"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetMethod.cs index b2f37a69d723..2f6d3946ccc1 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetMethod.cs @@ -112,9 +112,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMGetParameters() } [Cmdlet("Get", "AzureVmssVM", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class GetAzureVmssVM : InvokeAzureComputeMethodCmdlet + public partial class GetAzureVMSSVM : InvokeAzureComputeMethodCmdlet { - public GetAzureVmssVM() + public GetAzureVMSSVM() { this.MethodName = "VirtualMachineScaleSetVMGet"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMListMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMListMethod.cs index 3b4ed740bad9..ab433234a4b5 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMListMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMListMethod.cs @@ -146,9 +146,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMListParameters() } [Cmdlet("Get", "AzureVmssVMList", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class GetAzureVmssVMList : InvokeAzureComputeMethodCmdlet + public partial class GetAzureVMSSVMList : InvokeAzureComputeMethodCmdlet { - public GetAzureVmssVMList() + public GetAzureVMSSVMList() { this.MethodName = "VirtualMachineScaleSetVMList"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMPowerOffMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMPowerOffMethod.cs index 78a9a28249ba..98bd54eef76d 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMPowerOffMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMPowerOffMethod.cs @@ -112,9 +112,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMPowerOffParameters() } [Cmdlet("Stop", "AzureVmssVM", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class StopAzureVmssVM : InvokeAzureComputeMethodCmdlet + public partial class StopAzureVMSSVM : InvokeAzureComputeMethodCmdlet { - public StopAzureVmssVM() + public StopAzureVMSSVM() { this.MethodName = "VirtualMachineScaleSetVMPowerOff"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMRestartMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMRestartMethod.cs index d29d5d0bb8be..091b3d41d2b8 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMRestartMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMRestartMethod.cs @@ -112,9 +112,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMRestartParameters() } [Cmdlet("Restart", "AzureVmssVM", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class RestartAzureVmssVM : InvokeAzureComputeMethodCmdlet + public partial class RestartAzureVMSSVM : InvokeAzureComputeMethodCmdlet { - public RestartAzureVmssVM() + public RestartAzureVMSSVM() { this.MethodName = "VirtualMachineScaleSetVMRestart"; } diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMStartMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMStartMethod.cs index dec9d753ec59..159410bc0424 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMStartMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMStartMethod.cs @@ -112,9 +112,9 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMStartParameters() } [Cmdlet("Start", "AzureVmssVM", DefaultParameterSetName = "InvokeByDynamicParameters")] - public partial class StartAzureVmssVM : InvokeAzureComputeMethodCmdlet + public partial class StartAzureVMSSVM : InvokeAzureComputeMethodCmdlet { - public StartAzureVmssVM() + public StartAzureVMSSVM() { this.MethodName = "VirtualMachineScaleSetVMStart"; } diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1 b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1 index 8ddf7e60a958..48ee1e669ec4 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1 +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1 @@ -86,7 +86,8 @@ $common_verb_mapping = $common_noun_mapping = @{ -"VirtualMachineScaleSet" = "Vmss"; +"VirtualMachine" = "VM"; +"ScaleSet" = "SS"; }; $all_return_type_names = @(); @@ -1526,9 +1527,6 @@ function Write-OperationCmdletFile $param_type_full_name = Get-NormalizedTypeName -inputName $param_type_full_name; - Write-Verbose("paramTypeFullName: "+ $param_type_full_name); - Write-Verbose("paramName: "+ $param_name); - if ($expose_param_name -like '*Parameters') { $expose_param_name = $invoke_param_set_name + $expose_param_name; @@ -1648,7 +1646,7 @@ ${create_local_param_code_content} @" protected PSArgument[] Create${invoke_param_set_name}Parameters() { - return ConvertFromObjectsToArguments(new string[] {}, new object[] {}); + return ConvertFromObjectsToArguments(new string[0], new object[0]); } "@; } @@ -1684,6 +1682,7 @@ $parameter_cmdlt_source_template if ($cmdletFlavor -eq 'Verb') { # If the Cmdlet Flavor is 'Verb', generate the Verb-based cmdlet code + $mapped_noun_str = $mapped_noun_str.Replace("VMSS", "Vmss"); $cmdlet_partial_class_code += @" From ad1eaf59672e323cbd1a1f3f0cb3100959014bc8 Mon Sep 17 00:00:00 2001 From: Hyonho Lee Date: Fri, 9 Oct 2015 17:40:32 -0700 Subject: [PATCH 5/5] Add build target that only generates powershell code --- .../Commands.ServiceManagement.Preview.csproj | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj index 07bd3b853480..68c594afb1ef 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj @@ -372,4 +372,19 @@ + + + %WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe + ".\Automation\RunCodeGeneration.ps1" + $(OutputPath) + "Microsoft.Azure.Commands.Compute.ComputeClientBaseCmdlet" + "ComputeClient.ComputeManagementClient" + "Microsoft.Azure.Management.Compute" + ..\..\..\ResourceManager\Compute\Commands.Compute + Verb + None + "VirtualMachineScaleSet","VirtualMachineScaleSetVM" + + + \ No newline at end of file