diff --git a/src/Peering/Peering.Test/Peering.Test.csproj b/src/Peering/Peering.Test/Peering.Test.csproj
index 7e3eb4899ef9..a8fd0a65807c 100644
--- a/src/Peering/Peering.Test/Peering.Test.csproj
+++ b/src/Peering/Peering.Test/Peering.Test.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/src/Peering/Peering.Test/ScenarioTests/ConvertLegacyTests.ps1 b/src/Peering/Peering.Test/ScenarioTests/ConvertLegacyTests.ps1
index 65fbabc14d91..d44862d97da0 100644
--- a/src/Peering/Peering.Test/ScenarioTests/ConvertLegacyTests.ps1
+++ b/src/Peering/Peering.Test/ScenarioTests/ConvertLegacyTests.ps1
@@ -18,8 +18,8 @@ GetLocationKindExchange
function Test-ConvertLegacyKindExchangeAshburn {
try {
#must be hard coded asn because they have legacy items.
- $peerAsn = makePeerAsn 42;
- $name = getPeeringVariable "Name" "AS42_Ashburn_Exchange"
+ $peerAsn = makePeerAsn 1828;
+ $name = getPeeringVariable "Name" "AS1828_Ashburn_Exchange"
$rg = getPeeringVariable "ResourceGroupName" "Building40"
$legacy = Get-AzLegacyPeering -Kind Exchange -PeeringLocation Ashburn
Assert-NotNull $peerAsn.Id
@@ -42,15 +42,15 @@ Convert Legacy Kind Exchange Amsterdam With New Connection
function Test-ConvertLegacyKindExchangeAmsterdamWithNewConnection {
try {
#must be hard coded asn because they have legacy items.
- $peerAsn = makePeerAsn 42
- $name = getPeeringVariable "Name" "AS42_Amsterdam_Exchange"
+ $peerAsn = makePeerAsn 559
+ $name = getPeeringVariable "Name" "AS559_Amsterdam_Exchange"
$rg = getPeeringVariable "ResourceGroupName" "Building40"
$legacy = Get-AzLegacyPeering -Kind Exchange -PeeringLocation Amsterdam
Assert-NotNull $legacy
Assert-True { $legacy.Count -ge 1 }
#has to be hard coded becuase this ip address isnt used.
#testing trim
- $ipaddress = getPeeringVariable "ipaddress" " 80.249.211.62 "
+ $ipaddress = getPeeringVariable "ipaddress" " 80.249.208.37 "
$facilityId = 26
$maxv4 = maxAdvertisedIpv4
$connection = New-AzPeeringExchangeConnectionObject -PeeringDbFacilityId $facilityId -MaxPrefixesAdvertisedIPv4 $maxv4 -PeerSessionIPv4Address $ipaddress
diff --git a/src/Peering/Peering.Test/ScenarioTests/CreateNewDirectConnectionTests.ps1 b/src/Peering/Peering.Test/ScenarioTests/CreateNewDirectConnectionTests.ps1
index f042bf2f6cc2..1bc7b28bc4f1 100644
--- a/src/Peering/Peering.Test/ScenarioTests/CreateNewDirectConnectionTests.ps1
+++ b/src/Peering/Peering.Test/ScenarioTests/CreateNewDirectConnectionTests.ps1
@@ -38,7 +38,7 @@ function Test-NewDirectConnectionWithV4V6 {
$createdConnection = New-AzPeeringDirectConnectionObject -PeeringDbFacilityId $facilityId -SessionPrefixV4 $sessionv4 -SessionPrefixV6 $sessionv6 -MaxPrefixesAdvertisedIPv4 $maxv4 -MaxPrefixesAdvertisedIPv6 $maxv6 -BandwidthInMbps $bandwidth -MD5AuthenticationKey $md5
Assert-AreEqual $md5 $createdConnection.BgpSession.Md5AuthenticationKey
Assert-AreEqual $bandwidth $createdConnection.BandwidthInMbps
- Assert-AreEqual $facilityId $createdConnection.PeeringDBFacilityId
+ Assert-AreEqual $facilityId $createdConnection.PeeringDBFacilityId
Assert-AreEqual $sessionv4 $createdConnection.BgpSession.SessionPrefixV4
Assert-AreEqual $sessionv6 $createdConnection.BgpSession.SessionPrefixV6
Assert-AreEqual $false $createdConnection.UseForPeeringService
@@ -152,7 +152,7 @@ function Test-NewDirectConnectionNoSession {
}
<#
.SYNOPSIS
-NewDirectConnectionWithV6 should fail with high BandwidthInMbps message
+NewDirectConnectionWithV6 should allow high BandwidthInMbps and pass
#>
function Test-NewDirectConnectionHighBandwidth {
$asn = makePeerAsn (getRandomNumber)
@@ -162,23 +162,26 @@ function Test-NewDirectConnectionHighBandwidth {
$peeringLocation = getPeeringLocation $kind $loc;
$facilityId = $peeringLocation[0].PeeringDBFacilityId
#Create some data for the object
- #Set up the wrong BandwidthInMbps
+ #Set up the BandwidthInMbps in multiples of 100G
$bandwidth = getBandwidth
- #Anything over 100000 will fail.
+ #Multiples of 100000 should pass.
$bandwidth = [int]$bandwidth * 10
Write-Debug "Creating Connection at $facilityId"
$md5 = getHash
$md5 = $md5.ToString()
Write-Debug "Created Hash $md5"
$sessionv4 = newIpV4Address $true $true 0 0
- $sessionv6 = newIpV6Address $true $true 0 0
- Write-Debug "Created IPs $sessionv4 $SessionPrefixV6"
+ Write-Debug "Created IPs $sessionv4"
$maxv4 = maxAdvertisedIpv4
- $maxv6 = maxAdvertisedIpv6
- Write-Debug "Created maxAdvertised $maxv4 $maxv6"
+ Write-Debug "Created maxAdvertised $maxv4"
#create Connection
- Assert-ThrowsContains { New-AzPeeringDirectConnectionObject -PeeringDbFacilityId $facilityId -SessionPrefixV6 $sessionv6 -MaxPrefixesAdvertisedIPv6 $maxv6 -BandwidthInMbps $bandwidth -MD5AuthenticationKey $md5 } "The $bandwidth argument is greater than the maximum allowed range of 100000"
-
+ $createdConnection = New-AzPeeringDirectConnectionObject -PeeringDbFacilityId $facilityId -SessionPrefixV4 $sessionv4 -MaxPrefixesAdvertisedIPv4 $maxv4 -BandwidthInMbps $bandwidth -MD5AuthenticationKey $md5
+ Assert-AreEqual $md5 $createdConnection.BgpSession.Md5AuthenticationKey
+ Assert-AreEqual $bandwidth $createdConnection.BandwidthInMbps
+ Assert-AreEqual $facilityId $createdConnection.PeeringDBFacilityId
+ Assert-AreEqual $sessionv4 $createdConnection.BgpSession.SessionPrefixV4
+ Assert-AreEqual $false $createdConnection.UseForPeeringService
+ Assert-AreEqual "Peer" $createdConnection.SessionAddressProvider
removePeerAsn $asn
}
diff --git a/src/Peering/Peering.Test/ScenarioTests/CreateNewDirectPeeringTests.ps1 b/src/Peering/Peering.Test/ScenarioTests/CreateNewDirectPeeringTests.ps1
index d2d03cd98fa0..8568a15e217d 100644
--- a/src/Peering/Peering.Test/ScenarioTests/CreateNewDirectPeeringTests.ps1
+++ b/src/Peering/Peering.Test/ScenarioTests/CreateNewDirectPeeringTests.ps1
@@ -32,7 +32,7 @@ function Test-NewDirectPeering
Write-Debug "Random Number $randNum";
$peerAsn = makePeerAsn $randNum
$asn = Get-AzPeerAsn -Name $peerAsn.Name
- $facilityId = $peeringLocation[0].PeeringDBFacilityId
+ $facilityId = 104
#create Connection
$bandwidth = getBandwidth
$directConnection = NewDirectConnectionV4V6 $facilityId $bandwidth
@@ -203,7 +203,7 @@ function Test-NewDirectPeeringPremiumDirectUnlimited
$resourceName = getAssetName "DirectOneConnection";
Write-Debug "Setting $resourceName"
$peeringLocation = getPeeringLocation $kind $loc;
- $facilityId = $peeringLocation[0].PeeringDBFacilityId
+ $facilityId = 1236
#create Connection
$bandwidth = getBandwidth
$bandwidth2 = getBandwidth
diff --git a/src/Peering/Peering.Test/ScenarioTests/CreateNewExchangePeeringTests.ps1 b/src/Peering/Peering.Test/ScenarioTests/CreateNewExchangePeeringTests.ps1
index 71d4b74b9d1d..df13d163d137 100644
--- a/src/Peering/Peering.Test/ScenarioTests/CreateNewExchangePeeringTests.ps1
+++ b/src/Peering/Peering.Test/ScenarioTests/CreateNewExchangePeeringTests.ps1
@@ -20,7 +20,7 @@ function Test-NewExchangePeering()
#Hard Coded locations becuase of limitations in locations
$resourceName = getAssetName "NewExchangePeeringCVS"
$resourceGroup = "testCarrier"
- $peeringLocation = "Seattle"
+ $peeringLocation = "Ashburn"
$kind = IsDirect $false
Write-Debug "Getting the Facility Information"
try {
diff --git a/src/Peering/Peering.Test/ScenarioTests/GetCdnPeeringPrefixTests.cs b/src/Peering/Peering.Test/ScenarioTests/GetCdnPeeringPrefixTests.cs
new file mode 100644
index 000000000000..1f4fa6bebecf
--- /dev/null
+++ b/src/Peering/Peering.Test/ScenarioTests/GetCdnPeeringPrefixTests.cs
@@ -0,0 +1,63 @@
+// ----------------------------------------------------------------------------------
+//
+// 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.
+// ----------------------------------------------------------------------------------
+
+namespace Microsoft.Azure.Commands.Peering.Test.ScenarioTests
+{
+ using Microsoft.WindowsAzure.Commands.ScenarioTest;
+
+ using Xunit;
+
+ ///
+ /// The get cdn peering prefixes tests.
+ ///
+ public class GetCdnPeeringPrefixTests
+ {
+ ///
+ /// The logger.
+ ///
+ private ServiceManagement.Common.Models.XunitTracingInterceptor logger;
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ ///
+ /// The output.
+ ///
+ public GetCdnPeeringPrefixTests(Xunit.Abstractions.ITestOutputHelper output)
+ {
+ this.logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
+ ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(this.logger);
+ }
+
+ ///
+ /// The test Get Cdn Peering Prefix For Location.
+ ///
+ [Fact]
+ [Trait(Category.AcceptanceType, Category.CheckIn)]
+ public void TestGetCdnPeeringPrefixForLocation()
+ {
+ TestController.NewInstance.RunPowerShellTest(this.logger, "Test-GetCdnPeeringPrefixForLocation");
+ }
+
+ ///
+ /// The test Get Cdn Peering Prefix NonExistent Location.
+ ///
+ [Fact]
+ [Trait(Category.AcceptanceType, Category.CheckIn)]
+ public void TestGetCdnPeeringPrefixNonExistentLocation()
+ {
+ TestController.NewInstance.RunPowerShellTest(this.logger, "Test-GetCdnPeeringPrefixNonExistentLocation");
+ }
+ }
+}
diff --git a/src/Peering/Peering.Test/ScenarioTests/GetCdnPeeringPrefixTests.ps1 b/src/Peering/Peering.Test/ScenarioTests/GetCdnPeeringPrefixTests.ps1
new file mode 100644
index 000000000000..bbb47b92c37e
--- /dev/null
+++ b/src/Peering/Peering.Test/ScenarioTests/GetCdnPeeringPrefixTests.ps1
@@ -0,0 +1,30 @@
+# ----------------------------------------------------------------------------------
+#
+# 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
+GetCdnPeeringPrefixForLocation
+#>
+function Test-GetCdnPeeringPrefixForLocation {
+ $cdnPeeringPrefix = Get-AzPeeringCdnPeeringPrefix -PeeringLocation "Seattle"
+ Assert-NotNull $cdnPeeringPrefix
+ Assert-True { $cdnPeeringPrefix.Count -eq 4 }
+}
+<