Skip to content

Commit 442f790

Browse files
nagula-ritvikaanton-evseev
nagula-ritvika
and
anton-evseev
authored
{VirtualWan} - Support HubRouteTables and RoutingConfiguration for June release (#12172)
* add new classes neede for vwan custom routing * added all rtv3 related cmdlets * update cmdlets for RoutingConfiguration * update help files * add 2 new cmdlets and help files * update psd and changelog * adding tests * updating tests and help files * add test recording * update help * handle resource not found in Get * Stub fake sub and rg in help file * Update Network SDK version * Add mapping in HubVirtualNetworkConnection cmdlets * fix update handling Co-authored-by: Anton Evseev <[email protected]>
1 parent b4c91ff commit 442f790

File tree

68 files changed

+20728
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+20728
-88
lines changed

‎src/Batch/Batch.Test/Batch.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Microsoft.Azure.Batch" Version="13.0.0" />
1818
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="11.0.0" />
1919
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
20-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
20+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj

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

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="7.3.0-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/Compute/Compute.Test/Compute.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
1515
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="36.1.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.0" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/CosmosDB/CosmosDB.Test/CosmosDB.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<Import Project="$(MSBuildThisFileDirectory)..\..\Az.Test.props" />
66
<ItemGroup>
77
<PackageReference Include="Microsoft.Azure.Management.CosmosDB" Version="1.2.0" />
8-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
8+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
99
</ItemGroup>
1010
</Project>

‎src/DataLakeStore/DataLakeStore.Test/DataLakeStore.Test.csproj

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

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.2-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Dns/Dns.Test/Dns.Test.csproj

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

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.1" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/KeyVault/KeyVault.Test/KeyVault.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
1515
<PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.1" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.0" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/Monitor/Monitor.Test/Monitor.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.Monitor" Version="0.25.1-preview" />
1515
<PackageReference Include="Microsoft.Azure.Management.ApplicationInsights" Version="0.3.0-preview" />
16-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
16+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
1717
<PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.21.0-preview" />
1818
</ItemGroup>
1919

‎src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj

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

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.4.0" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/Network/Network.Test/Network.Test.csproj

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

1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.2-preview" />
1818
<PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />
1919
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="36.1.0" />
2020
<PackageReference Include="Microsoft.Azure.Management.ContainerInstance" Version="2.0.0" />

‎src/Network/Network.Test/ScenarioTests/CortexTests.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,13 @@ public void TestCortexVirtualHubCRUD()
8282
{
8383
TestRunner.RunTestScript("Test-CortexVirtualHubCRUD");
8484
}
85+
86+
[Fact]
87+
[Trait(Category.AcceptanceType, Category.CheckIn)]
88+
[Trait(Category.Owner, NrpTeamAlias.brooklynft)]
89+
public void TestVHubRouteTableCRUD()
90+
{
91+
TestRunner.RunTestScript("Test-VHubRouteTableCRUD");
92+
}
8593
}
8694
}

‎src/Network/Network.Test/ScenarioTests/CortexTests.ps1

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -892,6 +892,80 @@ function Test-CortexVirtualHubCRUD
892892
}
893893
finally
894894
{
895+
Clean-ResourceGroup $rgname
896+
}
897+
}
898+
899+
function Test-VHubRouteTableCRUD
900+
{
901+
# Setup
902+
$rgName = Get-ResourceName
903+
$location = Get-ProviderLocation ResourceManagement "West Central US"
904+
905+
$virtualWanName = Get-ResourceName
906+
$virtualHubName = Get-ResourceName
907+
$defaultRouteTableName = "defaultRouteTable"
908+
$noneRouteTableName = "noneRouteTable"
909+
$customRouteTableName = "customRouteTable"
910+
$firewallName = "azFwInVirtualHub"
911+
912+
try
913+
{
914+
# Create the resource group
915+
New-AzResourceGroup -Name $rgName -Location $location
916+
917+
# Create the Virtual Wan
918+
New-AzVirtualWan -ResourceGroupName $rgName -Name $virtualWanName -Location $location -VirtualWANType "Standard" -AllowVnetToVnetTraffic -AllowBranchToBranchTraffic
919+
$virtualWan = Get-AzVirtualWan -ResourceGroupName $rgName -Name $virtualWanName
920+
921+
# Create the Virtual Hub
922+
New-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName -Location $location -AddressPrefix "10.0.0.0/16" -VirtualWan $virtualWan
923+
$virtualHub = Get-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName
924+
Assert-AreEqual $rgName $virtualHub.ResourceGroupName
925+
Assert-AreEqual $virtualHubName $virtualHub.Name
926+
Assert-AreEqual "10.0.0.0/16" $virtualHub.AddressPrefix
927+
928+
# Create a firewall in the Virtual hub
929+
$fwIp = New-AzFirewallHubPublicIpAddress -Count 1
930+
$hubIpAddresses = New-AzFirewallHubIpAddress -PublicIP $fwIp
931+
New-AzFirewall -Name $firewallName -ResourceGroupName $rgName -Location "westcentralus" -Sku AZFW_Hub -VirtualHubId $virtualHub.Id -HubIPAddress $hubIpAddresses
932+
$firewall = Get-AzFirewall -Name $firewallName -ResourceGroupName $rgName
933+
934+
# Create new route
935+
$route1 = New-AzVHubRoute -Name "private-traffic" -Destination @("10.30.0.0/16", "10.40.0.0/16") -DestinationType "CIDR" -NextHop $firewall.Id -NextHopType "ResourceId"
936+
937+
# Create new customRouteTable
938+
New-AzVHubRouteTable -ResourceGroupName $rgName -VirtualHubName $virtualHubName -Name $customRouteTableName -Route @($route1) -Label @("customLabel")
939+
$customRouteTable = Get-AzVHubRouteTable -ResourceGroupName $rgName -VirtualHubName $virtualHubName -Name $customRouteTableName
940+
Assert-AreEqual $customRouteTableName $customRouteTable.Name
941+
Assert-AreEqual 1 $customRouteTable.Routes.Count
942+
Assert-AreEqual 1 $customRouteTable.Labels.Count
943+
944+
# Add one more route
945+
$route2 = New-AzVHubRoute -Name "internet-traffic" -Destination @("0.0.0.0/0") -DestinationType "CIDR" -NextHop $firewall.Id -NextHopType "ResourceId"
946+
Update-AzVHubRouteTable -ResourceGroupName $rgName -VirtualHubName $virtualHubName -Name $customRouteTableName -Route @($route2)
947+
$updateCustomRouteTable = Get-AzVHubRouteTable -ResourceGroupName $rgName -VirtualHubName $virtualHubName -Name $customRouteTableName
948+
Assert-AreEqual $customRouteTableName $updateCustomRouteTable.Name
949+
Assert-AreEqual 1 $updateCustomRouteTable.Routes.Count
950+
Assert-AreEqual 1 $customRouteTable.Labels.Count
951+
952+
# Delete the custom route table
953+
$delete = Remove-AzVHubRouteTable -ResourceGroupName $rgName -VirtualHubName $virtualHubName -Name $customRouteTableName -Force -PassThru
954+
Assert-AreEqual $True $delete
955+
}
956+
finally
957+
{
958+
# Delete the firewall
959+
$delete = Remove-AzFirewall -Name $firewallName -ResourceGroupName $rgName -Force -PassThru
960+
Assert-AreEqual $True $delete
961+
962+
# Delete the resources
963+
$delete = Remove-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName -Force -PassThru
964+
Assert-AreEqual $True $delete
965+
966+
$delete = Remove-AzVirtualWan -ResourceGroupName $rgName -Name $virtualWanName -Force -PassThru
967+
Assert-AreEqual $True $delete
968+
895969
Clean-ResourceGroup $rgname
896970
}
897971
}

0 commit comments

Comments
 (0)