Skip to content

Vmss #142

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 2 commits into from
Feb 23, 2016
Merged

Vmss #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f45df3
Combine Next-Page Functions
huangpf Feb 23, 2016
34596c6
Remove *Next Commands
huangpf Feb 23, 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
6 changes: 1 addition & 5 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 @@ -29,16 +29,12 @@ 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-AzureRmVmssAllNextList 1.2.3 AzureRM.Compute
Get-AzureRmVmssInstanceView 1.2.3 AzureRM.Compute
Get-AzureRmVmssList 1.2.3 AzureRM.Compute
Get-AzureRmVmssNextList 1.2.3 AzureRM.Compute
Get-AzureRmVmssSkusList 1.2.3 AzureRM.Compute
Get-AzureRmVmssSkusNextList 1.2.3 AzureRM.Compute
Get-AzureRmVmssVM 1.2.3 AzureRM.Compute
Get-AzureRmVmssVMInstanceView 1.2.3 AzureRM.Compute
Get-AzureRmVmssVMList 1.2.3 AzureRM.Compute
Get-AzureRmVmssVMNextList 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 @@ -182,7 +178,7 @@ function Test-VirtualMachineScaleSet
}

# List Next (negative test)
Assert-ThrowsContains { Get-AzureRmVmssNextList -NextPageLink test.com } "Invalid URI: The format of the URI could not be determined.";
# Assert-ThrowsContains { Get-AzureRmVmssNextList -NextPageLink test.com } "Invalid URI: The format of the URI could not be determined.";

# Stop/Start/Restart Operation
for ($i = 0; $i -lt 2; $i++)
Expand Down
13 changes: 12 additions & 1 deletion .../Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListAllMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,18 @@ protected void ExecuteVirtualMachineScaleSetListAllMethod(object[] invokeMethodI
{

var result = VirtualMachineScaleSetsClient.ListAll();
WriteObject(result);
var resultList = result.ToList();
var nextPageLink = result.NextPageLink;
while (!string.IsNullOrEmpty(nextPageLink))
{
var pageResult = VirtualMachineScaleSetsClient.ListAllNext(nextPageLink);
foreach (var pageItem in pageResult)
{
resultList.Add(pageItem);
}
nextPageLink = pageResult.NextPageLink;
}
WriteObject(resultList, true);
}
}

Expand Down
46 changes: 0 additions & 46 deletions ...mands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListAllNextMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,50 +82,4 @@ protected PSArgument[] CreateVirtualMachineScaleSetListAllNextParameters()
new object[] { nextPageLink });
}
}

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

public override string MethodName { get; set; }

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

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

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: 12 additions & 1 deletion ...ute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,18 @@ protected void ExecuteVirtualMachineScaleSetListMethod(object[] invokeMethodInpu
string resourceGroupName = (string)ParseParameter(invokeMethodInputParameters[0]);

var result = VirtualMachineScaleSetsClient.List(resourceGroupName);
WriteObject(result);
var resultList = result.ToList();
var nextPageLink = result.NextPageLink;
while (!string.IsNullOrEmpty(nextPageLink))
{
var pageResult = VirtualMachineScaleSetsClient.ListNext(nextPageLink);
foreach (var pageItem in pageResult)
{
resultList.Add(pageItem);
}
nextPageLink = pageResult.NextPageLink;
}
WriteObject(resultList, true);
}
}

Expand Down
46 changes: 0 additions & 46 deletions ...Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListNextMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,50 +82,4 @@ protected PSArgument[] CreateVirtualMachineScaleSetListNextParameters()
new object[] { nextPageLink });
}
}

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

public override string MethodName { get; set; }

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

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

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: 12 additions & 1 deletion ...Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListSkusMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,18 @@ protected void ExecuteVirtualMachineScaleSetListSkusMethod(object[] invokeMethod
string vmScaleSetName = (string)ParseParameter(invokeMethodInputParameters[1]);

var result = VirtualMachineScaleSetsClient.ListSkus(resourceGroupName, vmScaleSetName);
WriteObject(result);
var resultList = result.ToList();
var nextPageLink = result.NextPageLink;
while (!string.IsNullOrEmpty(nextPageLink))
{
var pageResult = VirtualMachineScaleSetsClient.ListSkusNext(nextPageLink);
foreach (var pageItem in pageResult)
{
resultList.Add(pageItem);
}
nextPageLink = pageResult.NextPageLink;
}
WriteObject(resultList, true);
}
}

Expand Down
46 changes: 0 additions & 46 deletions ...ands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetListSkusNextMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,50 +82,4 @@ protected PSArgument[] CreateVirtualMachineScaleSetListSkusNextParameters()
new object[] { nextPageLink });
}
}

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

public override string MethodName { get; set; }

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

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

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: 12 additions & 1 deletion ...Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMListMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,18 @@ protected void ExecuteVirtualMachineScaleSetVMListMethod(object[] invokeMethodIn
string select = (string)ParseParameter(invokeMethodInputParameters[3]);

var result = VirtualMachineScaleSetVMsClient.List(resourceGroupName, virtualMachineScaleSetName, odataQuery, select);
WriteObject(result);
var resultList = result.ToList();
var nextPageLink = result.NextPageLink;
while (!string.IsNullOrEmpty(nextPageLink))
{
var pageResult = VirtualMachineScaleSetVMsClient.ListNext(nextPageLink);
foreach (var pageItem in pageResult)
{
resultList.Add(pageItem);
}
nextPageLink = pageResult.NextPageLink;
}
WriteObject(resultList, true);
}
}

Expand Down
46 changes: 0 additions & 46 deletions ...ands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMListNextMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,50 +82,4 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMListNextParameters()
new object[] { nextPageLink });
}
}

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

public override string MethodName { get; set; }

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

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

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;
}
}
}
33 changes: 31 additions & 2 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 @@ -28,7 +28,13 @@ param
[string]$FileOutputFolder,

[Parameter(Mandatory = $false)]
[System.Reflection.MethodInfo]$FriendMethodInfo = $null
[string]$FunctionCmdletFlavor = 'None',

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

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

. "$PSScriptRoot\Import-StringFunction.ps1";
Expand Down Expand Up @@ -115,7 +121,7 @@ function Generate-PsFunctionCommandImpl
$code += $NEW_LINE;
$code += $part2;

if ($cmdletFlavor -eq 'Verb' -and (-not ($methodName -eq 'PowerOff')))
if ($FunctionCmdletFlavor -eq 'Verb')
{
# If the Cmdlet Flavor is 'Verb', generate the Verb-based cmdlet code
$part3 = Get-VerbNounCmdletCode -ComponentName $componentName -OperationName $OperationName -MethodInfo $MethodInfo;
Expand Down Expand Up @@ -394,6 +400,29 @@ $dynamic_param_assignment_code
${invoke_local_param_code_content}
${OperationName}Client.${methodName}(${invoke_params_join_str});
}
"@;
}
elseif ($PageMethodInfo -ne $null)
{
$invoke_cmdlt_source_template =
@"
protected void Execute${invoke_param_set_name}Method(object[] ${invoke_input_params_name})
{
${invoke_local_param_code_content}
var result = ${OperationName}Client.${methodName}(${invoke_params_join_str});
var resultList = result.ToList();
var nextPageLink = result.NextPageLink;
while (!string.IsNullOrEmpty(nextPageLink))
{
var pageResult = ${OperationName}Client.${methodName}Next(nextPageLink);
foreach (var pageItem in pageResult)
{
resultList.Add(pageItem);
}
nextPageLink = pageResult.NextPageLink;
}
WriteObject(resultList, true);
}
"@;
}
else
Expand Down
2 changes: 2 additions & 0 deletions ...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,6 +79,8 @@ $component_name = $client_library_namespace.Substring($client_library_namespace.

$all_return_type_names = @();

$SKIP_METHOD_NAME_LIST = @('PowerOff', 'ListNext', 'ListAllNext', 'ListSkusNext');

Write-Verbose $BAR_LINE;
Write-Verbose "Input Parameters:";
Write-Verbose "DLL Folder = $dllFolder";
Expand Down
Loading