diff options
author | Christian Breunig <christian@breunig.cc> | 2023-09-14 07:54:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-14 07:54:07 +0200 |
commit | c803cf3bae093b4661c7e6213fce41461d1c62c2 (patch) | |
tree | 6a5fce033fb11fab51d7b4bd780a76899693869b | |
parent | 3d9a0b02d031a97b099ef6fe4ba07d7ce7eb958e (diff) | |
parent | 84e245a712507013c4a4f4fcf3b0448b40221f86 (diff) | |
download | vyos-1x-c803cf3bae093b4661c7e6213fce41461d1c62c2.tar.gz vyos-1x-c803cf3bae093b4661c7e6213fce41461d1c62c2.zip |
Merge pull request #2259 from vyos/mergify/bp/sagitta/pr-2252
T5576: Add BGP remove-private-as all option (backport #2252)
-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> |