Skip to content

Commit c1ccc04

Browse files
unknownunknown
unknown
authored and
unknown
committed
PS command changes as per NRP Brooklyn APIs changes:-
1. Command New-AzureLocalNetworkGateway parameter name change 2. Command Reset-AzureLocalNetworkGateway renamed to Set-AzureLocalNetworkGateway, added new parameter 3. Resource: VirtualNetworkGateway parameter changes 4. Command New-AzureVirtualNetworkGateway parameter changes 5. Removed command Resize-AzureVirtualNetworkGateway 6. Command Reset-AzureVirtualNetworkGatewayConnection renamed to Set-AzureVirtualNetworkGatewayConnection
1 parent 5c2354d commit c1ccc04

10 files changed

+27
-29
lines changed

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/LocalNetworkGatewayTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function Test-LocalNetworkGatewayCRUD
3737
Assert-AreEqual $expected.Name $actual.Name
3838
Assert-AreEqual "192.168.3.4" $expected.GatewayIpAddress
3939
Assert-AreEqual "192.168.0.0/16" $expected.LocalNetworkAddressSpace.AddressPrefixes[0]
40-
$expected.Location = $location
40+
$expected.Location = $location
4141

4242
# List LocalNetworkGateways
4343
$list = Get-AzureLocalNetworkGateway -ResourceGroupName $rgname

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayConnectionTests.ps1

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ function Test-VirtualNetworkGatewayConnectionCRUD
2222
$rgname = Get-ResourceGroupName
2323
$rname = Get-ResourceName
2424
$domainNameLabel = Get-ResourceName
25-
$vnetName = Get-ResourceName
25+
$vnetName = Get-ResourceName
2626
$localnetName = Get-ResourceName
2727
$vnetConnectionName = Get-ResourceName
28-
$publicIpName = Get-ResourceName
28+
$publicIpName = Get-ResourceName
2929
$vnetGatewayConfigName = Get-ResourceName
3030
$rglocation = Get-ProviderLocation ResourceManagement
3131
$resourceTypeParent = "Microsoft.Network/connections"
@@ -40,29 +40,29 @@ function Test-VirtualNetworkGatewayConnectionCRUD
4040
$subnet = New-AzureVirtualNetworkSubnetConfig -Name "GatewaySubnet" -AddressPrefix 10.0.0.0/24
4141
$vnet = New-AzurevirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
4242
$vnet = Get-AzurevirtualNetwork -Name $vnetName -ResourceGroupName $rgname
43-
$subnet = Get-AzureVirtualNetworkSubnetConfig -Name "GatewaySubnet" -VirtualNetwork $vnet
43+
$subnet = Get-AzureVirtualNetworkSubnetConfig -Name "GatewaySubnet" -VirtualNetwork $vnet
4444

4545
# Create the publicip
4646
$publicip = New-AzurePublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel
4747

4848
# Create VirtualNetworkGateway
4949
$vnetIpConfig = New-AzureVirtualNetworkGatewayIpConfig -Name $vnetGatewayConfigName -PublicIpAddress $publicip -Subnet $subnet
5050

51-
$actual = New-AzureVirtualNetworkGateway -ResourceGroupName $rgname -name $rname -location $location -IpConfigurations $vnetIpConfig -GatewayType Vpn -VpnType RouteBased -EnableBgp $false
51+
$actual = New-AzureVirtualNetworkGateway -ResourceGroupName $rgname -name $rname -location $location -IpConfigurations $vnetIpConfig -GatewayType Vpn -VpnType RouteBased -EnableBgp $false
5252
$vnetGateway = Get-AzureVirtualNetworkGateway -ResourceGroupName $rgname -name $rname
5353
Assert-AreEqual $vnetGateway.ResourceGroupName $actual.ResourceGroupName
5454
Assert-AreEqual $vnetGateway.Name $actual.Name
5555
#Assert-AreEqual "Vpn" $expected.GatewayType
56-
#Assert-AreEqual "RouteBased" $expected.VpnType
56+
#Assert-AreEqual "RouteBased" $expected.VpnType
5757

5858
# Create LocalNetworkGateway
5959
$actual = New-AzureLocalNetworkGateway -ResourceGroupName $rgname -name $localnetName -location $location -AddressPrefix 192.168.0.0/16 -GatewayIpAddress 192.168.3.10
6060
$localnetGateway = Get-AzureLocalNetworkGateway -ResourceGroupName $rgname -name $localnetName
6161
Assert-AreEqual $localnetGateway.ResourceGroupName $actual.ResourceGroupName
6262
Assert-AreEqual $localnetGateway.Name $actual.Name
6363
Assert-AreEqual "192.168.3.10" $localnetGateway.GatewayIpAddress
64-
Assert-AreEqual "192.168.0.0/16" $localnetGateway.LocalNetworkAddressSpace.AddressPrefixes[0]
65-
$localnetGateway.Location = $location
64+
Assert-AreEqual "192.168.0.0/16" $localnetGateway.LocalNetworkAddressSpace.AddressPrefixes[0]
65+
$localnetGateway.Location = $location
6666

6767
# Create & Get VirtualNetworkGatewayConnection
6868
$actual = New-AzureVirtualNetworkGatewayConnection -ResourceGroupName $rgname -name $vnetConnectionName -location $location -VirtualNetworkGateway1 $vnetGateway -LocalNetworkGateway2 $localnetGateway -ConnectionType IPsec -RoutingWeight 3 -SharedKey abc
@@ -84,9 +84,9 @@ function Test-VirtualNetworkGatewayConnectionCRUD
8484
Assert-AreEqual "abc" $list[0].SharedKey
8585

8686
# Set/Update VirtualNetworkGatewayConnection
87-
$expected.Location = $location
88-
$expected.VirtualNetworkGateway1.Location = $location
89-
$expected.LocalNetworkGateway2.Location = $location
87+
$expected.Location = $location
88+
$expected.VirtualNetworkGateway1.Location = $location
89+
$expected.LocalNetworkGateway2.Location = $location
9090
$expected.RoutingWeight = "4"
9191
$expected.SharedKey = "xyz"
9292

@@ -119,10 +119,10 @@ function Test-VirtualNetworkGatewayConnectionSharedKeyCRUD
119119
$rgname = Get-ResourceGroupName
120120
$rname = Get-ResourceName
121121
$domainNameLabel = Get-ResourceName
122-
$vnetName = Get-ResourceName
122+
$vnetName = Get-ResourceName
123123
$localnetName = Get-ResourceName
124124
$vnetConnectionName = Get-ResourceName
125-
$publicIpName = Get-ResourceName
125+
$publicIpName = Get-ResourceName
126126
$vnetGatewayConfigName = Get-ResourceName
127127
$rglocation = Get-ProviderLocation ResourceManagement
128128
$resourceTypeParent = "Microsoft.Network/connections"
@@ -137,29 +137,29 @@ function Test-VirtualNetworkGatewayConnectionSharedKeyCRUD
137137
$subnet = New-AzureVirtualNetworkSubnetConfig -Name "GatewaySubnet" -AddressPrefix 10.0.0.0/24
138138
$vnet = New-AzurevirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
139139
$vnet = Get-AzurevirtualNetwork -Name $vnetName -ResourceGroupName $rgname
140-
$subnet = Get-AzureVirtualNetworkSubnetConfig -Name "GatewaySubnet" -VirtualNetwork $vnet
140+
$subnet = Get-AzureVirtualNetworkSubnetConfig -Name "GatewaySubnet" -VirtualNetwork $vnet
141141

142142
# Create the publicip
143143
$publicip = New-AzurePublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel
144144

145145
# Create VirtualNetworkGateway
146146
$vnetIpConfig = New-AzureVirtualNetworkGatewayIpConfig -Name $vnetGatewayConfigName -PublicIpAddress $publicip -Subnet $subnet
147147

148-
$actual = New-AzureVirtualNetworkGateway -ResourceGroupName $rgname -name $rname -location $location -IpConfigurations $vnetIpConfig -GatewayType Vpn -VpnType RouteBased -EnableBgp $false
148+
$actual = New-AzureVirtualNetworkGateway -ResourceGroupName $rgname -name $rname -location $location -IpConfigurations $vnetIpConfig -GatewayType Vpn -VpnType RouteBased -EnableBgp $false
149149
$vnetGateway = Get-AzureVirtualNetworkGateway -ResourceGroupName $rgname -name $rname
150150
Assert-AreEqual $vnetGateway.ResourceGroupName $actual.ResourceGroupName
151151
Assert-AreEqual $vnetGateway.Name $actual.Name
152152
#Assert-AreEqual "Vpn" $expected.GatewayType
153-
#Assert-AreEqual "RouteBased" $expected.VpnType
153+
#Assert-AreEqual "RouteBased" $expected.VpnType
154154

155155
# Create LocalNetworkGateway
156156
$actual = New-AzureLocalNetworkGateway -ResourceGroupName $rgname -name $localnetName -location $location -AddressPrefix 192.168.0.0/16 -GatewayIpAddress 192.168.3.11
157157
$localnetGateway = Get-AzureLocalNetworkGateway -ResourceGroupName $rgname -name $localnetName
158158
Assert-AreEqual $localnetGateway.ResourceGroupName $actual.ResourceGroupName
159159
Assert-AreEqual $localnetGateway.Name $actual.Name
160160
Assert-AreEqual "192.168.3.11" $localnetGateway.GatewayIpAddress
161-
Assert-AreEqual "192.168.0.0/16" $localnetGateway.LocalNetworkAddressSpace.AddressPrefixes[0]
162-
$localnetGateway.Location = $location
161+
Assert-AreEqual "192.168.0.0/16" $localnetGateway.LocalNetworkAddressSpace.AddressPrefixes[0]
162+
$localnetGateway.Location = $location
163163

164164
# Create VirtualNetworkGatewayConnection
165165
$actual = New-AzureVirtualNetworkGatewayConnection -ResourceGroupName $rgname -name $vnetConnectionName -location $location -VirtualNetworkGateway1 $vnetGateway -LocalNetworkGateway2 $localnetGateway -ConnectionType IPsec -RoutingWeight 3 -SharedKey abc
@@ -179,7 +179,7 @@ function Test-VirtualNetworkGatewayConnectionSharedKeyCRUD
179179
# Reset VirtualNetworkGatewayConnectionSharedKey
180180
$actual = Reset-AzureVirtualNetworkGatewayConnectionSharedKey -ResourceGroupName $rgname -name $rname -KeyLength 50 -Force
181181

182-
# Get VirtualNetworkGatewayConnectionSharedKey after Reset-VirtualNetworkGatewayConnectionSharedKey
182+
# Get VirtualNetworkGatewayConnectionSharedKey after Reset-VirtualNetworkGatewayConnectionSharedKey
183183
$expected = Get-AzureVirtualNetworkGatewayConnectionSharedKey -ResourceGroupName $rgname -name $vnetConnectionName
184184
}
185185
finally

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function Test-VirtualNetworkGatewayCRUD
3838
$subnet = New-AzureVirtualNetworkSubnetConfig -Name "GatewaySubnet" -AddressPrefix 10.0.0.0/24
3939
$vnet = New-AzurevirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
4040
$vnet = Get-AzurevirtualNetwork -Name $vnetName -ResourceGroupName $rgname
41-
$subnet = Get-AzureVirtualNetworkSubnetConfig -Name "GatewaySubnet" -VirtualNetwork $vnet
41+
$subnet = Get-AzureVirtualNetworkSubnetConfig -Name "GatewaySubnet" -VirtualNetwork $vnet
4242

4343
# Create the publicip
4444
$publicip = New-AzurePublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel
@@ -51,7 +51,7 @@ function Test-VirtualNetworkGatewayCRUD
5151
Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
5252
Assert-AreEqual $expected.Name $actual.Name
5353
#Assert-AreEqual "Vpn" $expected.GatewayType
54-
#Assert-AreEqual "RouteBased" $expected.VpnType
54+
#Assert-AreEqual "RouteBased" $expected.VpnType
5555

5656
# List virtualNetworkGateways
5757
$list = Get-AzureVirtualNetworkGateway -ResourceGroupName $rgname

‎src/ResourceManager/Network/Commands.Network/LocalNetworkGateway/GetAzureLocalNetworkGatewayCommand.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,3 @@ public override void ExecuteCmdlet()
6565
}
6666
}
6767

68-

‎src/ResourceManager/Network/Commands.Network/LocalNetworkGateway/RemoveAzureLocalNetworkGatewayCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
namespace Microsoft.Azure.Commands.Network
2020
{
21-
[Cmdlet(VerbsCommon.Remove, "AzureLocalNetworkGateway")]
21+
[Cmdlet(VerbsCommon.Remove, "AzureLocalNetworkGateway")]
2222
public class RemoveAzureLocalNetworkGatewayCommand : LocalNetworkGatewayBaseCmdlet
2323
{
2424
[Alias("ResourceName")]

‎src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/GetAzureVirtualNetworkGatewayCommand.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,8 @@ public override void ExecuteCmdlet()
6060
}
6161

6262
WriteObject(psVnetGateways, true);
63-
}
63+
}
6464
}
6565
}
6666
}
6767

68-

‎src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/RemoveAzureVirtualNetworkGatewayCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
namespace Microsoft.Azure.Commands.Network
2020
{
21-
[Cmdlet(VerbsCommon.Remove, "AzureVirtualNetworkGateway")]
21+
[Cmdlet(VerbsCommon.Remove, "AzureVirtualNetworkGateway")]
2222
public class RemoveAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBaseCmdlet
2323
{
2424
[Alias("ResourceName")]

‎src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/ResetAzureVirtualNetworkGatewayCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public override void ExecuteCmdlet()
4040
{
4141
throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);
4242
}
43-
43+
4444
// Map to the sdk object
4545
var vnetGatewayModel = Mapper.Map<MNM.VirtualNetworkGateway>(this.VirtualNetworkGateway);
4646
vnetGatewayModel.Type = Microsoft.Azure.Commands.Network.Properties.Resources.VirtualNetworkGatewayType;

‎src/ResourceManager/Network/Commands.Network/VirtualNetworkGatewayConnection/RemoveAzureVirtualNetworkGatewayConnectionCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
namespace Microsoft.Azure.Commands.Network
2020
{
21-
[Cmdlet(VerbsCommon.Remove, "AzureVirtualNetworkGatewayConnection")]
21+
[Cmdlet(VerbsCommon.Remove, "AzureVirtualNetworkGatewayConnection")]
2222
public class RemoveAzureVirtualNetworkGatewayConnectionCommand : VirtualNetworkGatewayConnectionBaseCmdlet
2323
{
2424
[Alias("ResourceName")]

‎src/ResourceManager/Network/Commands.Network/VirtualNetworkGatewayConnection/SetAzureVirtualNetworkGatewayConnectionSharedKeyCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class NewAzureVirtualNetworkGatewayConnectionSharedKeyCommand : VirtualNe
4747
HelpMessage = "The virtual network connection shared key value.")]
4848
[ValidateNotNullOrEmpty]
4949
public string Value { get; set; }
50-
50+
5151
[Parameter(
5252
Mandatory = false,
5353
HelpMessage = "Do not ask for confirmation if you want to overrite a resource")]

0 commit comments

Comments
 (0)