merging with october-release

Author: venkatsvpr

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

@@ -481,4 +481,4 @@ function Test-CortexExpressRouteCRUD
     {
         Clean-ResourceGroup $rgname
     }
-}
+}

src/Network/Network.Test/ScenarioTests/VirtualHubRouteTableTests.cs

@@ -0,0 +1,39 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.Azure.Commands.Network.Test.ScenarioTests;
+
+namespace Commands.Network.Test.ScenarioTests
+{
+    using Microsoft.WindowsAzure.Commands.ScenarioTest;
+    using Xunit;
+    using Xunit.Abstractions;
+
+    public class VirtualHubRouteTableTests : NetworkTestRunner
+    {
+        public VirtualHubRouteTableTests(ITestOutputHelper output)
+            : base(output)
+        {
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, NrpTeamAlias.pgtm)]
+        public void TestVirtualHubRouteTableCRUD()
+        {
+            TestRunner.RunTestScript("Test-VirtualHubRouteTableCRUD");
+        }
+
+    }
+}

src/Network/Network.Test/ScenarioTests/VirtualHubRouteTableTests.ps1

@@ -0,0 +1,98 @@
+# ----------------------------------------------------------------------------------
+#
+# Copyright Microsoft Corporation
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ----------------------------------------------------------------------------------
+
+<#
+.SYNOPSIS
+VirtualHubRouteTableCRUD
+#>
+function Test-VirtualHubRouteTableCRUD
+{
+    # Setup
+    $rgName = Get-ResourceGroupName
+    $rglocation = Get-ProviderLocation "ResourceManagement" "westcentralus"
+
+    $virtualWanName = Get-ResourceName
+    $virtualHubName = Get-ResourceName
+    $expressRouteGatewayName = Get-ResourceName
+	$routeTable1Name = Get-ResourceName
+	$remoteVirtualNetworkName = Get-ResourceName
+
+    try
+    {
+        # Create the resource group
+        $resourceGroup = New-AzureRmResourceGroup -Name $rgName -Location $rglocation
+
+        # Create the Virtual Wan
+        $createdVirtualWan = New-AzureRmVirtualWan -ResourceGroupName $rgName -Name $virtualWanName -Location $rglocation -AllowVnetToVnetTraffic -AllowBranchToBranchTraffic
+        $virtualWan = Get-AzureRmVirtualWan -ResourceGroupName $rgName -Name $virtualWanName
+        Write-Debug "Created Virtual WAN $virtualWan.Name successfully"
+
+		# Create the Virtual Hub
+        $createdVirtualHub = New-AzureRmVirtualHub -ResourceGroupName $rgName -Name $virtualHubName -Location $rglocation -AddressPrefix "10.8.0.0/24" -VirtualWan $virtualWan
+        $virtualHub = Get-AzureRmVirtualHub -ResourceGroupName $rgName -Name $virtualHubName
+        Write-Debug "Created Virtual Hub virtualHub.Name successfully"
+
+        # Create the ExpressRouteGateway
+        $createdExpressRouteGateway = New-AzureRmExpressRouteGateway -ResourceGroupName $rgName -Name $expressRouteGatewayName -VirtualHub $virtualHub -MinScaleUnits 2
+        Write-Debug "Created ExpressRoute Gateway $expressRouteGatewayName successfully"
+        $expressRouteGateway = Get-AzureRmExpressRouteGateway -ResourceGroupName $rgName -Name $expressRouteGatewayName
+        Assert-NotNull $expressRouteGateway
+        Write-Debug "Retrieved ExpressRoute Gateway $expressRouteGatewayName successfully"
+
+		# Create a RouteTable child Resource
+		$route1 = Add-AzVirtualHubRoute -DestinationType "CIDR" -Destination @("10.4.0.0/16", "10.5.0.0/16") -NextHopType "IPAddress" -NextHop @("10.0.0.68")
+		$route2 = Add-AzVirtualHubRoute -DestinationType "CIDR" -Destination @("0.0.0.0/0") -NextHopType "IPAddress" -NextHop @("10.0.0.68")
+    	$routeTable1 = Add-AzVirtualHubRouteTable -Route @($route1, $route2) -Connection @("All_Vnets") -Name $routeTable1Name
+		Set-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName -RouteTable @($routeTable1)
+		$virtualHub = Get-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName
+		Assert-AreEqual $virtualHubName $virtualHub.Name
+		$routeTables = $virtualHub.RouteTables
+		Assert-AreEqual 1 @($routeTables).Count
+		$routes1 = $routeTables[0].Routes
+		Assert-AreEqual 2 @($routes1).Count
+
+		# Update a RouteTable child resource
+		$routeTable1 = Get-AzVirtualHubRouteTable -ResourceGroupName $rgName -HubName $virtualHubName -Name $routeTable1Name
+		$routeTable1.Routes.RemoveAt(1)
+		$routeTable1.Routes[0].NextHops = @("10.0.0.67")
+		$routeTable1.Connections = @("All_Branches")
+		Set-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName -RouteTable @($routeTable1)
+		$virtualHub = Get-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName
+		Assert-AreEqual $virtualHubName $virtualHub.Name
+		$routeTables = $virtualHub.RouteTables
+		Assert-AreEqual 1 @($routeTables).Count
+		$routes1 = $routeTables[0].Routes
+		Assert-AreEqual 1 @($routes1).Count
+
+		# Delete a RouteTable child resource
+		Remove-AzVirtualHubRouteTable -ResourceGroupName $rgName -HubName $virtualHubName -Name $routeTable1Name -Force
+		$virtualHub = Get-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName
+		Assert-AreEqual $virtualHubName $virtualHub.Name
+		$routeTables = $virtualHub.RouteTables
+		Assert-AreEqual 0 @($routeTables).Count
+		
+        # Clean up
+        Remove-AzureRmExpressRouteGateway -ResourceGroupName $rgName -Name $expressRouteGatewayName -Force
+        Assert-ThrowsLike { Get-AzureRmExpressRouteGateway -ResourceGroupName $rgName -Name $expressRouteGatewayName } "*Not*Found*"
+
+        Remove-AzureRmVirtualHub -ResourceGroupName $rgName -Name $virtualHubName -Force
+
+        Remove-AzureRmVirtualWan -ResourceGroupName $rgName -Name $virtualWanName -Force
+        Assert-ThrowsLike { Get-AzureRmVirtualWan -ResourceGroupName $rgName -Name $virtualWanName } "*Not*Found*"
+    }
+    finally
+    {
+        Clean-ResourceGroup $rgname
+    }
+}