From 0f498d782c8fc3645355184cc59e88a16d1b230d Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 17 Aug 2021 12:11:54 +0200
Subject: op-mode: T1513: bgp: xml: provide exact-match building block

---
 op-mode-definitions/include/bgp/afi-common.xml.i           |  7 +------
 op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i | 14 ++------------
 op-mode-definitions/include/bgp/exact-match.xml.i          |  8 ++++++++
 3 files changed, 11 insertions(+), 18 deletions(-)
 create mode 100644 op-mode-definitions/include/bgp/exact-match.xml.i

(limited to 'op-mode-definitions/include/bgp')

diff --git a/op-mode-definitions/include/bgp/afi-common.xml.i b/op-mode-definitions/include/bgp/afi-common.xml.i
index 7fc59f3b0..0edeb9f81 100644
--- a/op-mode-definitions/include/bgp/afi-common.xml.i
+++ b/op-mode-definitions/include/bgp/afi-common.xml.i
@@ -7,12 +7,7 @@
     </completionHelp>
   </properties>
   <children>
-    <leafNode name="exact-match">
-      <properties>
-        <help>Exact match of the communities</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
+    #include <include/bgp/exact-match.xml.i>
   </children>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </tagNode>
diff --git a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i
index f1b699347..a51595b7f 100644
--- a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i
+++ b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i
@@ -22,12 +22,7 @@
       </properties>
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
-    <leafNode name="exact-match">
-      <properties>
-        <help>Exact match of the communities</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
+    #include <include/bgp/exact-match.xml.i>
     <leafNode name="graceful-shutdown">
       <properties>
         <help>Graceful shutdown (well-known community)</help>
@@ -105,12 +100,7 @@
     </completionHelp>
   </properties>
   <children>
-    <leafNode name="exact-match">
-      <properties>
-        <help>Show BGP routes exactly matching specified community list</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
+    #include <include/bgp/exact-match.xml.i>
   </children>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </tagNode>
diff --git a/op-mode-definitions/include/bgp/exact-match.xml.i b/op-mode-definitions/include/bgp/exact-match.xml.i
new file mode 100644
index 000000000..49026db9b
--- /dev/null
+++ b/op-mode-definitions/include/bgp/exact-match.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp/exact-match.xml.i -->
+<leafNode name="exact-match">
+  <properties>
+    <help>Exact match of the communities</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
-- 
cgit v1.2.3


From 6c0044d12ecf762d9d362d6b09cdaa4c8227db58 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 17 Aug 2021 12:13:04 +0200
Subject: op-mode: T1513: bgp: add "show bgp large-community AA:BB:CC
 exat-match"

---
 op-mode-definitions/include/bgp/afi-common.xml.i | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'op-mode-definitions/include/bgp')

diff --git a/op-mode-definitions/include/bgp/afi-common.xml.i b/op-mode-definitions/include/bgp/afi-common.xml.i
index 0edeb9f81..ef6709ae8 100644
--- a/op-mode-definitions/include/bgp/afi-common.xml.i
+++ b/op-mode-definitions/include/bgp/afi-common.xml.i
@@ -19,6 +19,9 @@
     </completionHelp>
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    #include <include/bgp/exact-match.xml.i>
+  </children>
 </tagNode>
 <leafNode name="statistics">
   <properties>
-- 
cgit v1.2.3


From 6bb2f6e22706bb1c5874a58e74585160164011f6 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 17 Aug 2021 13:31:39 +0200
Subject: op-mode: xml: bgp: fix large-community help string

---
 op-mode-definitions/include/bgp/afi-common.xml.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'op-mode-definitions/include/bgp')

diff --git a/op-mode-definitions/include/bgp/afi-common.xml.i b/op-mode-definitions/include/bgp/afi-common.xml.i
index ef6709ae8..e28dfe5d7 100644
--- a/op-mode-definitions/include/bgp/afi-common.xml.i
+++ b/op-mode-definitions/include/bgp/afi-common.xml.i
@@ -13,7 +13,7 @@
 </tagNode>
 <tagNode name="large-community">
   <properties>
-    <help>List of large-community numbers</help>
+    <help>Display routes matching the large-communities</help>
     <completionHelp>
       <list>AA:BB:CC</list>
     </completionHelp>
-- 
cgit v1.2.3


From 90f778fc04b322867f6fec023328330adc3fd85f Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 17 Aug 2021 13:32:21 +0200
Subject: op-mode: T1513: bgp: add "show bgp large-community-list" commnad

---
 op-mode-definitions/include/bgp/afi-common.xml.i | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'op-mode-definitions/include/bgp')

diff --git a/op-mode-definitions/include/bgp/afi-common.xml.i b/op-mode-definitions/include/bgp/afi-common.xml.i
index e28dfe5d7..4d5f56656 100644
--- a/op-mode-definitions/include/bgp/afi-common.xml.i
+++ b/op-mode-definitions/include/bgp/afi-common.xml.i
@@ -23,6 +23,18 @@
     #include <include/bgp/exact-match.xml.i>
   </children>
 </tagNode>
+<tagNode name="large-community-list">
+  <properties>
+    <help>Display routes matching the large-community-list</help>
+    <completionHelp>
+      <path>policy large-community-list</path>
+    </completionHelp>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    #include <include/bgp/exact-match.xml.i>
+  </children>
+</tagNode>
 <leafNode name="statistics">
   <properties>
     <help>RIB advertisement statistics</help>
-- 
cgit v1.2.3


From a4e1a9235ff5e4aef29cc013239c6d842af5c1ae Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 19 Aug 2021 18:28:00 +0200
Subject: op-mode: bgp: T3759: add "show bgp ipv4|ipv6 vpn" commands

---
 .../include/bgp/afi-ipv4-ipv6-vpn.xml.i            | 23 ++++++++++++++++++++++
 .../include/bgp/show-bgp-common.xml.i              |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 op-mode-definitions/include/bgp/afi-ipv4-ipv6-vpn.xml.i

(limited to 'op-mode-definitions/include/bgp')

diff --git a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-vpn.xml.i b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-vpn.xml.i
new file mode 100644
index 000000000..ba6edb256
--- /dev/null
+++ b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-vpn.xml.i
@@ -0,0 +1,23 @@
+<!-- included start from bgp/afi-ipv4-ipv6-vpn.xml.i -->
+<tagNode name="vpn">
+  <properties>
+    <help>Network in the BGP routing table to display</help>
+    <completionHelp>
+      <list>&lt;x.x.x.x&gt; &lt;x.x.x.x/x&gt; &lt;h:h:h:h:h:h:h:h&gt; &lt;h:h:h:h:h:h:h:h/x&gt;</list>
+    </completionHelp>
+  </properties>
+  <children>
+    #include <include/bgp/prefix-bestpath-multipath.xml.i>
+  </children>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<node name="vpn">
+  <properties>
+    <help>VPN Address Family modifier</help>
+  </properties>
+  <children>
+    #include <include/bgp/afi-common.xml.i>
+    #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
+  </children>
+</node>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/show-bgp-common.xml.i b/op-mode-definitions/include/bgp/show-bgp-common.xml.i
index b86b09056..0664b11fc 100644
--- a/op-mode-definitions/include/bgp/show-bgp-common.xml.i
+++ b/op-mode-definitions/include/bgp/show-bgp-common.xml.i
@@ -20,6 +20,7 @@
   <children>
     #include <include/bgp/afi-common.xml.i>
     #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
+    #include <include/bgp/afi-ipv4-ipv6-vpn.xml.i>
   </children>
 </node>
 <tagNode name="ipv6">
@@ -41,6 +42,7 @@
   <children>
     #include <include/bgp/afi-common.xml.i>
     #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
+    #include <include/bgp/afi-ipv4-ipv6-vpn.xml.i>
   </children>
 </node>
 <node name="l2vpn">
-- 
cgit v1.2.3


From 801123eff1bf232ca1e5202ceb0989c2fba34c86 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 25 Sep 2021 16:34:52 +0200
Subject: op-mode: bgp: "show bgp ipv4|ipv6" should display routing table

The <command> node was missed out when adding the XML definitions.
---
 op-mode-definitions/include/bgp/show-bgp-common.xml.i | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'op-mode-definitions/include/bgp')

diff --git a/op-mode-definitions/include/bgp/show-bgp-common.xml.i b/op-mode-definitions/include/bgp/show-bgp-common.xml.i
index 0664b11fc..e81b26b3e 100644
--- a/op-mode-definitions/include/bgp/show-bgp-common.xml.i
+++ b/op-mode-definitions/include/bgp/show-bgp-common.xml.i
@@ -22,6 +22,7 @@
     #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
     #include <include/bgp/afi-ipv4-ipv6-vpn.xml.i>
   </children>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </node>
 <tagNode name="ipv6">
   <properties>
@@ -44,6 +45,7 @@
     #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
     #include <include/bgp/afi-ipv4-ipv6-vpn.xml.i>
   </children>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </node>
 <node name="l2vpn">
   <properties>
-- 
cgit v1.2.3