Skip to content

Commit 4485984

Browse files
author
Hovsep
committed
Merge pull request #1608 from dihan0604/dev
Several bug fixes for express route API
2 parents 94df2f0 + 8b38ee6 commit 4485984

File tree

7 files changed

+28
-20
lines changed

7 files changed

+28
-20
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.Network, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.3.0.4-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.3.1.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="Microsoft.Azure.ResourceManager">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Commands.Network.Test.ScenarioTests
1919
{
2020
public class ExpressRouteServiceProviderTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
2121
{
22-
[Fact(Skip = "Rerecord tests")]
22+
[Fact]
2323
[Trait(Category.AcceptanceType, Category.CheckIn)]
2424
public void TestExpressRouteServiceProviderList()
2525
{

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ Tests ExpressRouteServiceProviderList.
1919
function Test-ExpressRouteServiceProviderList
2020
{
2121
$providers = Get-AzureRmExpressRouteServiceProvider
22-
23-
Assert-AreNotEqual 0 @($providers).Count
24-
Assert-AreNotEqual 0 @($providers[0].PeeringLocations).Count
25-
Assert-AreNotEqual 0 @($providers[0].BandwidthsOffered).Count
26-
Assert-NotNull $providers[0].Name
22+
Assert-NotNull $providers
23+
Assert-AreNotEqual 0 @($providers).Count
24+
Assert-NotNull $providers[0].Name
25+
Assert-NotNull $providers[0].PeeringLocations
26+
Assert-NotNull $providers[0].BandwidthsOffered
27+
Assert-AreNotEqual 0 @($providers[0].PeeringLocations).Count
28+
Assert-AreNotEqual 0 @($providers[0].BandwidthsOffered).Count
2729
}

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ExpressRouteServiceProviderTests/TestExpressRouteServiceProviderList.json

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
{
22
"Entries": [
33
{
4-
"RequestUri": "/subscriptions/9532a63e-f2eb-4649-bb23-5ed01077ce80/providers/Microsoft.Network/expressRouteServiceProviders?api-version=2015-05-01-preview",
5-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOTUzMmE2M2UtZjJlYi00NjQ5LWJiMjMtNWVkMDEwNzdjZTgwL3Byb3ZpZGVycy9NaWNyb3NvZnQuTmV0d29yay9leHByZXNzUm91dGVTZXJ2aWNlUHJvdmlkZXJzP2FwaS12ZXJzaW9uPTIwMTUtMDUtMDEtcHJldmlldw==",
4+
"RequestUri": "/subscriptions/9532a63e-f2eb-4649-bb23-5ed01077ce80/providers/Microsoft.Network/expressRouteServiceProviders?api-version=2015-06-15",
5+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOTUzMmE2M2UtZjJlYi00NjQ5LWJiMjMtNWVkMDEwNzdjZTgwL3Byb3ZpZGVycy9NaWNyb3NvZnQuTmV0d29yay9leHByZXNzUm91dGVTZXJ2aWNlUHJvdmlkZXJzP2FwaS12ZXJzaW9uPTIwMTUtMDYtMTU=",
66
"RequestMethod": "GET",
77
"RequestBody": "",
88
"RequestHeaders": {
9+
"x-ms-client-request-id": [
10+
"46d72a52-42f7-42e9-802e-0a6eb323ec89"
11+
],
12+
"accept-language": [
13+
"en-US"
14+
],
915
"User-Agent": [
10-
"Microsoft.Azure.Management.Network.NetworkResourceProviderClient/2.0.0.0"
16+
"Microsoft.Azure.Management.Network.NetworkManagementClient/3.0.0.0"
1117
]
1218
},
13-
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"name\": \"Equinix\",\r\n \"id\": \"/subscriptions//resourceGroups//providers/Microsoft.Network/expressRouteServiceProviders/\",\r\n \"type\": \"Microsoft.Network/expressRouteServiceProviders\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"peeringLocations\": [\r\n \"Amsterdam\",\r\n \"Atlanta\",\r\n \"Chicago\",\r\n \"Dallas\",\r\n \"Hong Kong\",\r\n \"London\",\r\n \"Los Angeles\",\r\n \"Melbourne\",\r\n \"New York\",\r\n \"Sao Paulo\",\r\n \"Seattle\",\r\n \"Silicon Valley\",\r\n \"Singapore\",\r\n \"Sydney\",\r\n \"Tokyo\",\r\n \"Washington DC\"\r\n ],\r\n \"bandwidthsOffered\": [\r\n {\r\n \"offerName\": \"200Mbps\",\r\n \"valueInMbps\": 200\r\n },\r\n {\r\n \"offerName\": \"500Mbps\",\r\n \"valueInMbps\": 500\r\n },\r\n {\r\n \"offerName\": \"1Gbps\",\r\n \"valueInMbps\": 1000\r\n },\r\n {\r\n \"offerName\": \"10Gbps\",\r\n \"valueInMbps\": 10000\r\n }\r\n ]\r\n }\r\n }\r\n ]\r\n}",
19+
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"name\": \"AT&T Netbond Test\",\r\n \"id\": \"/subscriptions//resourceGroups//providers/Microsoft.Network/expressRouteServiceProviders/\",\r\n \"type\": \"Microsoft.Network/expressRouteServiceProviders\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"peeringLocations\": [\r\n \"Area51\",\r\n \"ASCVA001\",\r\n \"SN1CA001\"\r\n ],\r\n \"bandwidthsOffered\": [\r\n {\r\n \"offerName\": \"50Mbps\",\r\n \"valueInMbps\": 50\r\n },\r\n {\r\n \"offerName\": \"100Mbps\",\r\n \"valueInMbps\": 100\r\n },\r\n {\r\n \"offerName\": \"200Mbps\",\r\n \"valueInMbps\": 200\r\n },\r\n {\r\n \"offerName\": \"500Mbps\",\r\n \"valueInMbps\": 500\r\n },\r\n {\r\n \"offerName\": \"1Gbps\",\r\n \"valueInMbps\": 1000\r\n },\r\n {\r\n \"offerName\": \"2Gbps\",\r\n \"valueInMbps\": 2000\r\n },\r\n {\r\n \"offerName\": \"5Gbps\",\r\n \"valueInMbps\": 5000\r\n },\r\n {\r\n \"offerName\": \"10Gbps\",\r\n \"valueInMbps\": 10000\r\n }\r\n ]\r\n }\r\n },\r\n {\r\n \"name\": \"BT Test\",\r\n \"id\": \"/subscriptions//resourceGroups//providers/Microsoft.Network/expressRouteServiceProviders/\",\r\n \"type\": \"Microsoft.Network/expressRouteServiceProviders\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"peeringLocations\": [\r\n \"Area51\"\r\n ],\r\n \"bandwidthsOffered\": [\r\n {\r\n \"offerName\": \"50Mbps\",\r\n \"valueInMbps\": 50\r\n },\r\n {\r\n \"offerName\": \"100Mbps\",\r\n \"valueInMbps\": 100\r\n },\r\n {\r\n \"offerName\": \"200Mbps\",\r\n \"valueInMbps\": 200\r\n },\r\n {\r\n \"offerName\": \"500Mbps\",\r\n \"valueInMbps\": 500\r\n },\r\n {\r\n \"offerName\": \"1Gbps\",\r\n \"valueInMbps\": 1000\r\n },\r\n {\r\n \"offerName\": \"2Gbps\",\r\n \"valueInMbps\": 2000\r\n },\r\n {\r\n \"offerName\": \"5Gbps\",\r\n \"valueInMbps\": 5000\r\n },\r\n {\r\n \"offerName\": \"10Gbps\",\r\n \"valueInMbps\": 10000\r\n }\r\n ]\r\n }\r\n },\r\n {\r\n \"name\": \"Equinix Test\",\r\n \"id\": \"/subscriptions//resourceGroups//providers/Microsoft.Network/expressRouteServiceProviders/\",\r\n \"type\": \"Microsoft.Network/expressRouteServiceProviders\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"peeringLocations\": [\r\n \"Area51\",\r\n \"London Test\",\r\n \"Silicon Valley Test\",\r\n \"Singapore Test\"\r\n ],\r\n \"bandwidthsOffered\": [\r\n {\r\n \"offerName\": \"50Mbps\",\r\n \"valueInMbps\": 50\r\n },\r\n {\r\n \"offerName\": \"100Mbps\",\r\n \"valueInMbps\": 100\r\n },\r\n {\r\n \"offerName\": \"200Mbps\",\r\n \"valueInMbps\": 200\r\n },\r\n {\r\n \"offerName\": \"500Mbps\",\r\n \"valueInMbps\": 500\r\n },\r\n {\r\n \"offerName\": \"1Gbps\",\r\n \"valueInMbps\": 1000\r\n },\r\n {\r\n \"offerName\": \"2Gbps\",\r\n \"valueInMbps\": 2000\r\n },\r\n {\r\n \"offerName\": \"5Gbps\",\r\n \"valueInMbps\": 5000\r\n },\r\n {\r\n \"offerName\": \"10Gbps\",\r\n \"valueInMbps\": 10000\r\n }\r\n ]\r\n }\r\n },\r\n {\r\n \"name\": \"Interxion Test\",\r\n \"id\": \"/subscriptions//resourceGroups//providers/Microsoft.Network/expressRouteServiceProviders/\",\r\n \"type\": \"Microsoft.Network/expressRouteServiceProviders\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"peeringLocations\": [\r\n \"Area51\"\r\n ],\r\n \"bandwidthsOffered\": [\r\n {\r\n \"offerName\": \"50Mbps\",\r\n \"valueInMbps\": 50\r\n },\r\n {\r\n \"offerName\": \"100Mbps\",\r\n \"valueInMbps\": 100\r\n },\r\n {\r\n \"offerName\": \"200Mbps\",\r\n \"valueInMbps\": 200\r\n },\r\n {\r\n \"offerName\": \"500Mbps\",\r\n \"valueInMbps\": 500\r\n },\r\n {\r\n \"offerName\": \"1Gbps\",\r\n \"valueInMbps\": 1000\r\n },\r\n {\r\n \"offerName\": \"2Gbps\",\r\n \"valueInMbps\": 2000\r\n },\r\n {\r\n \"offerName\": \"5Gbps\",\r\n \"valueInMbps\": 5000\r\n },\r\n {\r\n \"offerName\": \"10Gbps\",\r\n \"valueInMbps\": 10000\r\n }\r\n ]\r\n }\r\n },\r\n {\r\n \"name\": \"Microsoft ER Test\",\r\n \"id\": \"/subscriptions//resourceGroups//providers/Microsoft.Network/expressRouteServiceProviders/\",\r\n \"type\": \"Microsoft.Network/expressRouteServiceProviders\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"peeringLocations\": [\r\n \"Area51\"\r\n ],\r\n \"bandwidthsOffered\": [\r\n {\r\n \"offerName\": \"50Mbps\",\r\n \"valueInMbps\": 50\r\n },\r\n {\r\n \"offerName\": \"100Mbps\",\r\n \"valueInMbps\": 100\r\n },\r\n {\r\n \"offerName\": \"200Mbps\",\r\n \"valueInMbps\": 200\r\n },\r\n {\r\n \"offerName\": \"500Mbps\",\r\n \"valueInMbps\": 500\r\n },\r\n {\r\n \"offerName\": \"1Gbps\",\r\n \"valueInMbps\": 1000\r\n },\r\n {\r\n \"offerName\": \"2Gbps\",\r\n \"valueInMbps\": 2000\r\n },\r\n {\r\n \"offerName\": \"5Gbps\",\r\n \"valueInMbps\": 5000\r\n },\r\n {\r\n \"offerName\": \"10Gbps\",\r\n \"valueInMbps\": 10000\r\n }\r\n ]\r\n }\r\n },\r\n {\r\n \"name\": \"NTT Test\",\r\n \"id\": \"/subscriptions//resourceGroups//providers/Microsoft.Network/expressRouteServiceProviders/\",\r\n \"type\": \"Microsoft.Network/expressRouteServiceProviders\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"peeringLocations\": [\r\n \"Area51\"\r\n ],\r\n \"bandwidthsOffered\": [\r\n {\r\n \"offerName\": \"50Mbps\",\r\n \"valueInMbps\": 50\r\n },\r\n {\r\n \"offerName\": \"100Mbps\",\r\n \"valueInMbps\": 100\r\n },\r\n {\r\n \"offerName\": \"200Mbps\",\r\n \"valueInMbps\": 200\r\n },\r\n {\r\n \"offerName\": \"500Mbps\",\r\n \"valueInMbps\": 500\r\n },\r\n {\r\n \"offerName\": \"1Gbps\",\r\n \"valueInMbps\": 1000\r\n },\r\n {\r\n \"offerName\": \"2Gbps\",\r\n \"valueInMbps\": 2000\r\n },\r\n {\r\n \"offerName\": \"5Gbps\",\r\n \"valueInMbps\": 5000\r\n },\r\n {\r\n \"offerName\": \"10Gbps\",\r\n \"valueInMbps\": 10000\r\n }\r\n ]\r\n }\r\n },\r\n {\r\n \"name\": \"PCCW Test\",\r\n \"id\": \"/subscriptions//resourceGroups//providers/Microsoft.Network/expressRouteServiceProviders/\",\r\n \"type\": \"Microsoft.Network/expressRouteServiceProviders\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"peeringLocations\": [\r\n \"Area51\"\r\n ],\r\n \"bandwidthsOffered\": [\r\n {\r\n \"offerName\": \"50Mbps\",\r\n \"valueInMbps\": 50\r\n },\r\n {\r\n \"offerName\": \"100Mbps\",\r\n \"valueInMbps\": 100\r\n },\r\n {\r\n \"offerName\": \"200Mbps\",\r\n \"valueInMbps\": 200\r\n },\r\n {\r\n \"offerName\": \"500Mbps\",\r\n \"valueInMbps\": 500\r\n },\r\n {\r\n \"offerName\": \"1Gbps\",\r\n \"valueInMbps\": 1000\r\n },\r\n {\r\n \"offerName\": \"2Gbps\",\r\n \"valueInMbps\": 2000\r\n },\r\n {\r\n \"offerName\": \"5Gbps\",\r\n \"valueInMbps\": 5000\r\n },\r\n {\r\n \"offerName\": \"10Gbps\",\r\n \"valueInMbps\": 10000\r\n }\r\n ]\r\n }\r\n }\r\n ]\r\n}",
1420
"ResponseHeaders": {
1521
"Content-Length": [
16-
"1152"
22+
"8284"
1723
],
1824
"Content-Type": [
1925
"application/json; charset=utf-8"
@@ -25,7 +31,7 @@
2531
"no-cache"
2632
],
2733
"x-ms-request-id": [
28-
"db4d59f2-edf8-407a-b58b-483e934d89e7"
34+
"502fb578-f6c7-4f35-b4c7-847e9a1e48c6"
2935
],
3036
"Strict-Transport-Security": [
3137
"max-age=31536000; includeSubDomains"
@@ -38,16 +44,16 @@
3844
"Microsoft-HTTPAPI/2.0"
3945
],
4046
"x-ms-ratelimit-remaining-subscription-reads": [
41-
"14970"
47+
"14999"
4248
],
4349
"x-ms-correlation-request-id": [
44-
"b9a38c7f-045d-4b51-af24-2a69cf405513"
50+
"3c298b9b-2cf9-4fa4-84b5-4df87b7b06ed"
4551
],
4652
"x-ms-routing-request-id": [
47-
"WESTUS:20151003T000540Z:b9a38c7f-045d-4b51-af24-2a69cf405513"
53+
"WESTUS:20151218T200124Z:3c298b9b-2cf9-4fa4-84b5-4df87b7b06ed"
4854
],
4955
"Date": [
50-
"Sat, 03 Oct 2015 00:05:39 GMT"
56+
"Fri, 18 Dec 2015 20:01:24 GMT"
5157
]
5258
},
5359
"StatusCode": 200

‎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="1.0.0" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Management.Network" version="3.0.4-preview" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.Network" version="3.1.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.5799.28345-prerelease" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.4.0-preview" targetFramework="net45" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
7878
</Reference>
7979
<Reference Include="Microsoft.Azure.Management.Network, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.3.0.4-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
80+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.3.1.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
8181
<Private>True</Private>
8282
</Reference>
8383
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/Network/Commands.Network/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.KeyVault.Core" version="1.0.0" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
12-
<package id="Microsoft.Azure.Management.Network" version="3.0.4-preview" targetFramework="net45" />
12+
<package id="Microsoft.Azure.Management.Network" version="3.1.0-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" 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" />

0 commit comments

Comments
 (0)