From c5d682a5e08a88fa0b162214671d4301d65f24a2 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 3 Mar 2021 19:34:35 +0100
Subject: op-mode: bgp: T1513: extend evpn show commands

---
 op-mode-definitions/include/vni-tagnode-all.xml.i  | 11 ++++++++++
 op-mode-definitions/include/vni-tagnode.xml.i      | 11 ++++++++++
 .../include/vtysh-generic-detail.xml.i             | 16 +++++++-------
 op-mode-definitions/show-bgp.xml.in                | 25 +++++++++-------------
 4 files changed, 40 insertions(+), 23 deletions(-)
 create mode 100644 op-mode-definitions/include/vni-tagnode-all.xml.i
 create mode 100644 op-mode-definitions/include/vni-tagnode.xml.i

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/include/vni-tagnode-all.xml.i b/op-mode-definitions/include/vni-tagnode-all.xml.i
new file mode 100644
index 000000000..0fedb9371
--- /dev/null
+++ b/op-mode-definitions/include/vni-tagnode-all.xml.i
@@ -0,0 +1,11 @@
+<!-- included start from vni-tagnode-all.xml.i -->
+<tagNode name="vni">
+  <properties>
+    <help>VXLAN network identifier (VNI) number</help>
+    <completionHelp>
+      <list>1-16777215 all</list>
+    </completionHelp>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/vni-tagnode.xml.i b/op-mode-definitions/include/vni-tagnode.xml.i
new file mode 100644
index 000000000..22f2d33bd
--- /dev/null
+++ b/op-mode-definitions/include/vni-tagnode.xml.i
@@ -0,0 +1,11 @@
+<!-- included start from vni-tagnode.xml.i -->
+<tagNode name="vni">
+  <properties>
+    <help>VXLAN network identifier (VNI) number</help>
+    <completionHelp>
+      <list>1-16777215</list>
+    </completionHelp>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/vtysh-generic-detail.xml.i b/op-mode-definitions/include/vtysh-generic-detail.xml.i
index 5a3097a77..d469f70c7 100644
--- a/op-mode-definitions/include/vtysh-generic-detail.xml.i
+++ b/op-mode-definitions/include/vtysh-generic-detail.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from vtysh-generic-detail.xml.i -->
-<leafNode name="detail">
-  <properties>
-    <help>Detailed information</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</leafNode>
-<!-- included end -->
+<!-- included start from vtysh-generic-detail.xml.i -->
+<leafNode name="detail">
+  <properties>
+    <help>Detailed information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/show-bgp.xml.in b/op-mode-definitions/show-bgp.xml.in
index cd0c5a9e5..0d0a88dfb 100644
--- a/op-mode-definitions/show-bgp.xml.in
+++ b/op-mode-definitions/show-bgp.xml.in
@@ -69,6 +69,7 @@
                 <properties>
                   <help>Ethernet Virtual Private Network</help>
                 </properties>
+                <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                 <children>
                   #include <include/bgp-afi-common.xml.i>
                   <node name="all">
@@ -106,12 +107,7 @@
                     <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                     <children>
                       #include <include/vtysh-generic-detail.xml.i>
-                      <tagNode name="vni">
-                        <properties>
-                          <help>VxLAN Network Identifier</help>
-                        </properties>
-                        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                      </tagNode>
+                      #include <include/vni-tagnode.xml.i>
                     </children>
                   </node>
                   <leafNode name="import-rt">
@@ -240,17 +236,16 @@
                           </leafNode>
                         </children>
                       </node>
-                      <tagNode name="vni">
-                        <properties>
-                          <help>VXLAN Network Identifier</help>
-                          <completionHelp>
-                            <list>1-16777215 all</list>
-                          </completionHelp>
-                        </properties>
-                        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                      </tagNode>
+                      #include <include/vni-tagnode-all.xml.i>
                     </children>
                   </node>
+                  #include <include/vni-tagnode.xml.i>
+                  <leafNode name="vni">
+                    <properties>
+                      <help>VXLAN network identifier (VNI)</help>
+                    </properties>
+                    <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                  </leafNode>
                 </children>
               </node>
             </children>
-- 
cgit v1.2.3