diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-09-13 19:16:47 +0200 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-13 19:16:47 +0200 | 
| commit | e8fb2d22c45fcc47511aadb4140a66ce9e9661d5 (patch) | |
| tree | 59b4bf55adee8c7e518ff32364ae0e9ecb173a1b | |
| parent | a8fecd96b9c3d6a0771f0761a6060d70bcc04bab (diff) | |
| parent | d72024b11e127cc11931cfaee4d07944dceb1ea9 (diff) | |
| download | vyos-1x-e8fb2d22c45fcc47511aadb4140a66ce9e9661d5.tar.gz vyos-1x-e8fb2d22c45fcc47511aadb4140a66ce9e9661d5.zip  | |
Merge pull request #2252 from sever-sever/T5576
T5576: Add BGP remove-private-as all option
| -rw-r--r-- | data/templates/frr/bgpd.frr.j2 | 2 | ||||
| -rw-r--r-- | interface-definitions/include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i | 14 | 
2 files changed, 12 insertions, 4 deletions
diff --git a/data/templates/frr/bgpd.frr.j2 b/data/templates/frr/bgpd.frr.j2 index 7fa974254..e1c102e16 100644 --- a/data/templates/frr/bgpd.frr.j2 +++ b/data/templates/frr/bgpd.frr.j2 @@ -170,7 +170,7 @@  {%             endif %}  {%         endif %}  {%         if afi_config.remove_private_as is vyos_defined %} -  neighbor {{ neighbor }} remove-private-AS +  neighbor {{ neighbor }} remove-private-AS {{ 'all' if afi_config.remove_private_as.all is vyos_defined }}  {%         endif %}  {%         if afi_config.route_reflector_client is vyos_defined %}    neighbor {{ neighbor }} route-reflector-client diff --git a/interface-definitions/include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i index 75221a348..9ec513da9 100644 --- a/interface-definitions/include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i +++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i @@ -1,4 +1,5 @@  <!-- include start from bgp/neighbor-afi-ipv4-ipv6-common.xml.i --> +  <leafNode name="addpath-tx-all">    <properties>      <help>Use addpath to advertise all paths to a neighbor</help> @@ -156,12 +157,19 @@    </properties>  </leafNode>  #include <include/bgp/afi-nexthop-self.xml.i> -<leafNode name="remove-private-as"> +<node name="remove-private-as">    <properties>      <help>Remove private AS numbers from AS path in outbound route updates</help> -    <valueless/>    </properties> -</leafNode> +  <children> +    <leafNode name="all"> +      <properties> +        <help>Remove private AS numbers to all AS numbers in outbound route updates</help> +        <valueless/> +      </properties> +    </leafNode> +  </children> +</node>  #include <include/bgp/afi-route-map.xml.i>  #include <include/bgp/afi-route-reflector-client.xml.i>  #include <include/bgp/afi-route-server-client.xml.i>  | 
