Skip to content

Vmss #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 24, 2016
Merged

Vmss #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e068527
Update Function
huangpf Feb 23, 2016
971bae8
Merge branch 'vmss' of https://github.com/huangpf/azure-powershell in…
huangpf Feb 23, 2016
c823b7a
Combine ListAll Methods
huangpf Feb 23, 2016
3eb74b9
Update
huangpf Feb 24, 2016
090768d
Update
huangpf Feb 24, 2016
5490a91
Combine Get Methods
huangpf Feb 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions ...sourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,8 @@ Add-AzureRmVmssNetworkInterfaceConfiguration 1.2.3 AzureRM.Compute
Add-AzureRmVmssPublicKey 1.2.3 AzureRM.Compute
Add-AzureRmVmssSecret 1.2.3 AzureRM.Compute
Get-AzureRmVmss 1.2.3 AzureRM.Compute
Get-AzureRmVmssAllList 1.2.3 AzureRM.Compute
Get-AzureRmVmssList 1.2.3 AzureRM.Compute
Get-AzureRmVmssSkusList 1.2.3 AzureRM.Compute
Get-AzureRmVmssVM 1.2.3 AzureRM.Compute
Get-AzureRmVmssVMList 1.2.3 AzureRM.Compute
New-AzureRmVmss 1.2.3 AzureRM.Compute
New-AzureRmVmssConfig 1.2.3 AzureRM.Compute
New-AzureRmVmssIpConfigurationConfig 1.2.3 AzureRM.Compute
Expand Down Expand Up @@ -124,15 +121,15 @@ function Test-VirtualMachineScaleSet

$argList = New-AzureComputeArgumentList -MethodName VirtualMachineScaleSetsListAll;
$args = ($argList | select -ExpandProperty Value);
$vmssList = Get-AzureRmVmssAllList;
$vmssList = Get-AzureRmVmss;
Assert-True { ($vmssList | select -ExpandProperty Name) -contains $vmssName };
$output = $vmssList | Out-String;
Write-Verbose ($output);
Assert-True { $output.Contains("VirtualMachineProfile") };

# List from RG
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmssList');
$vmssList = Get-AzureRmVmssList -ResourceGroupName $rgname;
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmss List');
$vmssList = Get-AzureRmVmss -ResourceGroupName $rgname;
Assert-True { ($vmssList | select -ExpandProperty Name) -contains $vmssName };
$output = $vmssList | Out-String;
Write-Verbose ($output);
Expand All @@ -146,13 +143,13 @@ function Test-VirtualMachineScaleSet
Assert-True { $output.Contains("Sku") };

# List All VMs
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmssVMList');
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmssVM List');

$argList = New-AzureComputeArgumentList -MethodName VirtualMachineScaleSetVMsList;
$argList[0].Value = $rgname;
$argList[1].Value = $vmssName;
$args = ($argList | select -ExpandProperty Value);
$vmListResult = Get-AzureRmVmssVMList -ResourceGroupName $rgname -VirtualMachineScaleSetName $vmssName -Select $null;
$vmListResult = Get-AzureRmVmssVM -ResourceGroupName $rgname -VMScaleSetName $vmssName; # -Select $null;
$output = $vmListResult | Out-String;
Write-Verbose ($output);
Assert-True { $output.Contains("StorageProfile") };
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Compute/Commands.Compute/Generated/InvokeAzureComputeMethodCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ protected override void ProcessRecord()
base.ProcessRecord();
ExecuteClientAction(() =>
{
if (ParameterSetName == "InvokeByDynamicParameters" || ParameterSetName == "InvokeByDynamicParametersForFriendMethod")
if (ParameterSetName.StartsWith("InvokeByDynamicParameters"))
{
argumentList = ConvertDynamicParameters(dynamicParameters);
}
Expand Down
18 changes: 16 additions & 2 deletions ...pute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,23 @@ protected void ExecuteVirtualMachineScaleSetGetMethod(object[] invokeMethodInput
string resourceGroupName = (string)ParseParameter(invokeMethodInputParameters[0]);
string vmScaleSetName = (string)ParseParameter(invokeMethodInputParameters[1]);

var result = VirtualMachineScaleSetsClient.Get(resourceGroupName, vmScaleSetName);
WriteObject(result);
if (!string.IsNullOrEmpty(resourceGroupName) && !string.IsNullOrEmpty(vmScaleSetName))
{
var result = VirtualMachineScaleSetsClient.Get(resourceGroupName, vmScaleSetName);
WriteObject(result);
}
else if (!string.IsNullOrEmpty(resourceGroupName))
{
var result = VirtualMachineScaleSetsClient.List(resourceGroupName);
WriteObject(result);
}
else
{
var result = VirtualMachineScaleSetsClient.ListAll();
WriteObject(result);
}
}

}

public partial class NewAzureComputeArgumentListCmdlet : ComputeAutomationBaseCmdlet
Expand Down
34 changes: 0 additions & 34 deletions .../Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListAllMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,38 +76,4 @@ protected PSArgument[] CreateVirtualMachineScaleSetListAllParameters()
return ConvertFromObjectsToArguments(new string[0], new object[0]);
}
}

[Cmdlet("Get", "AzureRmVmssAllList", DefaultParameterSetName = "InvokeByDynamicParameters")]
public partial class GetAzureRmVMSSAllList : InvokeAzureComputeMethodCmdlet
{
public GetAzureRmVMSSAllList()
{
}

public override string MethodName { get; set; }

protected override void ProcessRecord()
{
this.MethodName = "VirtualMachineScaleSetListAll";
base.ProcessRecord();
}

public override object GetDynamicParameters()
{
dynamicParameters = new RuntimeDefinedParameterDictionary();
var pArgumentList = new RuntimeDefinedParameter();
pArgumentList.Name = "ArgumentList";
pArgumentList.ParameterType = typeof(object[]);
pArgumentList.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByStaticParameters",
Position = 1,
Mandatory = true
});
pArgumentList.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("ArgumentList", pArgumentList);

return dynamicParameters;
}
}
}
46 changes: 0 additions & 46 deletions ...ute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,50 +93,4 @@ protected PSArgument[] CreateVirtualMachineScaleSetListParameters()
new object[] { resourceGroupName });
}
}

[Cmdlet("Get", "AzureRmVmssList", DefaultParameterSetName = "InvokeByDynamicParameters")]
public partial class GetAzureRmVMSSList : InvokeAzureComputeMethodCmdlet
{
public GetAzureRmVMSSList()
{
}

public override string MethodName { get; set; }

protected override void ProcessRecord()
{
this.MethodName = "VirtualMachineScaleSetList";
base.ProcessRecord();
}

public override object GetDynamicParameters()
{
dynamicParameters = new RuntimeDefinedParameterDictionary();
var pResourceGroupName = new RuntimeDefinedParameter();
pResourceGroupName.Name = "ResourceGroupName";
pResourceGroupName.ParameterType = typeof(string);
pResourceGroupName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Position = 1,
Mandatory = false
});
pResourceGroupName.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("ResourceGroupName", pResourceGroupName);

var pArgumentList = new RuntimeDefinedParameter();
pArgumentList.Name = "ArgumentList";
pArgumentList.ParameterType = typeof(object[]);
pArgumentList.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByStaticParameters",
Position = 2,
Mandatory = true
});
pArgumentList.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("ArgumentList", pArgumentList);

return dynamicParameters;
}
}
}
13 changes: 11 additions & 2 deletions .../Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,18 @@ protected void ExecuteVirtualMachineScaleSetVMGetMethod(object[] invokeMethodInp
string vmScaleSetName = (string)ParseParameter(invokeMethodInputParameters[1]);
string instanceId = (string)ParseParameter(invokeMethodInputParameters[2]);

var result = VirtualMachineScaleSetVMsClient.Get(resourceGroupName, vmScaleSetName, instanceId);
WriteObject(result);
if (!string.IsNullOrEmpty(resourceGroupName) && !string.IsNullOrEmpty(vmScaleSetName) && !string.IsNullOrEmpty(instanceId))
{
var result = VirtualMachineScaleSetVMsClient.Get(resourceGroupName, vmScaleSetName, instanceId);
WriteObject(result);
}
else if (!string.IsNullOrEmpty(resourceGroupName) && !string.IsNullOrEmpty(vmScaleSetName))
{
var result = VirtualMachineScaleSetVMsClient.List(resourceGroupName, vmScaleSetName);
WriteObject(result);
}
}

}

public partial class NewAzureComputeArgumentListCmdlet : ComputeAutomationBaseCmdlet
Expand Down
70 changes: 0 additions & 70 deletions ...Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMListMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,74 +123,4 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMListParameters()
new object[] { resourceGroupName, virtualMachineScaleSetName, odataQuery, select });
}
}

[Cmdlet("Get", "AzureRmVmssVMList", DefaultParameterSetName = "InvokeByDynamicParameters")]
public partial class GetAzureRmVMSSVMList : InvokeAzureComputeMethodCmdlet
{
public GetAzureRmVMSSVMList()
{
}

public override string MethodName { get; set; }

protected override void ProcessRecord()
{
this.MethodName = "VirtualMachineScaleSetVMList";
base.ProcessRecord();
}

public override object GetDynamicParameters()
{
dynamicParameters = new RuntimeDefinedParameterDictionary();
var pResourceGroupName = new RuntimeDefinedParameter();
pResourceGroupName.Name = "ResourceGroupName";
pResourceGroupName.ParameterType = typeof(string);
pResourceGroupName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Position = 1,
Mandatory = false
});
pResourceGroupName.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("ResourceGroupName", pResourceGroupName);

var pVirtualMachineScaleSetName = new RuntimeDefinedParameter();
pVirtualMachineScaleSetName.Name = "VirtualMachineScaleSetName";
pVirtualMachineScaleSetName.ParameterType = typeof(string);
pVirtualMachineScaleSetName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Position = 2,
Mandatory = false
});
pVirtualMachineScaleSetName.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("VirtualMachineScaleSetName", pVirtualMachineScaleSetName);

var pSelect = new RuntimeDefinedParameter();
pSelect.Name = "Select";
pSelect.ParameterType = typeof(string);
pSelect.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Position = 3,
Mandatory = false
});
pSelect.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("Select", pSelect);

var pArgumentList = new RuntimeDefinedParameter();
pArgumentList.Name = "ArgumentList";
pArgumentList.ParameterType = typeof(object[]);
pArgumentList.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByStaticParameters",
Position = 4,
Mandatory = true
});
pArgumentList.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("ArgumentList", pArgumentList);

return dynamicParameters;
}
}
}
71 changes: 67 additions & 4 deletions ...gement/Compute/Commands.ServiceManagement.Preview/Automation/Generate-FunctionCommand.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,13 @@ param
[System.Reflection.MethodInfo]$FriendMethodInfo = $null,

[Parameter(Mandatory = $false)]
[System.Reflection.MethodInfo]$PageMethodInfo = $null
[System.Reflection.MethodInfo]$PageMethodInfo = $null,

[Parameter(Mandatory = $false)]
[bool]$CombineGetAndList = $false,

[Parameter(Mandatory = $false)]
[bool]$CombineGetAndListAll = $false
)

. "$PSScriptRoot\Import-StringFunction.ps1";
Expand Down Expand Up @@ -167,8 +173,8 @@ function Get-InvokeMethodCmdletCode

# 2. Iterate through Param List
$methodParamList = $MethodInfo.GetParameters();
$paramNameList = @();
$paramLocalNameList = @();
[System.Collections.ArrayList]$paramNameList = @();
[System.Collections.ArrayList]$paramLocalNameList = @();
[System.Collections.ArrayList]$pruned_params = @();
foreach ($methodParam in $methodParamList)
{
Expand All @@ -195,7 +201,7 @@ function Get-InvokeMethodCmdletCode
}
}

$invoke_params_join_str = [string]::Join(', ', $paramLocalNameList);
$invoke_params_join_str = [string]::Join(', ', $paramLocalNameList.ToArray());

# 2.1 Dynamic Parameter Assignment
$dynamic_param_assignment_code_lines = @();
Expand Down Expand Up @@ -425,6 +431,63 @@ ${invoke_local_param_code_content}
}
"@;
}
elseif ($methodName -eq 'Get' -and $ModelClassNameSpace -like "*.Azure.Management.*Model*")
{
# Only for ARM Cmdlets
[System.Collections.ArrayList]$paramLocalNameList2 = @();
for ($i2 = 0; $i2 -lt $paramLocalNameList.Count - 1; $i2++)
{
$item2 = $paramLocalNameList[$i2];
$paramLocalNameList2 += $item2;
}
$invoke_cmdlt_source_template = " protected void Execute${invoke_param_set_name}Method(object[] ${invoke_input_params_name})" + $NEW_LINE;
$invoke_cmdlt_source_template += " {" + $NEW_LINE;
$invoke_cmdlt_source_template += "${invoke_local_param_code_content}" + $NEW_LINE;
$invoke_cmdlt_source_template += " if ("
for ($i2 = 0; $i2 -lt $paramLocalNameList.Count; $i2++)
{
if ($i2 -gt 0)
{
$invoke_cmdlt_source_template += " && ";
}
$invoke_cmdlt_source_template += "!string.IsNullOrEmpty(" + $paramLocalNameList[$i2] + ")"
}
$invoke_cmdlt_source_template += ")" + $NEW_LINE;
$invoke_cmdlt_source_template += " {" + $NEW_LINE;
$invoke_cmdlt_source_template += " var result = ${OperationName}Client.${methodName}(${invoke_params_join_str});" + $NEW_LINE;
$invoke_cmdlt_source_template += " WriteObject(result);" + $NEW_LINE;
$invoke_cmdlt_source_template += " }" + $NEW_LINE;

if ($CombineGetAndList)
{
$invoke_params_join_str_for_list = [string]::Join(', ', $paramLocalNameList2.ToArray());
$invoke_cmdlt_source_template += " else if ("
for ($i2 = 0; $i2 -lt $paramLocalNameList2.Count; $i2++)
{
if ($i2 -gt 0)
{
$invoke_cmdlt_source_template += " && ";
}
$invoke_cmdlt_source_template += "!string.IsNullOrEmpty(" + $paramLocalNameList2[$i2] + ")"
}
$invoke_cmdlt_source_template += ")" + $NEW_LINE;
$invoke_cmdlt_source_template += " {" + $NEW_LINE;
$invoke_cmdlt_source_template += " var result = ${OperationName}Client.List(${invoke_params_join_str_for_list});" + $NEW_LINE;
$invoke_cmdlt_source_template += " WriteObject(result);" + $NEW_LINE;
$invoke_cmdlt_source_template += " }" + $NEW_LINE;
}

if ($CombineGetAndListAll)
{
$invoke_cmdlt_source_template += " else" + $NEW_LINE;
$invoke_cmdlt_source_template += " {" + $NEW_LINE;
$invoke_cmdlt_source_template += " var result = ${OperationName}Client.ListAll();" + $NEW_LINE;
$invoke_cmdlt_source_template += " WriteObject(result);" + $NEW_LINE;
$invoke_cmdlt_source_template += " }" + $NEW_LINE;
}

$invoke_cmdlt_source_template += " }" + $NEW_LINE;
}
else
{
$invoke_cmdlt_source_template =
Expand Down
2 changes: 1 addition & 1 deletion ...nagement/Compute/Commands.ServiceManagement.Preview/Automation/Import-CommonVariables.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ $component_name = $client_library_namespace.Substring($client_library_namespace.

$all_return_type_names = @();

$SKIP_VERB_NOUN_CMDLET_LIST = @('PowerOff', 'ListNext', 'ListAllNext', 'ListSkusNext', 'GetInstanceView');
$SKIP_VERB_NOUN_CMDLET_LIST = @('PowerOff', 'ListNext', 'ListAllNext', 'ListSkusNext', 'GetInstanceView', 'List', 'ListAll');

Write-Verbose $BAR_LINE;
Write-Verbose "Input Parameters:";
Expand Down
Loading