Skip to content

remove SkuName parameter from the ExpressRouteCmdlet, fix test #1077

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
ogail merged 1 commit into from
Oct 7, 2015
Merged

remove SkuName parameter from the ExpressRouteCmdlet, fix test #1077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 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 -SkuName "standard_meteredData" -SkuTier Standard -SkuFamily 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 1000;

# get Circuit
$getCircuit = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname
Expand All @@ -42,7 +42,7 @@ function Test-ExpressRouteCircuitCRUD
Assert-NotNull $getCircuit.Location
Assert-NotNull $getCircuit.Etag
Assert-AreEqual 0 @($getCircuit.Peerings).Count
Assert-AreEqual "standard_meteredData" $getCircuit.Sku.Name
Assert-AreEqual "Standard_MeteredData" $getCircuit.Sku.Name
Assert-AreEqual "Standard" $getCircuit.Sku.Tier
Assert-AreEqual "MeteredData" $getCircuit.Sku.Family
Assert-AreEqual "equinix" $getCircuit.ServiceProviderProperties.ServiceProviderName
Expand Down Expand Up @@ -108,15 +108,15 @@ 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 -SkuName "standard_meteredData" -SkuTier Standard -SkuFamily MeteredData -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
Assert-AreEqual $circuitName $circuit.Name
Assert-NotNull $circuit.Location
Assert-NotNull $circuit.Etag
Assert-AreEqual 1 @($circuit.Peerings).Count
Assert-AreEqual "standard_meteredData" $circuit.Sku.Name
Assert-AreEqual "Standard_MeteredData" $circuit.Sku.Name
Assert-AreEqual "Standard" $circuit.Sku.Tier
Assert-AreEqual "MeteredData" $circuit.Sku.Family
Assert-AreEqual "equinix" $circuit.ServiceProviderProperties.ServiceProviderName
Expand Down
9 changes: 2 additions & 7 deletions ...anager/Network/Commands.Network/ExpressRouteCircuit/NewAzureExpressRouteCircuitCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@ public class NewAzureExpressRouteCircuitCommand : ExpressRouteCircuitBaseCmdlet
[ValidateNotNullOrEmpty]
public virtual string Location { get; set; }

[Parameter(
Mandatory = false,
ValueFromPipelineByPropertyName = true)]
public string SkuName { get; set; }

[Parameter(
Mandatory = false,
ValueFromPipelineByPropertyName = true)]
Expand Down Expand Up @@ -136,12 +131,12 @@ private PSExpressRouteCircuit CreateExpressRouteCircuit()
circuit.Location = this.Location;

// Construct sku
if (!string.IsNullOrEmpty(this.SkuName))
if (!string.IsNullOrEmpty(this.SkuTier))
{
circuit.Sku = new PSExpressRouteCircuitSku();
circuit.Sku.Name = this.SkuName;
circuit.Sku.Tier = this.SkuTier;
circuit.Sku.Family = this.SkuFamily;
circuit.Sku.Name = this.SkuTier + "_" + this.SkuFamily;
}

// construct the service provider properties
Expand Down
8 changes: 4 additions & 4 deletions ...anager/Network/Commands.Network/ExpressRouteCircuit/SetAzureExpressRouteCircuitCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ protected override void ProcessRecord()
}

// Map to the sdk object
var vnetModel = Mapper.Map<MNM.ExpressRouteCircuit>(this.ExpressRouteCircuit);
vnetModel.Type = Microsoft.Azure.Commands.Network.Properties.Resources.ExpressRouteCircuitType;
vnetModel.Tags = TagsConversionHelper.CreateTagDictionary(this.ExpressRouteCircuit.Tag, validate: true);
var erModel = Mapper.Map<MNM.ExpressRouteCircuit>(this.ExpressRouteCircuit);
erModel.Type = Microsoft.Azure.Commands.Network.Properties.Resources.ExpressRouteCircuitType;
erModel.Tags = TagsConversionHelper.CreateTagDictionary(this.ExpressRouteCircuit.Tag, validate: true);

// Execute the Create ExpressRouteCircuit call
this.ExpressRouteCircuitClient.CreateOrUpdate(this.ExpressRouteCircuit.ResourceGroupName, this.ExpressRouteCircuit.Name, vnetModel);
this.ExpressRouteCircuitClient.CreateOrUpdate(this.ExpressRouteCircuit.ResourceGroupName, this.ExpressRouteCircuit.Name, erModel);

var getExpressRouteCircuit = this.GetExpressRouteCircuit(this.ExpressRouteCircuit.ResourceGroupName, this.ExpressRouteCircuit.Name);
WriteObject(getExpressRouteCircuit);
Expand Down