diff --git a/src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/ExpressRouteCircuitTests.ps1 b/src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/ExpressRouteCircuitTests.ps1 index 6da2a198c1a2..97db60379a6a 100644 --- a/src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/ExpressRouteCircuitTests.ps1 +++ b/src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/ExpressRouteCircuitTests.ps1 @@ -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 @@ -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 @@ -108,7 +108,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 -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 @@ -116,7 +116,7 @@ function Test-ExpressRouteCircuitPeeringCRUD 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 diff --git a/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/NewAzureExpressRouteCircuitCommand.cs b/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/NewAzureExpressRouteCircuitCommand.cs index bafd30d633eb..cea0e011cef8 100644 --- a/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/NewAzureExpressRouteCircuitCommand.cs +++ b/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/NewAzureExpressRouteCircuitCommand.cs @@ -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)] @@ -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 diff --git a/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/SetAzureExpressRouteCircuitCommand.cs b/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/SetAzureExpressRouteCircuitCommand.cs index b3801cc7d9ef..bedbf3026d46 100644 --- a/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/SetAzureExpressRouteCircuitCommand.cs +++ b/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/SetAzureExpressRouteCircuitCommand.cs @@ -41,12 +41,12 @@ protected override void ProcessRecord() } // Map to the sdk object - var vnetModel = Mapper.Map(this.ExpressRouteCircuit); - vnetModel.Type = Microsoft.Azure.Commands.Network.Properties.Resources.ExpressRouteCircuitType; - vnetModel.Tags = TagsConversionHelper.CreateTagDictionary(this.ExpressRouteCircuit.Tag, validate: true); + var erModel = Mapper.Map(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);