Tests fix.

Author: Nilambari

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 -SkuTier Standard -SkuFamily MeteredData -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 1000;
+		$circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Standard -SkuFamily MeteredData -BillingType MeteredData -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 1000;
 
         # get Circuit
         $getCircuit = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname
@@ -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 -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 -BillingType MeteredData UnlimitedData -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 1000 -Peering $peering
 
         #verification
         Assert-AreEqual $rgName $circuit.ResourceGroupName

src/ServiceManagement/Network/Commands.Network/Gateway/NewAzureVNetGateway.cs

@@ -24,11 +24,9 @@ public class NewAzureVNetGatewayCommand : NetworkCmdletBase
         public string VNetName { get; set; }
 
         [Parameter(Position = 1, Mandatory = false, HelpMessage = "The type of routing that the gateway will use. This will default to StaticRouting if no value is provided.")]
-        [ValidateSet("StaticRouting", "DynamicRouting", IgnoreCase = true)]
         public string GatewayType { get; set; }
 
         [Parameter(Position = 2, Mandatory = false, HelpMessage = "The Gateway SKU for the new gateway.")]
-        [ValidateSet("Default", "HighPerformance", "Standard", IgnoreCase = true)]
         public string GatewaySKU { get; set; }
 
         public override void ExecuteCmdlet()

src/ServiceManagement/Network/Commands.Network/Gateway/NewAzureVirtualNetworkGateway.cs

@@ -29,11 +29,9 @@ public class NewAzureVirtualNetworkGatewayCommand : NetworkCmdletBase
         public string GatewayName { get; set; }
 
         [Parameter(Position = 2, Mandatory = false, HelpMessage = "The type of routing that the gateway will use:StaticRouting/DynamicRouting. This will default to StaticRouting if no value is provided.")]
-        [ValidateSet("StaticRouting", "DynamicRouting", IgnoreCase = true)]
         public string GatewayType { get; set; }
 
         [Parameter(Position = 3, Mandatory = false, HelpMessage = "The Gateway SKU for the new gateway:Default/HighPerformance/Standard. This will default to 'Default' SKU if no value is provided.")]
-        [ValidateSet("Default", "HighPerformance", "Standard", IgnoreCase = true)]
         public string GatewaySKU { get; set; }
 
         [Parameter(Position = 4, Mandatory = false, HelpMessage = "Location for the virtual network gateway.")]