Skip to content

Commit 5ead947

Browse files
markcowlmarkcowl
committed
Merge pull request #618 from DeepakRajendranMsft/RouteNextHopTypeFix
RouteNextHopTypeFix
2 parents 6d80faf + 009e568 commit 5ead947

File tree

12 files changed

+1149
-14
lines changed

12 files changed

+1149
-14
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.8-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
75-
<Private>True</Private>
74+
<SpecificVersion>False</SpecificVersion>
75+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.9-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
7676
</Reference>
7777
<Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7878
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>

‎src/ResourceManager/Compute/Commands.Compute.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Authorization" version="0.19.2-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Compute" version="7.0.0-preview" targetFramework="net45" />
11-
<package id="Microsoft.Azure.Management.Network" version="2.0.8-preview" targetFramework="net45" />
11+
<package id="Microsoft.Azure.Management.Network" version="2.0.9-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
1414
<package id="Microsoft.Azure.Test.Framework" version="1.0.5571.32271-prerelease" targetFramework="net45" />

‎src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
<Private>True</Private>
8383
</Reference>
8484
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.8-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
86-
<Private>True</Private>
85+
<SpecificVersion>False</SpecificVersion>
86+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.9-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
8787
</Reference>
8888
<Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8989
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>

‎src/ResourceManager/Compute/Commands.Compute/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Authorization" version="0.19.2-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Compute" version="7.0.0-preview" targetFramework="net45" />
12-
<package id="Microsoft.Azure.Management.Network" version="2.0.8-preview" targetFramework="net45" />
12+
<package id="Microsoft.Azure.Management.Network" version="2.0.9-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
1414
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
1515
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
<SpecificVersion>False</SpecificVersion>
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6868
</Reference>
69-
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.8-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
69+
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.9-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -194,7 +194,8 @@
194194
</None>
195195
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ApplicationGatewayTests\TestApplicationGatewayCRUD.json">
196196
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
197-
</None> <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestCreateEmptyLoadBalancer.json">
197+
</None>
198+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestCreateEmptyLoadBalancer.json">
198199
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
199200
</None>
200201
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerCRUDInternalDynamic.json">
@@ -257,6 +258,9 @@
257258
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestEmptyRouteTable.json">
258259
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
259260
</None>
261+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestRouteHopTypeTest.json">
262+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
263+
</None>
260264
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestRouteTableCRUD.json">
261265
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
262266
</None>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,11 @@ public void TestRouteTableRouteCRUD()
4747
NetworkResourcesController.NewInstance.RunPsTest("Test-RouteTableRouteCRUD");
4848
}
4949

50+
[Fact]
51+
[Trait(Category.AcceptanceType, Category.CheckIn)]
52+
public void TestRouteHopTypeTest()
53+
{
54+
NetworkResourcesController.NewInstance.RunPsTest("Test-RouteHopTypeTest");
55+
}
5056
}
5157
}

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,4 +313,64 @@ function Test-RouteTableRouteCRUD
313313
# Cleanup
314314
Clean-ResourceGroup $rgname
315315
}
316+
}
317+
318+
<#
319+
.SYNOPSIS
320+
Tests RouteTable Hoptype Test
321+
#>
322+
function Test-RouteHopTypeTest
323+
{
324+
# Setup
325+
$rgname = Get-ResourceGroupName
326+
$routeTableName = Get-ResourceName
327+
$vnetName = Get-ResourceName
328+
$subnetName = Get-ResourceName
329+
$domainNameLabel = Get-ResourceName
330+
$rglocation = Get-ProviderLocation ResourceManagement
331+
$resourceTypeParent = "Microsoft.Network/routeTables"
332+
$location = Get-ProviderLocation $resourceTypeParent
333+
334+
try
335+
{
336+
# Create the resource group
337+
$resourceGroup = New-AzureResourceGroup -Name $rgname -Location $rglocation -Tags @{Name = "testtag"; Value = "testval"}
338+
339+
$route1 = New-AzureRouteConfig -name "route1" -AddressPrefix "192.168.1.0/24" -NextHopIpAddress "23.108.1.1" -NextHopType "VirtualAppliance"
340+
$route2 = New-AzureRouteConfig -name "route2" -AddressPrefix "10.0.1.0/24" -NextHopType "VnetLocal"
341+
$route3 = New-AzureRouteConfig -name "route3" -AddressPrefix "0.0.0.0/0" -NextHopType "Internet"
342+
$route4 = New-AzureRouteConfig -name "route4" -AddressPrefix "10.0.2.0/24" -NextHopType "None"
343+
344+
# Create RouteTable
345+
$rt = New-AzureRouteTable -name $routeTableName -ResourceGroupName $rgname -Location $location -Route $route1, $route2, $route3, $route4
346+
347+
# Get RouteTable
348+
$getRT = Get-AzureRouteTable -name $routeTableName -ResourceGroupName $rgName
349+
350+
#verification
351+
Assert-AreEqual $rgName $getRT.ResourceGroupName
352+
Assert-AreEqual $routeTableName $getRT.Name
353+
Assert-NotNull $getRT.Etag
354+
Assert-AreEqual 4 @($getRT.Routes).Count
355+
Assert-AreEqual $getRT.Routes[0].Name "route1"
356+
Assert-AreEqual $getRT.Routes[0].NextHopType "VirtualAppliance"
357+
Assert-AreEqual $getRT.Routes[1].Name "route2"
358+
Assert-AreEqual $getRT.Routes[1].NextHopType "VnetLocal"
359+
Assert-AreEqual $getRT.Routes[2].Name "route3"
360+
Assert-AreEqual $getRT.Routes[2].NextHopType "Internet"
361+
Assert-AreEqual $getRT.Routes[3].Name "route4"
362+
Assert-AreEqual $getRT.Routes[3].NextHopType "None"
363+
364+
# Delete RouteTable
365+
$delete = Remove-AzureRouteTable -ResourceGroupName $rgname -name $routeTableName -PassThru -Force
366+
Assert-AreEqual true $delete
367+
368+
$list = Get-AzureRouteTable -ResourceGroupName $rgname
369+
Assert-AreEqual 0 @($list).Count
370+
}
371+
finally
372+
{
373+
# Cleanup
374+
Clean-ResourceGroup $rgname
375+
}
316376
}

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.RouteTableTests/TestRouteHopTypeTest.json

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

‎src/ResourceManager/Network/Commands.Network.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Authorization" version="0.19.2-preview" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Management.Network" version="2.0.8-preview" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.Network" version="2.0.9-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.5571.32271-prerelease" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5571.32271-prerelease" targetFramework="net45" />

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
7474
</Reference>
7575
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
76-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.8-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
76+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.9-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
7777
<Private>True</Private>
7878
</Reference>
7979
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -224,7 +224,8 @@
224224
<Compile Include="RouteTable\Route\NewAzureRouteConfigCommand.cs" />
225225
<Compile Include="RouteTable\Route\RemoveAzureRouteConfigCommand.cs" />
226226
<Compile Include="RouteTable\Route\SetAzureRouteConfigCommand.cs" />
227-
<Compile Include="RouteTable\SetAzureRouteTableCommand.cs" /> <Compile Include="VirtualNetworkGateway\ChildResourceHelp.cs" />
227+
<Compile Include="RouteTable\SetAzureRouteTableCommand.cs" />
228+
<Compile Include="VirtualNetworkGateway\ChildResourceHelp.cs" />
228229
<Compile Include="VirtualNetworkGateway\VirtualNetworkGatewayBaseCmdlet.cs" />
229230
<Compile Include="VirtualNetworkGateway\GetAzureVirtualNetworkGatewayCommand.cs" />
230231
<Compile Include="VirtualNetworkGateway\NewAzureVirtualNetworkGatewayCommand.cs" />

‎src/ResourceManager/Network/Commands.Network/RouteTable/Route/AzureRouteConfigBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class AzureRouteConfigBase : NetworkBaseCmdlet
3636
HelpMessage = "The type of Azure hop the packet should be sent to.")]
3737
[ValidateSet(
3838
MNM.RouteNextHopType.Internet,
39-
MNM.RouteNextHopType.Null,
39+
MNM.RouteNextHopType.None,
4040
MNM.RouteNextHopType.VirtualAppliance,
4141
MNM.RouteNextHopType.VirtualNetworkGateway,
4242
MNM.RouteNextHopType.VnetLocal,

‎src/ResourceManager/Network/Commands.Network/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Authorization" version="0.19.2-preview" targetFramework="net45" />
11-
<package id="Microsoft.Azure.Management.Network" version="2.0.8-preview" targetFramework="net45" />
11+
<package id="Microsoft.Azure.Management.Network" version="2.0.9-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
1313
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1414
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

0 commit comments

Comments
 (0)