Skip to content

{VirtualWan} - Support HubRouteTables and RoutingConfiguration for June release #12172

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
VeryEarly merged 17 commits into from
Jun 17, 2020
Merged

{VirtualWan} - Support HubRouteTables and RoutingConfiguration for June release #12172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0cf8f25
add new classes neede for vwan custom routing
nagula-ritvika Jun 9, 2020
156bd24
added all rtv3 related cmdlets
nagula-ritvika Jun 10, 2020
059a340
update cmdlets for RoutingConfiguration
nagula-ritvika Jun 11, 2020
77ab464
update help files
nagula-ritvika Jun 11, 2020
c4ed703
add 2 new cmdlets and help files
nagula-ritvika Jun 13, 2020
cd37c64
update psd and changelog
nagula-ritvika Jun 13, 2020
80710e3
adding tests
nagula-ritvika Jun 15, 2020
2a66681
updating tests and help files
nagula-ritvika Jun 15, 2020
7314282
add test recording
nagula-ritvika Jun 15, 2020
b98d424
update help
nagula-ritvika Jun 16, 2020
f838ad8
handle resource not found in Get
nagula-ritvika Jun 16, 2020
613fe5d
Stub fake sub and rg in help file
nagula-ritvika Jun 16, 2020
52bfafc
Update Network SDK version
anton-evseev Jun 16, 2020
865745c
Merge remote-tracking branch 'remotes/upstream/master' into Add-RTv3-…
anton-evseev Jun 16, 2020
e65ce71
Add mapping in HubVirtualNetworkConnection cmdlets
anton-evseev Jun 16, 2020
b80b1b5
Merge remote-tracking branch 'remotes/upstream/master' into Add-RTv3-…
anton-evseev Jun 16, 2020
6c09848
fix update handling
nagula-ritvika Jun 16, 2020
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
2 changes: 1 addition & 1 deletion src/Batch/Batch.Test/Batch.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PackageReference Include="Microsoft.Azure.Batch" Version="13.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="11.0.0" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="7.3.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Compute/Compute.Test/Compute.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="36.1.0" />
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/CosmosDB/CosmosDB.Test/CosmosDB.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<Import Project="$(MSBuildThisFileDirectory)..\..\Az.Test.props" />
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.CosmosDB" Version="1.2.0" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/DataLakeStore/DataLakeStore.Test/DataLakeStore.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.2-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Dns/Dns.Test/Dns.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.1" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/KeyVault/KeyVault.Test/KeyVault.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
<PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.1" />
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Monitor/Monitor.Test/Monitor.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Monitor" Version="0.25.1-preview" />
<PackageReference Include="Microsoft.Azure.Management.ApplicationInsights" Version="0.3.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
<PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.21.0-preview" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.4.0" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Network/Network.Test/Network.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
<PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="36.1.0" />
<PackageReference Include="Microsoft.Azure.Management.ContainerInstance" Version="2.0.0" />
Expand Down
8 changes: 8 additions & 0 deletions src/Network/Network.Test/ScenarioTests/CortexTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,13 @@ public void TestCortexVirtualHubCRUD()
{
TestRunner.RunTestScript("Test-CortexVirtualHubCRUD");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.Owner, NrpTeamAlias.brooklynft)]
public void TestVHubRouteTableCRUD()
{
TestRunner.RunTestScript("Test-VHubRouteTableCRUD");
}
}
}
74 changes: 74 additions & 0 deletions src/Network/Network.Test/ScenarioTests/CortexTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,6 +892,80 @@ function Test-CortexVirtualHubCRUD
}
finally
{
Clean-ResourceGroup $rgname
}
}

function Test-VHubRouteTableCRUD
{
# Setup
$rgName = Get-ResourceName
$location = Get-ProviderLocation ResourceManagement "West Central US"

$virtualWanName = Get-ResourceName
$virtualHubName = Get-ResourceName
$defaultRouteTableName = "defaultRouteTable"
$noneRouteTableName = "noneRouteTable"
$customRouteTableName = "customRouteTable"
$firewallName = "azFwInVirtualHub"

try
{
# Create the resource group
New-AzResourceGroup -Name $rgName -Location $location

# Create the Virtual Wan
New-AzVirtualWan -ResourceGroupName $rgName -Name $virtualWanName -Location $location -VirtualWANType "Standard" -AllowVnetToVnetTraffic -AllowBranchToBranchTraffic
$virtualWan = Get-AzVirtualWan -ResourceGroupName $rgName -Name $virtualWanName

# Create the Virtual Hub
New-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName -Location $location -AddressPrefix "10.0.0.0/16" -VirtualWan $virtualWan
$virtualHub = Get-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName
Assert-AreEqual $rgName $virtualHub.ResourceGroupName
Assert-AreEqual $virtualHubName $virtualHub.Name
Assert-AreEqual "10.0.0.0/16" $virtualHub.AddressPrefix

# Create a firewall in the Virtual hub
$fwIp = New-AzFirewallHubPublicIpAddress -Count 1
$hubIpAddresses = New-AzFirewallHubIpAddress -PublicIP $fwIp
New-AzFirewall -Name $firewallName -ResourceGroupName $rgName -Location "westcentralus" -Sku AZFW_Hub -VirtualHubId $virtualHub.Id -HubIPAddress $hubIpAddresses
$firewall = Get-AzFirewall -Name $firewallName -ResourceGroupName $rgName

# Create new route
$route1 = New-AzVHubRoute -Name "private-traffic" -Destination @("10.30.0.0/16", "10.40.0.0/16") -DestinationType "CIDR" -NextHop $firewall.Id -NextHopType "ResourceId"

# Create new customRouteTable
New-AzVHubRouteTable -ResourceGroupName $rgName -VirtualHubName $virtualHubName -Name $customRouteTableName -Route @($route1) -Label @("customLabel")
$customRouteTable = Get-AzVHubRouteTable -ResourceGroupName $rgName -VirtualHubName $virtualHubName -Name $customRouteTableName
Assert-AreEqual $customRouteTableName $customRouteTable.Name
Assert-AreEqual 1 $customRouteTable.Routes.Count
Assert-AreEqual 1 $customRouteTable.Labels.Count

# Add one more route
$route2 = New-AzVHubRoute -Name "internet-traffic" -Destination @("0.0.0.0/0") -DestinationType "CIDR" -NextHop $firewall.Id -NextHopType "ResourceId"
Update-AzVHubRouteTable -ResourceGroupName $rgName -VirtualHubName $virtualHubName -Name $customRouteTableName -Route @($route2)
$updateCustomRouteTable = Get-AzVHubRouteTable -ResourceGroupName $rgName -VirtualHubName $virtualHubName -Name $customRouteTableName
Assert-AreEqual $customRouteTableName $updateCustomRouteTable.Name
Assert-AreEqual 1 $updateCustomRouteTable.Routes.Count
Assert-AreEqual 1 $customRouteTable.Labels.Count

# Delete the custom route table
$delete = Remove-AzVHubRouteTable -ResourceGroupName $rgName -VirtualHubName $virtualHubName -Name $customRouteTableName -Force -PassThru
Assert-AreEqual $True $delete
}
finally
{
# Delete the firewall
$delete = Remove-AzFirewall -Name $firewallName -ResourceGroupName $rgName -Force -PassThru
Assert-AreEqual $True $delete

# Delete the resources
$delete = Remove-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName -Force -PassThru
Assert-AreEqual $True $delete

$delete = Remove-AzVirtualWan -ResourceGroupName $rgName -Name $virtualWanName -Force -PassThru
Assert-AreEqual $True $delete

Clean-ResourceGroup $rgname
}
}
Loading