Merge pull request Azure#3494 from dihan0604/dev

Route Filter APIs

Author: cormacpayne

src/ResourceManager/Network/AzureRM.Network.psd1

@@ -242,7 +242,17 @@ CmdletsToExport = 'Add-AzureRmApplicationGatewayAuthenticationCertificate',
                'Get-AzureRmLoadBalancerInboundNatRuleConfig', 
                'Add-AzureRmLoadBalancerInboundNatRuleConfig', 
                'New-AzureRmLoadBalancerInboundNatRuleConfig', 
-               'Remove-AzureRmLoadBalancerInboundNatRuleConfig', 
+               'Remove-AzureRmLoadBalancerInboundNatRuleConfig',
+	        'Get-AzureRmBgpServiceCommunity',
+	        'Get-AzureRmRouteFilter',
+	        'Set-AzureRmRouteFilter',
+	        'Remove-AzureRmRouteFilter',
+	        'New-AzureRmRouteFilter',
+	        'Get-AzureRmRouteFilterRuleConfig',
+	        'Add-AzureRmRouteFilterRuleConfig',
+	        'Remove-AzureRmRouteFilterRuleConfig',
+	        'Set-AzureRmRouteFilterRuleConfig',
+	        'New-AzureRmRouteFilterRuleConfig',
                'Set-AzureRmLoadBalancerRuleConfig', 
                'Get-AzureRmLoadBalancerRuleConfig', 
                'Add-AzureRmLoadBalancerRuleConfig', 

src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj

@@ -114,7 +114,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework">
-      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.5.0-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.5.2\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks">

src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/ExpressRouteCircuitTests.ps1

@@ -21,16 +21,16 @@ function Test-ExpressRouteCircuitStageCRUD
     # Setup
     $rgname = 'movecircuit'
     $circuitName = Get-ResourceName
-    $rglocation = "westus"
+    $rglocation = "brazilSouth"
     $resourceTypeParent = "Microsoft.Network/expressRouteCircuits"
-    $location = "westus"
+    $location = "brazilSouth"
     try 
     {
       # Create the resource group
       $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 test" -PeeringLocation "Silicon Valley Test" -BandwidthInMbps 50 -AllowClassicOperations $true;
+	  $circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Standard -SkuFamily MeteredData  -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 500 -AllowClassicOperations $true;
 
       $circuit = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname
       # set

src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayTests.ps1

@@ -47,7 +47,7 @@ function Test-VirtualNetworkExpressRouteGatewayCRUD
       # Create & Get virtualnetworkgateway
       $vnetIpConfig = New-AzureRmVirtualNetworkGatewayIpConfig -Name $vnetGatewayConfigName -PublicIpAddress $publicip -Subnet $subnet
 
-      $actual = New-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname -location $location -IpConfigurations $vnetIpConfig -GatewayType ExpressRoute -GatewaySku UltraPerformance -Force 
+      $actual = New-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname -location $location -IpConfigurations $vnetIpConfig -GatewayType ExpressRoute -GatewaySku UltraPerformance -VpnType RouteBased -Force 
       $expected = Get-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname
       Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName	
       Assert-AreEqual $expected.Name $actual.Name	

src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitAuthorizationCRUD.json

@@ -21,7 +21,7 @@
   <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
   <package id="Microsoft.Rest.ClientRuntime" version="2.3.4" targetFramework="net45" />
   <package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.4" targetFramework="net45" />
-  <package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.5.0-preview" targetFramework="net45" />
+  <package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.5.2" targetFramework="net45" />
   <package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="xunit" version="2.1.0" targetFramework="net45" />

src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitCRUD.json

@@ -282,6 +282,8 @@
     <Compile Include="Models\PSApplicationGatewayBackendHealthHttpSettings.cs" />
     <Compile Include="Models\PSApplicationGatewayBackendHealthPool.cs" />
     <Compile Include="Models\PSApplicationGatewayBackendHealthServer.cs" />
+    <Compile Include="Models\PSBgpCommunity.cs" />
+    <Compile Include="Models\PSBgpServiceCommunity.cs" />
     <Compile Include="Models\PSFlowLog.cs" />
     <Compile Include="Models\PSFlowLogProperties.cs" />
     <Compile Include="Models\PSGetPacketCaptureResult.cs" />
@@ -327,6 +329,8 @@
     <Compile Include="Models\PSNetworkLongRunningOperation.cs" />
     <Compile Include="Models\PSEffectiveNetworkSecurityGroup.cs" />
     <Compile Include="Models\PSEffectiveRoute.cs" />
+    <Compile Include="Models\PSRouteFilter.cs" />
+    <Compile Include="Models\PSRouteFilterRule.cs" />
     <Compile Include="Models\PSSecurityGroupView.cs" />
     <Compile Include="Models\PSSecurityGroupViewResult.cs" />
     <Compile Include="Models\PSSecurityRuleAssociations.cs" />
@@ -360,6 +364,7 @@
     <Compile Include="NetworkInterface\IpConfiguration\NewAzureNetworkInterfaceIpConfigCommand.cs" />
     <Compile Include="NetworkInterface\IpConfiguration\RemoveAzureNetworkInterfaceIpConfigCommand.cs" />
     <Compile Include="NetworkInterface\IpConfiguration\SetAzureNetworkInterfaceIpConfigCommand.cs" />
+    <Compile Include="ProviderWideCmdlets\GetAzureBgpServiceCommunityCommand.cs" />
     <Compile Include="NetworkWatcher\GetAzureNetworkWatcherCommand.cs" />
     <Compile Include="NetworkWatcher\GetAzureNetworkWatcherFlowLogStatusCommand.cs" />
     <Compile Include="NetworkWatcher\GetAzureNetworkWatcherTroubleshootingResult.cs" />
@@ -379,6 +384,17 @@
     <Compile Include="NetworkWatcher\PacketCapture\StopAzureNetworkWatcherPacketCaptureCommand.cs" />
     <Compile Include="NetworkWatcher\RemoveAzureNetworkWatcherCommand.cs" />
     <Compile Include="ProviderWideCmdlets\GetAzureExpressRouteServiceProviderCommand.cs" />
+    <Compile Include="RouteFilter\GetAzureRouteFilterCommand.cs" />
+    <Compile Include="RouteFilter\NewAzureRouteFilterCommand.cs" />
+    <Compile Include="RouteFilter\RemoveAzureRouteFilterCommand.cs" />
+    <Compile Include="RouteFilter\RouteFilterBaseCmdlet.cs" />
+    <Compile Include="RouteFilter\RouteFilterRule\AddAzureRouteFilterRuleConfigCommand.cs" />
+    <Compile Include="RouteFilter\RouteFilterRule\AzureRouteFilterRuleConfigBase.cs" />
+    <Compile Include="RouteFilter\RouteFilterRule\GetRouteFilterRuleConfigCommand.cs" />
+    <Compile Include="RouteFilter\RouteFilterRule\NewAzureRouteFilterRuleConfigCommand.cs" />
+    <Compile Include="RouteFilter\RouteFilterRule\RemoveAzureRouteFilterRuleConfigCommand.cs" />
+    <Compile Include="RouteFilter\RouteFilterRule\SetAzureRouteFilterRuleConfigCommand.cs" />
+    <Compile Include="RouteFilter\SetAzureRouteFilterCommand.cs" />
     <Compile Include="VirtualNetwork\TestAzurePrivateIPAddressAvailabilityCmdlet.cs" />
     <Compile Include="PublicIpAddress\GetAzurePublicIpAddressCommand.cs" />
     <Compile Include="PublicIpAddress\NewAzurePublicIpAddressCommand.cs" />

src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitMicrosoftPeeringCRUD.json

@@ -71,6 +71,16 @@ protected override void Configure()
             Mapper.CreateMap<CNM.PSResourceId, MNM.SubResource>();
             Mapper.CreateMap<MNM.SubResource, CNM.PSResourceId>();
 
+            // Route Filter 
+            Mapper.CreateMap<CNM.PSRouteFilter, MNM.RouteFilter>();
+            Mapper.CreateMap<MNM.RouteFilter, CNM.PSRouteFilter>();
+            Mapper.CreateMap<CNM.PSRouteFilterRule, MNM.RouteFilterRule>();
+            Mapper.CreateMap<MNM.RouteFilterRule, CNM.PSRouteFilterRule>();
+
+            // Bgp Service Community
+            Mapper.CreateMap<CNM.PSBgpServiceCommunity, MNM.BgpServiceCommunity>();
+            Mapper.CreateMap<MNM.BgpServiceCommunity, CNM.PSBgpServiceCommunity>();
+
             // Subnet
             // CNM to MNM
             Mapper.CreateMap<CNM.PSDhcpOptions, MNM.DhcpOptions>();

src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitPrivatePublicPeeringCRUD.json

@@ -19,7 +19,7 @@
 
 namespace Microsoft.Azure.Commands.Network
 {
-    [Cmdlet(VerbsCommon.Add, "AzureRmExpressRouteCircuitPeeringConfig"), OutputType(typeof(PSExpressRouteCircuit))]
+    [Cmdlet(VerbsCommon.Add, "AzureRmExpressRouteCircuitPeeringConfig", DefaultParameterSetName = "SetByResource"), OutputType(typeof(PSExpressRouteCircuit))]
     public class AddAzureExpressRouteCircuitPeeringConfigCommand : AzureExpressRouteCircuitPeeringConfigBase
     {
         [Parameter(
@@ -45,6 +45,15 @@ public override void Execute()
                 throw new ArgumentException("Peering with the specified name already exists");
             }
 
+
+            if (string.Equals(ParameterSetName, Microsoft.Azure.Commands.Network.Properties.Resources.SetByResource))
+            {
+                if (this.RouteFilter != null)
+                {
+                    this.RouteFilterId = this.RouteFilter.Id;
+                }
+            }
+
             peering = new PSPeering();
 
             peering.Name = this.Name;
@@ -53,6 +62,7 @@ public override void Execute()
             peering.SecondaryPeerAddressPrefix = this.SecondaryPeerAddressPrefix;
             peering.PeerASN = this.PeerASN;
             peering.VlanId = this.VlanId;
+            
 
             if (!string.IsNullOrEmpty(this.SharedKey))
             {
@@ -68,6 +78,12 @@ public override void Execute()
                 peering.MicrosoftPeeringConfig.RoutingRegistryName = this.MicrosoftConfigRoutingRegistryName;
             }
 
+            if (!string.IsNullOrEmpty(this.RouteFilterId))
+            {
+                peering.RouteFilter = new PSRouteFilter();
+                peering.RouteFilter.Id = this.RouteFilterId;
+            }
+
             this.ExpressRouteCircuit.Peerings.Add(peering);
 
             WriteObject(this.ExpressRouteCircuit);

src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitStageCRUD.json

@@ -12,12 +12,12 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System.Management.Automation;
-using MNM = Microsoft.Azure.Management.Network.Models;
-
 namespace Microsoft.Azure.Commands.Network
 {
     using System.Collections.Generic;
+    using Microsoft.Azure.Commands.Network.Models;
+    using System.Management.Automation;
+    using MNM = Microsoft.Azure.Management.Network.Models;
 
     public class AzureExpressRouteCircuitPeeringConfigBase : NetworkBaseCmdlet
     {
@@ -89,5 +89,20 @@ public class AzureExpressRouteCircuitPeeringConfigBase : NetworkBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string MicrosoftConfigRoutingRegistryName { get; set; }
 
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            ParameterSetName = "SetByResourceId",
+            HelpMessage = "RouteFilterId")]
+        [ValidateNotNullOrEmpty]
+        public string RouteFilterId { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            ParameterSetName = "SetByResource",
+            HelpMessage = "RouteFilter")]
+        [ValidateNotNullOrEmpty]
+        public PSRouteFilter RouteFilter { get; set; }
     }
 }

src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ExpressRouteServiceProviderTests/TestExpressRouteServiceProviderList.json

@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Network
 {
     using System.Linq;
 
-    [Cmdlet(VerbsCommon.New, "AzureRmExpressRouteCircuitPeeringConfig"), OutputType(typeof(PSPeering))]
+    [Cmdlet(VerbsCommon.New, "AzureRmExpressRouteCircuitPeeringConfig", DefaultParameterSetName = "SetByResource"), OutputType(typeof(PSPeering))]
     public class NewAzureExpressRouteCircuitPeeringConfigCommand : AzureExpressRouteCircuitPeeringConfigBase
     {
         [Parameter(
@@ -31,6 +31,15 @@ public class NewAzureExpressRouteCircuitPeeringConfigCommand : AzureExpressRoute
         public override void Execute()
         {
             base.Execute();
+
+            if (string.Equals(ParameterSetName, Microsoft.Azure.Commands.Network.Properties.Resources.SetByResource))
+            {
+                if (this.RouteFilter != null)
+                {
+                    this.RouteFilterId = this.RouteFilter.Id;
+                }
+            }
+
            var peering = new PSPeering();
 
             peering.Name = this.Name;
@@ -54,6 +63,12 @@ public override void Execute()
                 peering.MicrosoftPeeringConfig.RoutingRegistryName = this.MicrosoftConfigRoutingRegistryName;
             }
 
+            if (!string.IsNullOrEmpty(this.RouteFilterId))
+            {
+                peering.RouteFilter = new PSRouteFilter();
+                peering.RouteFilter.Id = this.RouteFilterId;
+            }
+
             WriteObject(peering);
         }
     }

src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests/TestVirtualNetworkExpressRouteGatewayCRUD.json

@@ -19,7 +19,7 @@
 
 namespace Microsoft.Azure.Commands.Network
 {
-    [Cmdlet(VerbsCommon.Set, "AzureRmExpressRouteCircuitPeeringConfig"), OutputType(typeof(PSExpressRouteCircuit))]
+    [Cmdlet(VerbsCommon.Set, "AzureRmExpressRouteCircuitPeeringConfig", DefaultParameterSetName = "SetByResource"), OutputType(typeof(PSExpressRouteCircuit))]
     public class SetAzureExpressRouteCircuitPeeringConfigCommand : AzureExpressRouteCircuitPeeringConfigBase
     {
         [Parameter(
@@ -45,6 +45,14 @@ public override void Execute()
                 throw new ArgumentException("Peering with the specified name does not exist");
             }
 
+            if (string.Equals(ParameterSetName, Microsoft.Azure.Commands.Network.Properties.Resources.SetByResource))
+            {
+                if (this.RouteFilter != null)
+                {
+                    this.RouteFilterId = this.RouteFilter.Id;
+                }
+            }
+
             peering.Name = this.Name;
             peering.PeeringType = this.PeeringType;
             peering.PrimaryPeerAddressPrefix = this.PrimaryPeerAddressPrefix;
@@ -66,6 +74,12 @@ public override void Execute()
                 peering.MicrosoftPeeringConfig.RoutingRegistryName = this.MicrosoftConfigRoutingRegistryName;
             }
 
+            if (!string.IsNullOrEmpty(this.RouteFilterId))
+            {
+                peering.RouteFilter = new PSRouteFilter();
+                peering.RouteFilter.Id = this.RouteFilterId;
+            }
+
             WriteObject(this.ExpressRouteCircuit);
         }
     }