Skip to content

Commit 89fe368

Browse files
remove nic param in GetEffective cmdlets
1 parent dedc5dc commit 89fe368

File tree

3 files changed

+1
-41
lines changed

3 files changed

+1
-41
lines changed

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -583,15 +583,7 @@ function Test-EffectiveRoutesAndNsg
583583
Assert-NotNull $effectiveRoute[0].Source
584584

585585
# Get Effective NSG by name
586-
$effectiveNsgs = Get-AzureRmEffectiveNetworkSecurityGroup -ResourceGroupName $rgname -NetworkInterfaceName $getnic.Name
587-
588-
# Get Effective route by object
589-
$effectiveRoute = Get-AzureRmEffectiveRouteTable -NetworkInterface $getnic
590-
Assert-NotNull $effectiveRoute[0].Source
591-
592-
# Get Effective NSG by object
593-
$effectiveNsgs = Get-AzureRmEffectiveNetworkSecurityGroup -NetworkInterface $getnic
594-
586+
$effectiveNsgs = Get-AzureRmEffectiveNetworkSecurityGroup -ResourceGroupName $rgname -NetworkInterfaceName $getnic.Name
595587
}
596588
finally
597589
{

src/ResourceManager/Network/Commands.Network/NetworkInterface/EffectiveResources/GetAzureEffectiveNetworkSecurityGroupCommand.cs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,13 @@ public class GetAzureEffectiveNetworkSecurityGroupCommand : NetworkInterfaceBase
2626
[Parameter(
2727
Mandatory = true,
2828
ValueFromPipelineByPropertyName = true,
29-
ParameterSetName = "GetByResourceObject",
30-
HelpMessage = "The network interface.")]
31-
[ValidateNotNullOrEmpty]
32-
public PSNetworkInterface NetworkInterface { get; set; }
33-
34-
[Parameter(
35-
Mandatory = true,
36-
ValueFromPipelineByPropertyName = true,
37-
ParameterSetName = "GetByResourceName",
3829
HelpMessage = "The network interface name.")]
3930
[ValidateNotNullOrEmpty]
4031
public string NetworkInterfaceName { get; set; }
4132

4233
[Parameter(
4334
Mandatory = false,
4435
ValueFromPipelineByPropertyName = true,
45-
ParameterSetName = "GetByResourceName",
4636
HelpMessage = "The resource group name.")]
4737
[ValidateNotNullOrEmpty]
4838
public string ResourceGroupName { get; set; }
@@ -51,12 +41,6 @@ public override void Execute()
5141
{
5242
base.Execute();
5343

54-
if (ParameterSetName.Contains("GetByResourceObject"))
55-
{
56-
this.NetworkInterfaceName = this.NetworkInterface.Name;
57-
this.ResourceGroupName = this.NetworkInterface.ResourceGroupName;
58-
}
59-
6044
var getEffectiveNsgs = this.NetworkInterfaceClient.ListEffectiveNetworkSecurityGroups(this.ResourceGroupName, this.NetworkInterfaceName);
6145

6246
var psEffectiveNsgs = Mapper.Map<List<PSEffectiveNetworkSecurityGroup>>(getEffectiveNsgs.Value);

src/ResourceManager/Network/Commands.Network/NetworkInterface/EffectiveResources/GetAzureEffectiveRouteTableCommand.cs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,13 @@ public class GetAzureEffectiveRouteTableCommand : NetworkInterfaceBaseCmdlet
2626
[Parameter(
2727
Mandatory = true,
2828
ValueFromPipelineByPropertyName = true,
29-
ParameterSetName = "GetByResourceObject",
30-
HelpMessage = "The network interface.")]
31-
[ValidateNotNullOrEmpty]
32-
public PSNetworkInterface NetworkInterface { get; set; }
33-
34-
[Parameter(
35-
Mandatory = true,
36-
ValueFromPipelineByPropertyName = true,
37-
ParameterSetName = "GetByResourceName",
3829
HelpMessage = "The network interface name.")]
3930
[ValidateNotNullOrEmpty]
4031
public string NetworkInterfaceName { get; set; }
4132

4233
[Parameter(
4334
Mandatory = false,
4435
ValueFromPipelineByPropertyName = true,
45-
ParameterSetName = "GetByResourceName",
4636
HelpMessage = "The resource group name.")]
4737
[ValidateNotNullOrEmpty]
4838
public string ResourceGroupName { get; set; }
@@ -51,12 +41,6 @@ public override void Execute()
5141
{
5242
base.Execute();
5343

54-
if (ParameterSetName.Contains("GetByResourceObject"))
55-
{
56-
this.NetworkInterfaceName = this.NetworkInterface.Name;
57-
this.ResourceGroupName = this.NetworkInterface.ResourceGroupName;
58-
}
59-
6044
var getEffectiveRouteTable = this.NetworkInterfaceClient.GetEffectiveRouteTable(this.ResourceGroupName, this.NetworkInterfaceName);
6145

6246
var psEffectiveRouteTable = Mapper.Map<List<PSEffectiveRoute>>(getEffectiveRouteTable.Value);

0 commit comments

Comments
 (0)