Skip to content

Enable PS test for ER and couple bug fix #1844

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 3 commits into from
Feb 23, 2016
Merged

Enable PS test for ER and couple bug fix #1844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
909acb4
Bug fix: Make parameter mandatory
dihan0604 Feb 5, 2016
feaf59b
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
dihan0604 Feb 22, 2016
51da91d
enable ER test
dihan0604 Feb 23, 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
4 changes: 2 additions & 2 deletions src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/ExpressRouteCircuitTests.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 ExpressRouteCircuitTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
{
[Fact(Skip = "Rerecord tests")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestExpressRouteCircuitCRUD()
{
Expand All @@ -33,7 +33,7 @@ public void TestExpressRouteCircuitPeeringCRUD()
NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteCircuitPeeringCRUD");
}

[Fact(Skip = "Rerecord tests")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestExpressRouteCircuitAuthorizationCRUD()
{
Expand Down
28 changes: 15 additions & 13 deletions src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/ExpressRouteCircuitTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function Test-ExpressRouteCircuitCRUD
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation

# Create the ExpressRouteCircuit
$circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Standard -SkuFamily MeteredData -BillingType MeteredData -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 1000;
$circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Standard -SkuFamily MeteredData -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 500;

# get Circuit
$getCircuit = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname
Expand All @@ -47,7 +47,7 @@ function Test-ExpressRouteCircuitCRUD
Assert-AreEqual "MeteredData" $getCircuit.Sku.Family
Assert-AreEqual "equinix" $getCircuit.ServiceProviderProperties.ServiceProviderName
Assert-AreEqual "Silicon Valley" $getCircuit.ServiceProviderProperties.PeeringLocation
Assert-AreEqual "1000" $getCircuit.ServiceProviderProperties.BandwidthInMbps
Assert-AreEqual "500" $getCircuit.ServiceProviderProperties.BandwidthInMbps

# list
$list = Get-AzureRmExpressRouteCircuit -ResourceGroupName $rgname
Expand All @@ -59,20 +59,22 @@ function Test-ExpressRouteCircuitCRUD
Assert-AreEqual @($list[0].Peerings).Count @($getCircuit.Peerings).Count

# set
$getCircuit.ServiceProviderProperties.BandwidthInMbps = 500
$getCircuit.ServiceProviderProperties.BandwidthInMbps = 1000
$getCircuit.Sku.Tier = "Premium"
$getCircuit.Sku.Family = "UnlimitedData"

$getCircuit = Set-AzureRmExpressRouteCircuit -ExpressRouteCircuit $getCircuit -BillingType UnlimitedData
$getCircuit = Set-AzureRmExpressRouteCircuit -ExpressRouteCircuit $getCircuit
Assert-AreEqual $rgName $getCircuit.ResourceGroupName
Assert-AreEqual $circuitName $getCircuit.Name
Assert-NotNull $getCircuit.Location
Assert-NotNull $getCircuit.Etag
Assert-AreEqual 0 @($getCircuit.Peerings).Count
Assert-AreEqual "standard_meteredData" $getCircuit.Sku.Name
Assert-AreEqual "Standard" $getCircuit.Sku.Tier
Assert-AreEqual "MeteredData" $getCircuit.Sku.Family
Assert-AreEqual "Standard_MeteredData" $getCircuit.Sku.Name
Assert-AreEqual "Premium" $getCircuit.Sku.Tier
Assert-AreEqual "UnlimitedData" $getCircuit.Sku.Family
Assert-AreEqual "equinix" $getCircuit.ServiceProviderProperties.ServiceProviderName
Assert-AreEqual "Silicon Valley" $getCircuit.ServiceProviderProperties.PeeringLocation
Assert-AreEqual "500" $getCircuit.ServiceProviderProperties.BandwidthInMbps
Assert-AreEqual "1000" $getCircuit.ServiceProviderProperties.BandwidthInMbps

# Delete Circuit
$delete = Remove-AzureRmExpressRouteCircuit -ResourceGroupName $rgname -name $circuitName -PassThru -Force
Expand Down Expand Up @@ -108,7 +110,7 @@ function Test-ExpressRouteCircuitPeeringCRUD

# Create the ExpressRouteCircuit with peering
$peering = New-AzureRmExpressRouteCircuitPeeringConfig -Name AzurePrivatePeering -PeeringType AzurePrivatePeering -PeerASN 100 -PrimaryPeerAddressPrefix "192.168.1.0/30" -SecondaryPeerAddressPrefix "192.168.2.0/30" -VlanId 200
$circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Standard -SkuFamily MeteredData -BillingType UnlimitedData -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 1000 -Peering $peering
$circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Standard -SkuFamily MeteredData -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 1000 -Peering $peering

#verification
Assert-AreEqual $rgName $circuit.ResourceGroupName
Expand Down Expand Up @@ -146,7 +148,7 @@ function Test-ExpressRouteCircuitPeeringCRUD
Assert-AreEqual 1 @($listPeering).Count

# add a new Peering
$circuit = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname | Add-AzureRmExpressRouteCircuitPeeringConfig -Name MicrosoftPeering -PeeringType MicrosoftPeering -PeerASN 99 -PrimaryPeerAddressPrefix "192.168.1.0/30" -SecondaryPeerAddressPrefix "192.168.2.0/30" -VlanId 200 -MicrosoftConfigAdvertisedPublicPrefixes @("11.2.3.4/30", "12.2.3.4/30") -MicrosoftConfigCustomerAsn 1000 -MicrosoftConfigRoutingRegistryName AFRINIC | Set-AzureRmExpressRouteCircuit -BillingType UnlimitedData
$circuit = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname | Add-AzureRmExpressRouteCircuitPeeringConfig -Name MicrosoftPeering -PeeringType MicrosoftPeering -PeerASN 99 -PrimaryPeerAddressPrefix "192.168.1.0/30" -SecondaryPeerAddressPrefix "192.168.2.0/30" -VlanId 200 -MicrosoftConfigAdvertisedPublicPrefixes @("11.2.3.4/30", "12.2.3.4/30") -MicrosoftConfigCustomerAsn 1000 -MicrosoftConfigRoutingRegistryName AFRINIC | Set-AzureRmExpressRouteCircuit

$p = $circuit | Get-AzureRmExpressRouteCircuitPeeringConfig -Name MicrosoftPeering
Assert-AreEqual "MicrosoftPeering" $p.Name
Expand All @@ -165,7 +167,7 @@ function Test-ExpressRouteCircuitPeeringCRUD
Assert-AreEqual 2 @($listPeering).Count

# Set a new peering
$circuit = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname | Set-AzureRmExpressRouteCircuitPeeringConfig -Name MicrosoftPeering -PeeringType MicrosoftPeering -PeerASN 100 -PrimaryPeerAddressPrefix "192.168.1.0/30" -SecondaryPeerAddressPrefix "192.168.2.0/30" -VlanId 200 -MicrosoftConfigAdvertisedPublicPrefixes @("11.2.3.4/30", "12.2.3.4/30") -MicrosoftConfigCustomerAsn 1000 -MicrosoftConfigRoutingRegistryName AFRINIC | Set-AzureRmExpressRouteCircuit -BillingType UnlimitedData
$circuit = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname | Set-AzureRmExpressRouteCircuitPeeringConfig -Name MicrosoftPeering -PeeringType MicrosoftPeering -PeerASN 100 -PrimaryPeerAddressPrefix "192.168.1.0/30" -SecondaryPeerAddressPrefix "192.168.2.0/30" -VlanId 200 -MicrosoftConfigAdvertisedPublicPrefixes @("11.2.3.4/30", "12.2.3.4/30") -MicrosoftConfigCustomerAsn 1000 -MicrosoftConfigRoutingRegistryName AFRINIC | Set-AzureRmExpressRouteCircuit
$p = $circuit | Get-AzureRmExpressRouteCircuitPeeringConfig -Name MicrosoftPeering
Assert-AreEqual "MicrosoftPeering" $p.Name
Assert-AreEqual "MicrosoftPeering" $p.PeeringType
Expand Down Expand Up @@ -215,7 +217,7 @@ function Test-ExpressRouteCircuitAuthorizationCRUD

# Create the ExpressRouteCircuit with authorization
$authorization = New-AzureRmExpressRouteCircuitAuthorization -Name $authorizationName
$circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Standard -SkuFamily MeteredData -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 1000 -Authorization $authorization
$circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Standard -SkuFamily MeteredData -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 500 -Authorization $authorization

#verification
Assert-AreEqual $rgName $circuit.ResourceGroupName
Expand All @@ -228,7 +230,7 @@ function Test-ExpressRouteCircuitAuthorizationCRUD
Assert-AreEqual "MeteredData" $circuit.Sku.Family
Assert-AreEqual "equinix" $circuit.ServiceProviderProperties.ServiceProviderName
Assert-AreEqual "Silicon Valley" $circuit.ServiceProviderProperties.PeeringLocation
Assert-AreEqual "1000" $circuit.ServiceProviderProperties.BandwidthInMbps
Assert-AreEqual "500" $circuit.ServiceProviderProperties.BandwidthInMbps

# Verify the authorization
Assert-AreEqual $authorizationName $circuit.Authorizations[0].Name
Expand Down
464 changes: 154 additions & 310 deletions ...Test.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitAuthorizationCRUD.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading