Skip to content

Commit fbc6944

Browse files
NilambariNilambari
committed
Incorporate review comments
1 parent 78e8cc1 commit fbc6944

File tree

10 files changed

+20442
-1158
lines changed

10 files changed

+20442
-1158
lines changed

‎src/ResourceManager/Network/ChangeLog.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
-->
2020
## Current Release
2121

22-
## Version 3.1.0
23-
* Add-AzureRmVirtualNetworkPeering
24-
- Parameter AlloowGatewayTransit renamed to AllowGatewayTransit (an alias for the old parameter was created)
25-
- Fixed issue where UseRemoteGateway property was not being populated in the request to the server
26-
* Get-AzureRmEffectiveNetworkSecurityGroup
27-
- Add warning if there is no response from GetEffectiveNSG
28-
* Add Source property to EffectiveRoute
22+
## Version 3.2.0
23+
*Get-AzureRmVirtualNetworkGatewayConnection
24+
- Added new param :- TunnelConnectionStatus in output Connection object to show per tunnel connection health status.
25+
*Reset-AzureRmVirtualNetworkGateway
26+
- Added optional input param:- gatewayVip to pass gateway vip for ResetGateway API in case of Active-Active feature enabled gateways.
27+
- Gateway Vip can be retrieved from PublicIPs refered in VirtualNetworkGateway object.

‎src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,9 @@
410410
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayConnectionTests\TestVirtualNetworkGatewayConnectionSharedKeyCRUD.json">
411411
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
412412
</None>
413+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayConnectionTests\TestVirtualNetworkGatewayConnectionWithActiveAcitveGateway.json">
414+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
415+
</None>
413416
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkTests\TestResourceNavigationLinksOnSubnetCRUD.json" >
414417
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
415418
</None>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ function Get-ProviderLocation($provider)
5151
{
5252
if($location.Locations[0] -eq "West US")
5353
{
54-
return $location.Locations[1]
54+
return "West US"; #return $location.Locations[1]
5555
}
5656
else
5757
{
58-
return $location.Locations[0]
58+
return "West US"; #return $location.Locations[0]
5959
}
6060
}
6161
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,12 @@ public void TestVirtualNetworkGatewayConnectionWithBgpCRUD()
4646
{
4747
NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayConnectionWithBgpCRUD");
4848
}
49+
50+
[Fact]
51+
[Trait(Category.AcceptanceType, Category.CheckIn)]
52+
public void TestVirtualNetworkGatewayConnectionWithActiveAcitveGateway()
53+
{
54+
NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayConnectionWithActiveActiveGateway");
55+
}
4956
}
5057
}

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

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,89 @@ function Test-VirtualNetworkGatewayConnectionWithBgpCRUD
125125
}
126126
}
127127

128+
<#
129+
.SYNOPSIS
130+
Virtual network gateway connection test with Active-Active feature enabled virtual network gateway
131+
#>
132+
function Test-VirtualNetworkGatewayConnectionWithActiveActiveGateway
133+
{
134+
# Setup
135+
$rgname = Get-ResourceGroupName
136+
$rname1 = Get-ResourceName
137+
$rname2 = Get-ResourceName
138+
$domainNameLabel11 = Get-ResourceName
139+
$domainNameLabel12 = Get-ResourceName
140+
$domainNameLabel2 = Get-ResourceName
141+
$vnetName1 = Get-ResourceName
142+
$vnetName2 = Get-ResourceName
143+
$vnetConnectionName1 = Get-ResourceName
144+
$vnetConnectionName2 = Get-ResourceName
145+
$publicIpName11 = Get-ResourceName
146+
$publicIpName12 = Get-ResourceName
147+
$publicIpName2 = Get-ResourceName
148+
$vnetGatewayConfigName11 = Get-ResourceName
149+
$vnetGatewayConfigName12 = Get-ResourceName
150+
$vnetGatewayConfigName2 = Get-ResourceName
151+
$rglocation = Get-ProviderLocation ResourceManagement
152+
$resourceTypeParent = "Microsoft.Network/connections"
153+
$location = Get-ProviderLocation $resourceTypeParent
154+
155+
try
156+
{
157+
# Create the resource group
158+
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" }
159+
160+
# Create the Virtual Network1
161+
$subnet1 = New-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -AddressPrefix 10.0.0.0/24
162+
$vnet1 = New-AzureRmvirtualNetwork -Name $vnetName1 -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet1
163+
$vnet1 = Get-AzureRmvirtualNetwork -Name $vnetName1 -ResourceGroupName $rgname
164+
$subnet1 = Get-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -VirtualNetwork $vnet1
165+
166+
# Create Active-Active feature enabled virtualnetworkgateway1 & Get virtualnetworkgateway1
167+
$publicip11 = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName11 -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel11
168+
$vnetIpConfig11 = New-AzureRmVirtualNetworkGatewayIpConfig -Name $vnetGatewayConfigName11 -PublicIpAddress $publicip11 -Subnet $subnet1
169+
170+
$publicip12 = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName12 -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel12
171+
$vnetIpConfig12 = New-AzureRmVirtualNetworkGatewayIpConfig -Name $vnetGatewayConfigName12 -PublicIpAddress $publicip12 -Subnet $subnet1
172+
173+
$actual = New-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname1 -Location $location -IpConfigurations $vnetIpConfig11,$vnetIpConfig12 -GatewayType Vpn -VpnType RouteBased -EnableBgp $false -GatewaySku HighPerformance -EnableActiveActiveFeature
174+
$vnetGateway1 = Get-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname1
175+
176+
# Create the Virtual Network2
177+
$subnet2 = New-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -AddressPrefix 192.168.200.0/26
178+
$vnet2 = New-AzureRmvirtualNetwork -Name $vnetName2 -ResourceGroupName $rgname -Location $location -AddressPrefix 192.168.0.0/16 -Subnet $subnet2
179+
$vnet2 = Get-AzureRmvirtualNetwork -Name $vnetName2 -ResourceGroupName $rgname
180+
$subnet2 = Get-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -VirtualNetwork $vnet2
181+
182+
# Create the publicip2
183+
$publicip2 = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName2 -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel2
184+
185+
# Create VirtualNetworkGateway2
186+
$vnetIpConfig2 = New-AzureRmVirtualNetworkGatewayIpConfig -Name $vnetGatewayConfigName2 -PublicIpAddress $publicip2 -Subnet $subnet2
187+
188+
$actual = New-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname2 -location $location -IpConfigurations $vnetIpConfig2 -GatewayType Vpn -VpnType RouteBased -GatewaySku Standard
189+
$vnetGateway2 = Get-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname2
190+
191+
# Create & Get VirtualNetworkGatewayConnection1, VirtualNetworkGatewayConnection2
192+
$actual1 = New-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName $rgname -name $vnetConnectionName1 -location $location -VirtualNetworkGateway1 $vnetGateway1 -VirtualNetworkGateway2 $vnetGateway2 -ConnectionType Vnet2Vnet -RoutingWeight 3 -SharedKey abc
193+
$actual2 = New-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName $rgname -name $vnetConnectionName2 -location $location -VirtualNetworkGateway1 $vnetGateway2 -VirtualNetworkGateway2 $vnetGateway1 -ConnectionType Vnet2Vnet -RoutingWeight 3 -SharedKey abc
194+
195+
$connection1 = Get-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName $rgname -name $vnetConnectionName1
196+
Assert-NotNull $connection1.TunnelConnectionStatus
197+
198+
# Delete VirtualNetworkGatewayConnections
199+
$delete = Remove-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName $actual.ResourceGroupName -name $vnetConnectionName1 -PassThru -Force
200+
Assert-AreEqual true $delete
201+
$delete = Remove-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName $actual.ResourceGroupName -name $vnetConnectionName2 -PassThru -Force
202+
Assert-AreEqual true $delete
203+
}
204+
finally
205+
{
206+
# Cleanup
207+
Clean-ResourceGroup $rgname
208+
}
209+
}
210+
128211
function Test-VirtualNetworkGatewayConnectionCRUD
129212
{
130213
# Setup

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ function Test-VirtualNetworkGatewayCRUD
108108

109109
# Create & Get virtualnetworkgateway
110110
$vnetIpConfig = New-AzureRmVirtualNetworkGatewayIpConfig -Name $vnetGatewayConfigName -PublicIpAddress $publicip -Subnet $subnet
111-
112111
$actual = New-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname -location $location -IpConfigurations $vnetIpConfig -GatewayType Vpn -VpnType RouteBased -EnableBgp $false
113112
$expected = Get-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname
114113
Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
@@ -128,6 +127,12 @@ function Test-VirtualNetworkGatewayCRUD
128127
$list = Get-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname
129128
Assert-AreEqual 1 @($list).Count
130129

130+
# Reset/Reboot virtualNetworkGateway by passing gateway vip
131+
$publicipAddress = Get-AzureRmPublicIpAddress -Name $publicip.Name -ResourceGroupName $publicip.ResourceGroupName
132+
$actual = Reset-AzureRmVirtualNetworkGateway -VirtualNetworkGateway $expected -GatewayVip $publicipAddress.IpAddress
133+
$list = Get-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname
134+
Assert-AreEqual 1 @($list).Count
135+
131136
# Delete virtualNetworkGateway
132137
$delete = Remove-AzureRmVirtualNetworkGateway -ResourceGroupName $actual.ResourceGroupName -name $rname -PassThru -Force
133138
Assert-AreEqual true $delete

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayConnectionTests/TestVirtualNetworkGatewayConnectionWithActiveAcitveGateway.json

Lines changed: 17003 additions & 0 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests/TestVirtualNetworkGatewayCRUD.json

Lines changed: 3330 additions & 1146 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network/Models/PSConnectionResetSharedKey.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ namespace Microsoft.Azure.Commands.Network.Models
1616
{
1717
public class PSConnectionResetSharedKey
1818
{
19-
public int KeyLength { get; set; }
19+
public uint KeyLength { get; set; }
2020
}
2121
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class ResetAzureVirtualNetworkGatewayConnectionSharedKeyCommand : Virtual
4444
ValueFromPipelineByPropertyName = true,
4545
HelpMessage = "The virtual network connection reset shared key length")]
4646
[ValidateNotNullOrEmpty]
47-
public int KeyLength { get; set; }
47+
public uint KeyLength { get; set; }
4848

4949
[Parameter(
5050
Mandatory = false,

0 commit comments

Comments
 (0)