From 84e245a712507013c4a4f4fcf3b0448b40221f86 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Wed, 13 Sep 2023 10:07:47 +0000
Subject: T5576: Add BGP remove-private-as all option

Add the ability to use the option all for remove-private-as.
Remove private ASNs in outbound updates.
all - Apply to all AS numbers

set protocols bgp neighbor <tag> address-family ipv4-unicast remove-private-as all

(cherry picked from commit d72024b11e127cc11931cfaee4d07944dceb1ea9)
---
 data/templates/frr/bgpd.frr.j2                             |  2 +-
 .../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>
-- 
cgit v1.2.3