Skip to content

BGP Route APIs #3614

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 6 commits into from
Mar 14, 2017
Merged

BGP Route APIs #3614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
149c461
BGP Route APIs and test record
lamchester Mar 10, 2017
aae5e5c
Update help for new cmdlets
lamchester Mar 10, 2017
fe0005c
BgpPeerStatus help
lamchester Mar 10, 2017
898dcc7
Update route api test record
lamchester Mar 10, 2017
f7f19be
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
lamchester Mar 13, 2017
ebc6cec
Add assertions in test
lamchester Mar 13, 2017
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: 5 additions & 1 deletion src/ResourceManager/Network/AzureRM.Network.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,11 @@ CmdletsToExport = 'Add-AzureRmApplicationGatewayAuthenticationCertificate',
'Get-AzureRmVirtualNetworkSubnetConfig',
'Add-AzureRmVirtualNetworkSubnetConfig',
'New-AzureRmVirtualNetworkSubnetConfig',
'Get-AzureRmVirtualNetwork', 'New-AzureRmVirtualNetwork'
'Get-AzureRmVirtualNetwork',
'New-AzureRmVirtualNetwork',
'Get-AzureRmVirtualNetworkGatewayBgpPeerStatus',
'Get-AzureRmVirtualNetworkGatewayAdvertisedRoute',
'Get-AzureRmVirtualNetworkGatewayLearnedRoute'

# Variables to export from this module
# VariablesToExport = @()
Expand Down
3 changes: 3 additions & 0 deletions src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,9 @@
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayConnectionTests\TestVirtualNetworkGatewayConnectionWithActiveAcitveGateway.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\VirtualNetworkGatewayRouteApiTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkTests\TestResourceNavigationLinksOnSubnetCRUD.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
6 changes: 6 additions & 0 deletions ...ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,11 @@ public void VirtualNetworkGatewayActiveActiveFeatureTest()
{
NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayActiveActiveFeatureOperations");
}

[Fact]
public void VirtualNetworkGatewayRouteApiTest()
{
NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayBgpRouteApi");
}
}
}
72 changes: 72 additions & 0 deletions ...esourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,4 +413,76 @@ function Test-VirtualNetworkGatewayActiveActiveFeatureOperations
# Cleanup
Clean-ResourceGroup $rgname
}
}

<#
.SYNOPSIS
Virtual network gateway BGP route API test
#>
function Test-VirtualNetworkGatewayBgpRouteApi
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lamchester are there any asserts needed to check the output of a given cmdlet in this test? It looks like it relies entirely on the cmdlets not throwing when executed; we want to make sure the output of the cmdlets are items that we expect and aren't just random.

{
# Setup
$rgname = Get-ResourceGroupName
$gwname = Get-ResourceName
$domainNameLabel = Get-ResourceName
$vnetName = Get-ResourceName
$publicIpName = Get-ResourceName
$vnetGatewayConfigName = Get-ResourceName
$rgLocation = Get-ProviderLocation ResourceManagement
$resourceTypeParent = "Microsoft.Network/virtualNetworkGateways"
$location = Get-ProviderLocation $resourceTypeParent

$gwname1 = Get-ResourceName
$vnetName1 = Get-ResourceName
$publicIpName1 = Get-ResourceName
$domainNameLabel1 = Get-ResourceName
$vnetGatewayConfigName1 = Get-ResourceName

$connectionName = Get-ResourceName
$connectionName1 = Get-ResourceName

try
{
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -AddressPrefix 10.0.0.0/24
$vnet = New-AzureRmVirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
$vnet = Get-AzureRmVirtualNetwork -Name $vnetName -ResourceGroupName $rgname
$subnet = Get-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -VirtualNetwork $vnet
$publicip = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel
$vnetIpConfig = New-AzureRmVirtualNetworkGatewayIpConfig -Name $vnetGatewayConfigName -PublicIpAddress $publicip -Subnet $subnet
$gw = New-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $gwname -location $location -IpConfigurations $vnetIpConfig -GatewayType Vpn -VpnType RouteBased -GatewaySku Standard
$gw = Get-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $gwname

$subnet1 = New-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -AddressPrefix 10.1.0.0/24
$vnet1 = New-AzureRmVirtualNetwork -Name $vnetName1 -ResourceGroupName $rgname -Location $location -AddressPrefix 10.1.0.0/16 -Subnet $subnet1
$vnet1 = Get-AzureRmVirtualNetwork -Name $vnetName1 -ResourceGroupName $rgname
$subnet1 = Get-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -VirtualNetwork $vnet1
$publicip1 = New-AzureRmPublicIpAddress -Name $publicIpName1 -ResourceGroupName $rgname -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel1
$vnetIpConfig1 = New-AzureRmVirtualNetworkGatewayIpConfig -Name $vnetGatewayConfigName1 -PublicIpAddress $publicip1 -Subnet $subnet1
$gw1 = New-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $gwname1 -location $location -IpConfigurations $vnetIpConfig1 -GatewayType Vpn -VpnType RouteBased -GatewaySku Standard -Asn 1337
$gw1 = Get-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $gwname1

New-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName $rgname -name $connectionName -location $location -VirtualNetworkGateway1 $gw -VirtualNetworkGateway2 $gw1 -ConnectionType Vnet2Vnet -SharedKey chocolate -EnableBgp true
New-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName $rgname -name $connectionName1 -location $location -VirtualNetworkGateway1 $gw1 -VirtualNetworkGateway2 $gw -ConnectionType Vnet2Vnet -SharedKey chocolate -EnableBgp true

$bgpPeerStatus = Get-AzureRmVirtualNetworkGatewayBGPPeerStatus -ResourceGroupName $rgname -VirtualNetworkGatewayName $gwname
$bgpLearnedRoutes = Get-AzureRmVirtualNetworkGatewayLearnedRoute -ResourceGroupName $rgname -VirtualNetworkGatewayName $gwname
$bgpAdvertisedRoutes = Get-AzureRmVirtualNetworkGatewayAdvertisedRoute -ResourceGroupName $rgname -VirtualNetworkGatewayName $gwname -Peer $bgpPeerStatus[0].Neighbor

Assert-AreEqual True ($vnet.AddressSpace.AddressPrefixes -contains $bgpAdvertisedRoutes[0].Network)

$routeLearned = $false
ForEach ($route in $bgpLearnedRoutes) {
If ($route.Origin -eq "EBgp") {
$routeLearned = $true
Assert-AreEqual True ($vnet1.AddressSpace.AddressPrefixes -contains $route.Network)
}
}

Assert-AreEqual True $routeLearned
}
finally
{
Clean-ResourceGroup $rgname
}
}
12,916 changes: 12,916 additions & 0 deletions ...work.Test.ScenarioTests.VirtualNetworkGatewayTests/VirtualNetworkGatewayRouteApiTest.json
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions src/ResourceManager/Network/Commands.Network/Commands.Network.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,11 @@
<Compile Include="Models\PSApplicationGatewayBackendHealthServer.cs" />
<Compile Include="Models\PSApplicationGatewayConnectionDraining.cs" />
<Compile Include="Models\PSBgpCommunity.cs" />
<Compile Include="Models\PSBgpPeerStatus.cs" />
<Compile Include="Models\PSBgpServiceCommunity.cs" />
<Compile Include="Models\PSFlowLog.cs" />
<Compile Include="Models\PSFlowLogProperties.cs" />
<Compile Include="Models\PSGatewayRoute.cs" />
<Compile Include="Models\PSGetPacketCaptureResult.cs" />
<Compile Include="Models\PSIPAddressAvailabilityResult.cs" />
<Compile Include="Models\PSApplicationGatewayAuthenticationCertificate.cs" />
Expand Down Expand Up @@ -401,6 +403,9 @@
<Compile Include="RouteFilter\RouteFilterRule\RemoveAzureRouteFilterRuleConfigCommand.cs" />
<Compile Include="RouteFilter\RouteFilterRule\SetAzureRouteFilterRuleConfigCommand.cs" />
<Compile Include="RouteFilter\SetAzureRouteFilterCommand.cs" />
<Compile Include="VirtualNetworkGateway\GetAzureVirtualNetworkGatewayAdvertisedRouteCommand.cs" />
<Compile Include="VirtualNetworkGateway\GetAzureVirtualNetworkGatewayBgpPeerStatus.cs" />
<Compile Include="VirtualNetworkGateway\GetAzureVirtualNetworkGatewayLearnedRouteCommand.cs" />
<Compile Include="VirtualNetwork\TestAzurePrivateIPAddressAvailabilityCmdlet.cs" />
<Compile Include="PublicIpAddress\GetAzurePublicIpAddressCommand.cs" />
<Compile Include="PublicIpAddress\NewAzurePublicIpAddressCommand.cs" />
Expand Down
4 changes: 4 additions & 0 deletions src/ResourceManager/Network/Commands.Network/Common/NetworkResourceManagerProfile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,8 @@ protected override void Configure()
Mapper.CreateMap<CNM.PSVpnClientRevokedCertificate, MNM.VpnClientRevokedCertificate>();
Mapper.CreateMap<CNM.PSVpnClientRootCertificate, MNM.VpnClientRootCertificate>();
Mapper.CreateMap<CNM.PSBgpSettings, MNM.BgpSettings>();
Mapper.CreateMap<CNM.PSBGPPeerStatus, MNM.BgpPeerStatus>();
Mapper.CreateMap<CNM.PSGatewayRoute, MNM.GatewayRoute>();

// MNM to CNM
Mapper.CreateMap<MNM.VirtualNetworkGateway, CNM.PSVirtualNetworkGateway>();
Expand All @@ -391,6 +393,8 @@ protected override void Configure()
Mapper.CreateMap<MNM.VpnClientRevokedCertificate, CNM.PSVpnClientRevokedCertificate>();
Mapper.CreateMap<MNM.VpnClientRootCertificate, CNM.PSVpnClientRootCertificate>();
Mapper.CreateMap<MNM.BgpSettings, CNM.PSBgpSettings>();
Mapper.CreateMap<MNM.BgpPeerStatus, CNM.PSBGPPeerStatus>();
Mapper.CreateMap<MNM.GatewayRoute, CNM.PSGatewayRoute>();

// Application Gateways
// CNM to MNM
Expand Down
Loading