Skip to content

Commit 8e5d46e

Browse files
author
Hovsep
committed
Merge pull request #2333 from dihan0604/dev
Express route stats cmdlets
2 parents 79c5454 + 30ac17a commit 8e5d46e

27 files changed

+3091
-1474
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7171
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.4.4.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.4.5.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
7575
<Reference Include="Microsoft.Azure.Management.Storage, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/Compute/Commands.Compute.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.Graph.RBAC" version="1.9.0-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Compute" version="13.0.1-prerelease" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Management.Network" version="4.4.0-preview" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.Network" version="4.5.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.5945.28173-prerelease" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.0-preview" targetFramework="net45" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
</Reference>
8383
<Reference Include="Microsoft.Azure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8484
<SpecificVersion>False</SpecificVersion>
85-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.4.4.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
85+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.4.5.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
8686
<Private>True</Private>
8787
</Reference>
8888
<Reference Include="Microsoft.Azure.Management.Storage">

‎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.KeyVault.Core" version="1.0.0" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Compute" version="13.0.1-prerelease" targetFramework="net45" />
12-
<package id="Microsoft.Azure.Management.Network" version="4.4.0-preview" targetFramework="net45" />
12+
<package id="Microsoft.Azure.Management.Network" version="4.5.0-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
1414
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1515
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</Reference>
6666
<Reference Include="Microsoft.Azure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6767
<SpecificVersion>False</SpecificVersion>
68-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.4.4.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
68+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.4.5.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
6969
<Private>True</Private>
7070
</Reference>
7171
<Reference Include="Microsoft.Azure.ResourceManager">

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,35 @@ namespace Commands.Network.Test.ScenarioTests
1919
{
2020
public class ExpressRouteCircuitTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
2121
{
22-
[Fact(Skip = "Rerecord tests")]
22+
[Fact]
2323
[Trait(Category.AcceptanceType, Category.CheckIn)]
2424
public void TestExpressRouteCircuitStageCRUD()
2525
{
2626
NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteCircuitStageCRUD");
2727
}
2828

29-
[Fact(Skip = "Rerecord tests")]
29+
[Fact]
3030
[Trait(Category.AcceptanceType, Category.CheckIn)]
3131
public void TestExpressRouteCircuitCRUD()
3232
{
3333
NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteCircuitCRUD");
3434
}
3535

36-
[Fact(Skip = "Rerecord tests")]
36+
[Fact]
3737
[Trait(Category.AcceptanceType, Category.CheckIn)]
3838
public void TestExpressRouteCircuitPrivatePublicPeeringCRUD()
3939
{
4040
NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteCircuitPrivatePublicPeeringCRUD");
4141
}
4242

43-
[Fact(Skip = "Rerecord tests")]
43+
[Fact]
4444
[Trait(Category.AcceptanceType, Category.CheckIn)]
4545
public void TestExpressRouteCircuitMicrosoftPeeringCRUD()
4646
{
4747
NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteCircuitMicrosoftPeeringCRUD");
4848
}
4949

50-
[Fact(Skip = "Rerecord tests")]
50+
[Fact]
5151
[Trait(Category.AcceptanceType, Category.CheckIn)]
5252
public void TestExpressRouteCircuitAuthorizationCRUD()
5353
{

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ function Test-ExpressRouteCircuitStageCRUD
3737
$circuit.AllowClassicOperations = $false
3838
$circuit = Set-AzureRmExpressRouteCircuit -ExpressRouteCircuit $circuit
3939

40+
$actual = Get-AzureRmExpressRouteCircuitStats -ResourceGroupName $rgname -ExpressRouteCircuitName $circuit.Name
41+
Assert-AreEqual $actual.PrimaryBytesIn 0
42+
43+
4044
#move
4145
Move-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname -Location $location -ServiceKey $circuit.ServiceKey -Force
4246

@@ -177,6 +181,10 @@ function Test-ExpressRouteCircuitPrivatePublicPeeringCRUD
177181
Assert-AreEqual "192.168.2.0/30" $circuit.Peerings[0].SecondaryPeerAddressPrefix
178182
Assert-AreEqual "22" $circuit.Peerings[0].VlanId
179183

184+
Get-AzureRmExpressRouteCircuitARPTable -ResourceGroupName $rgname -ExpressRouteCircuitName $circuit.Name -PeeringType AzurePrivatePeering -DevicePath Primary
185+
Get-AzureRmExpressRouteCircuitRouteTableSummary -ResourceGroupName $rgname -ExpressRouteCircuitName $circuit.Name -PeeringType AzurePrivatePeering -DevicePath Primary
186+
Get-AzureRmExpressRouteCircuitRouteTable -ResourceGroupName $rgname -ExpressRouteCircuitName $circuit.Name -PeeringType AzurePrivatePeering -DevicePath Primary
187+
180188
# get peering
181189
$p = $circuit | Get-AzureRmExpressRouteCircuitPeeringConfig -Name AzurePrivatePeering
182190
Assert-AreEqual "AzurePrivatePeering" $p.Name

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void TestVirtualNetworkGatewayConnectionSharedKeyCRUD()
3333
NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayConnectionSharedKeyCRUD");
3434
}
3535

36-
[Fact]
36+
[Fact(Skip = "Rerecord tests")]
3737
[Trait(Category.AcceptanceType, Category.CheckIn)]
3838
public void TestVirtualNetworkeExpressRouteGatewayConnectionCRUD()
3939
{

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ function Test-VirtualNetworkeExpressRouteGatewayConnectionCRUD
4444
Assert-AreEqual "ExpressRoute" $expected.ConnectionType
4545
Assert-AreEqual "3" $expected.RoutingWeight
4646

47-
47+
#get routes
48+
Get-AzureRmExpressRouteCircuitARPTable -ResourceGroupName $rgname -ExpressRouteCircuitName $circuit.Name -PeeringType AzurePrivatePeering -DevicePath Primary
49+
4850
# Delete VirtualNetworkGatewayConnection
4951
$delete = Remove-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName $actual.ResourceGroupName -name $vnetConnectionName -PassThru -Force
5052
Assert-AreEqual true $delete

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitAuthorizationCRUD.json

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

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitCRUD.json

Lines changed: 343 additions & 239 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitMicrosoftPeeringCRUD.json

Lines changed: 253 additions & 409 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitPrivatePublicPeeringCRUD.json

Lines changed: 786 additions & 423 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)