Skip to content

Combine InstanceView Methods #143

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 1 commit into from
Feb 23, 2016
Merged

Combine InstanceView Methods #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 4 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,11 +29,9 @@ 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-AzureRmVmssInstanceView 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-AzureRmVmssVMInstanceView 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
Expand Down Expand Up @@ -169,8 +167,8 @@ function Test-VirtualMachineScaleSet
Write-Verbose ($output);
Assert-True { $output.Contains("StorageProfile") };

Write-Verbose ('Running Command : ' + 'Get-AzureRmVmssVMInstanceView');
$vmInstance = Get-AzureRmVmssVMInstanceView -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $i;
Write-Verbose ('Running Command : ' + 'Get-AzureRmVmssVM -InstanceView');
$vmInstance = Get-AzureRmVmssVM -InstanceView -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $i;
Assert-NotNull $vmInstance;
$output = $vmInstance | Out-String;
Write-Verbose($output);
Expand Down
58 changes: 0 additions & 58 deletions ...s.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetInstanceViewMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,62 +96,4 @@ protected PSArgument[] CreateVirtualMachineScaleSetGetInstanceViewParameters()
new object[] { resourceGroupName, vmScaleSetName });
}
}

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

public override string MethodName { get; set; }

protected override void ProcessRecord()
{
this.MethodName = "VirtualMachineScaleSetGetInstanceView";
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 pVMScaleSetName = new RuntimeDefinedParameter();
pVMScaleSetName.Name = "VMScaleSetName";
pVMScaleSetName.ParameterType = typeof(string);
pVMScaleSetName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Position = 2,
Mandatory = false
});
pVMScaleSetName.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("VMScaleSetName", pVMScaleSetName);

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

return dynamicParameters;
}
}
}
45 changes: 44 additions & 1 deletion ...pute/Commands.Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetGetMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,14 @@ public GetAzureRmVMSS()

protected override void ProcessRecord()
{
this.MethodName = "VirtualMachineScaleSetGet";
if (this.ParameterSetName == "InvokeByDynamicParameters")
{
this.MethodName = "VirtualMachineScaleSetGet";
}
else
{
this.MethodName = "VirtualMachineScaleSetGetInstanceView";
}
base.ProcessRecord();
}

Expand All @@ -124,6 +131,12 @@ public override object GetDynamicParameters()
Position = 1,
Mandatory = false
});
pResourceGroupName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParametersForFriendMethod",
Position = 1,
Mandatory = false
});
pResourceGroupName.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("ResourceGroupName", pResourceGroupName);

Expand All @@ -136,6 +149,12 @@ public override object GetDynamicParameters()
Position = 2,
Mandatory = false
});
pVMScaleSetName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParametersForFriendMethod",
Position = 2,
Mandatory = false
});
pVMScaleSetName.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("VMScaleSetName", pVMScaleSetName);

Expand All @@ -148,9 +167,33 @@ public override object GetDynamicParameters()
Position = 3,
Mandatory = true
});
pArgumentList.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByStaticParametersForFriendMethod",
Position = 3,
Mandatory = true
});
pArgumentList.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("ArgumentList", pArgumentList);

var pInstanceView = new RuntimeDefinedParameter();
pInstanceView.Name = "InstanceView";
pInstanceView.ParameterType = typeof(SwitchParameter);
pInstanceView.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParametersForFriendMethod",
Position = 3,
Mandatory = true
});
pInstanceView.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByStaticParametersForFriendMethod",
Position = 4,
Mandatory = true
});
pInstanceView.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("InstanceView", pInstanceView);

return dynamicParameters;
}
}
Expand Down
70 changes: 0 additions & 70 deletions ...mpute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetInstanceViewMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,74 +110,4 @@ protected PSArgument[] CreateVirtualMachineScaleSetVMGetInstanceViewParameters()
new object[] { resourceGroupName, vmScaleSetName, instanceId });
}
}

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

public override string MethodName { get; set; }

protected override void ProcessRecord()
{
this.MethodName = "VirtualMachineScaleSetVMGetInstanceView";
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 pVMScaleSetName = new RuntimeDefinedParameter();
pVMScaleSetName.Name = "VMScaleSetName";
pVMScaleSetName.ParameterType = typeof(string);
pVMScaleSetName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Position = 2,
Mandatory = false
});
pVMScaleSetName.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("VMScaleSetName", pVMScaleSetName);

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

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;
}
}
}
51 changes: 50 additions & 1 deletion .../Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMGetMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,14 @@ public GetAzureRmVMSSVM()

protected override void ProcessRecord()
{
this.MethodName = "VirtualMachineScaleSetVMGet";
if (this.ParameterSetName == "InvokeByDynamicParameters")
{
this.MethodName = "VirtualMachineScaleSetVMGet";
}
else
{
this.MethodName = "VirtualMachineScaleSetVMGetInstanceView";
}
base.ProcessRecord();
}

Expand All @@ -138,6 +145,12 @@ public override object GetDynamicParameters()
Position = 1,
Mandatory = false
});
pResourceGroupName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParametersForFriendMethod",
Position = 1,
Mandatory = false
});
pResourceGroupName.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("ResourceGroupName", pResourceGroupName);

Expand All @@ -150,6 +163,12 @@ public override object GetDynamicParameters()
Position = 2,
Mandatory = false
});
pVMScaleSetName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParametersForFriendMethod",
Position = 2,
Mandatory = false
});
pVMScaleSetName.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("VMScaleSetName", pVMScaleSetName);

Expand All @@ -162,6 +181,12 @@ public override object GetDynamicParameters()
Position = 3,
Mandatory = false
});
pInstanceId.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParametersForFriendMethod",
Position = 3,
Mandatory = false
});
pInstanceId.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("InstanceId", pInstanceId);

Expand All @@ -174,9 +199,33 @@ public override object GetDynamicParameters()
Position = 4,
Mandatory = true
});
pArgumentList.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByStaticParametersForFriendMethod",
Position = 4,
Mandatory = true
});
pArgumentList.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("ArgumentList", pArgumentList);

var pInstanceView = new RuntimeDefinedParameter();
pInstanceView.Name = "InstanceView";
pInstanceView.ParameterType = typeof(SwitchParameter);
pInstanceView.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParametersForFriendMethod",
Position = 4,
Mandatory = true
});
pInstanceView.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByStaticParametersForFriendMethod",
Position = 5,
Mandatory = true
});
pInstanceView.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("InstanceView", pInstanceView);

return dynamicParameters;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -800,7 +800,7 @@ function Get-VerbNounCmdletCode
}
else
{
$param_name = $expose_param_name = 'Friend';
$param_name = $expose_param_name = $FriendMethodInfo.Name.Replace($methodName, '');
}

$param_type_full_name = 'SwitchParameter';
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_METHOD_NAME_LIST = @('PowerOff', 'ListNext', 'ListAllNext', 'ListSkusNext');
$SKIP_VERB_NOUN_CMDLET_LIST = @('PowerOff', 'ListNext', 'ListAllNext', 'ListSkusNext', 'GetInstanceView');

Write-Verbose $BAR_LINE;
Write-Verbose "Input Parameters:";
Expand Down
34 changes: 26 additions & 8 deletions ...iceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,17 +1194,35 @@ else
$total_method_count++;

# Handle Friend Methods
if ($mtItem.Name -eq 'Deallocate' -and (-not $friendMethodDict.ContainsKey($mtItem.Name)))
if (-not $friendMethodDict.ContainsKey($mtItem.Name))
{
$methods2 = Get-OperationMethods $operation_type;
foreach ($friendMethodInfo in $methods2)
if ($mtItem.Name -eq 'Deallocate')
{
if ($friendMethodInfo.Name -eq 'PowerOff')
$methods2 = Get-OperationMethods $operation_type;
foreach ($friendMethodInfo in $methods2)
{
if (CheckIf-SameParameterList $methodInfo $friendMethodInfo)
if ($friendMethodInfo.Name -eq 'PowerOff')
{
$friendMethodDict.Add($mtItem.Name, $friendMethodInfo);
break;
if (CheckIf-SameParameterList $methodInfo $friendMethodInfo)
{
$friendMethodDict.Add($mtItem.Name, $friendMethodInfo);
break;
}
}
}
}
elseif ($mtItem.Name -eq 'Get')
{
$methods2 = Get-OperationMethods $operation_type;
foreach ($friendMethodInfo in $methods2)
{
if ($friendMethodInfo.Name -eq 'GetInstanceView')
{
if (CheckIf-SameParameterList $methodInfo $friendMethodInfo)
{
$friendMethodDict.Add($mtItem.Name, $friendMethodInfo);
break;
}
}
}
}
Expand Down Expand Up @@ -1293,7 +1311,7 @@ else
Write-Verbose $SEC_LINE;

$opCmdletFlavor = $cmdletFlavor;
if ($SKIP_METHOD_NAME_LIST -contains $methodInfo.Name)
if ($SKIP_VERB_NOUN_CMDLET_LIST -contains $methodInfo.Name)
{
#Overwrite and skip these method's 'Verb' cmdlet flavor
$opCmdletFlavor = 'None';
Expand Down