Skip to content

Several bug fixes for express route API #1608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 8, 2016
Merged

Several bug fixes for express route API #1608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b9fc639
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
dihan0604 Jan 7, 2016
fa18bcd
#5461728 bug fix for get-serviceprovider API
dihan0604 Jan 8, 2016
398aeb1
update version
dihan0604 Jan 8, 2016
4f56495
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
dihan0604 Jan 8, 2016
8b38ee6
Enable test for get-serviceprovider cmdlet
dihan0604 Jan 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.Network, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.3.0.4-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.3.1.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager">
Expand Down
2 changes: 1 addition & 1 deletion ...ceManager/Network/Commands.Network.Test/ScenarioTests/ExpressRouteServiceProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace Commands.Network.Test.ScenarioTests
{
public class ExpressRouteServiceProviderTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
{
[Fact(Skip = "Rerecord tests")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestExpressRouteServiceProviderList()
{
Expand Down
12 changes: 7 additions & 5 deletions ...eManager/Network/Commands.Network.Test/ScenarioTests/ExpressRouteServiceProviderTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ Tests ExpressRouteServiceProviderList.
function Test-ExpressRouteServiceProviderList
{
$providers = Get-AzureRmExpressRouteServiceProvider

Assert-AreNotEqual 0 @($providers).Count
Assert-AreNotEqual 0 @($providers[0].PeeringLocations).Count
Assert-AreNotEqual 0 @($providers[0].BandwidthsOffered).Count
Assert-NotNull $providers[0].Name
Assert-NotNull $providers
Assert-AreNotEqual 0 @($providers).Count
Assert-NotNull $providers[0].Name
Assert-NotNull $providers[0].PeeringLocations
Assert-NotNull $providers[0].BandwidthsOffered
Assert-AreNotEqual 0 @($providers[0].PeeringLocations).Count
Assert-AreNotEqual 0 @($providers[0].BandwidthsOffered).Count
}
26 changes: 16 additions & 10 deletions ...t.ScenarioTests.ExpressRouteServiceProviderTests/TestExpressRouteServiceProviderList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
{
"Entries": [
{
"RequestUri": "/subscriptions/9532a63e-f2eb-4649-bb23-5ed01077ce80/providers/Microsoft.Network/expressRouteServiceProviders?api-version=2015-05-01-preview",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOTUzMmE2M2UtZjJlYi00NjQ5LWJiMjMtNWVkMDEwNzdjZTgwL3Byb3ZpZGVycy9NaWNyb3NvZnQuTmV0d29yay9leHByZXNzUm91dGVTZXJ2aWNlUHJvdmlkZXJzP2FwaS12ZXJzaW9uPTIwMTUtMDUtMDEtcHJldmlldw==",
"RequestUri": "/subscriptions/9532a63e-f2eb-4649-bb23-5ed01077ce80/providers/Microsoft.Network/expressRouteServiceProviders?api-version=2015-06-15",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOTUzMmE2M2UtZjJlYi00NjQ5LWJiMjMtNWVkMDEwNzdjZTgwL3Byb3ZpZGVycy9NaWNyb3NvZnQuTmV0d29yay9leHByZXNzUm91dGVTZXJ2aWNlUHJvdmlkZXJzP2FwaS12ZXJzaW9uPTIwMTUtMDYtMTU=",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
"46d72a52-42f7-42e9-802e-0a6eb323ec89"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"Microsoft.Azure.Management.Network.NetworkResourceProviderClient/2.0.0.0"
"Microsoft.Azure.Management.Network.NetworkManagementClient/3.0.0.0"
]
},
"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}",
"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}",
"ResponseHeaders": {
"Content-Length": [
"1152"
"8284"
],
"Content-Type": [
"application/json; charset=utf-8"
Expand All @@ -25,7 +31,7 @@
"no-cache"
],
"x-ms-request-id": [
"db4d59f2-edf8-407a-b58b-483e934d89e7"
"502fb578-f6c7-4f35-b4c7-847e9a1e48c6"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
Expand All @@ -38,16 +44,16 @@
"Microsoft-HTTPAPI/2.0"
],
"x-ms-ratelimit-remaining-subscription-reads": [
"14970"
"14999"
],
"x-ms-correlation-request-id": [
"b9a38c7f-045d-4b51-af24-2a69cf405513"
"3c298b9b-2cf9-4fa4-84b5-4df87b7b06ed"
],
"x-ms-routing-request-id": [
"WESTUS:20151003T000540Z:b9a38c7f-045d-4b51-af24-2a69cf405513"
"WESTUS:20151218T200124Z:3c298b9b-2cf9-4fa4-84b5-4df87b7b06ed"
],
"Date": [
"Sat, 03 Oct 2015 00:05:39 GMT"
"Fri, 18 Dec 2015 20:01:24 GMT"
]
},
"StatusCode": 200
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Network/Commands.Network.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Network" version="3.0.4-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Network" version="3.1.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Test.Framework" version="1.0.5799.28345-prerelease" targetFramework="net45" />
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.4.0-preview" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Network/Commands.Network/Commands.Network.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.Network, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.3.0.4-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.3.1.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Network/Commands.Network/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Network" version="3.0.4-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Network" version="3.1.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
Expand Down