From 34d789579cda1a940ac65671b41466880267944b Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 9 Apr 2021 19:44:44 +0200
Subject: op-mode: bgp: move common includes to include/bgp directory

This change makes it easier to group all BGP related operational level command
building blocks in one place.
---
 op-mode-definitions/include/bgp-afi-common.xml.i   |  40 ----
 .../include/bgp-afi-ipv4-ipv6-common.xml.i         | 243 ---------------------
 op-mode-definitions/include/bgp-common.xml.i       | 170 --------------
 .../include/bgp-prefix-bestpath-multipath.xml.i    |  20 --
 op-mode-definitions/include/bgp/afi-common.xml.i   |  40 ++++
 .../include/bgp/afi-ipv4-ipv6-common.xml.i         | 243 +++++++++++++++++++++
 .../include/bgp/prefix-bestpath-multipath.xml.i    |  20 ++
 .../include/bgp/show-ip-bgp-common.xml.i           | 170 ++++++++++++++
 op-mode-definitions/show-bgp.xml.in                |  16 +-
 op-mode-definitions/show-ip-bgp.xml.in             |   4 +-
 10 files changed, 483 insertions(+), 483 deletions(-)
 delete mode 100644 op-mode-definitions/include/bgp-afi-common.xml.i
 delete mode 100644 op-mode-definitions/include/bgp-afi-ipv4-ipv6-common.xml.i
 delete mode 100644 op-mode-definitions/include/bgp-common.xml.i
 delete mode 100644 op-mode-definitions/include/bgp-prefix-bestpath-multipath.xml.i
 create mode 100644 op-mode-definitions/include/bgp/afi-common.xml.i
 create mode 100644 op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i
 create mode 100644 op-mode-definitions/include/bgp/prefix-bestpath-multipath.xml.i
 create mode 100644 op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i

diff --git a/op-mode-definitions/include/bgp-afi-common.xml.i b/op-mode-definitions/include/bgp-afi-common.xml.i
deleted file mode 100644
index 06cfc42a5..000000000
--- a/op-mode-definitions/include/bgp-afi-common.xml.i
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- included start from bgp-afi-common.xml.i -->
-<tagNode name="community">
-  <properties>
-    <help>Community number where AA and NN are (0-65535)</help>
-    <completionHelp>
-      <list>AA:NN</list>
-    </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>
-  </children>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</tagNode>
-<tagNode name="large-community">
-  <properties>
-    <help>List of large-community numbers</help>
-    <completionHelp>
-      <list>AA:BB:CC</list>
-    </completionHelp>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</tagNode>
-<leafNode name="statistics">
-  <properties>
-    <help>RIB advertisement statistics</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</leafNode>
-<leafNode name="summary">
-  <properties>
-    <help>Summary of BGP neighbor status</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</leafNode>
-<!-- included end -->
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
deleted file mode 100644
index dc0926375..000000000
--- a/op-mode-definitions/include/bgp-afi-ipv4-ipv6-common.xml.i
+++ /dev/null
@@ -1,243 +0,0 @@
-<!-- included start from bgp-afi-ipv4-ipv6-common.xml.i -->
-<node name="community">
-  <properties>
-    <help>Display routes matching the community</help>
-  </properties>
-  <children>
-    <leafNode name="accept-own">
-      <properties>
-        <help>Should accept local VPN route if exported and imported into different VRF (well-known community)</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="accept-own-nexthop">
-      <properties>
-        <help>Should accept VPN route with local nexthop (well-known community)</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="blackhole">
-      <properties>
-        <help>Inform EBGP peers to blackhole traffic to prefix (well-known community)</help>
-      </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>
-    <leafNode name="graceful-shutdown">
-      <properties>
-        <help>Graceful shutdown (well-known community)</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="llgr-stale">
-      <properties>
-        <help>Staled Long-lived Graceful Restart VPN route (well-known community)</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="local-AS">
-      <properties>
-        <help>Do not send outside local AS (well-known community)</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="no-advertise">
-      <properties>
-        <help>Do not advertise to any peer (well-known community)</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="no-export">
-      <properties>
-        <help>Do not export to next AS (well-known community)</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="no-llgr">
-      <properties>
-        <help>Removed because Long-lived Graceful Restart was not enabled for VPN route (well-known community)</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="no-peer">
-      <properties>
-        <help>Do not export to any peer (well-known community)</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="route-filter-translated-v4">
-      <properties>
-        <help>RT translated VPNv4 route filtering (well-known community)</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="route-filter-translated-v6">
-      <properties>
-        <help>RT translated VPNv6 route filtering (well-known community)</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="route-filter-v4">
-      <properties>
-        <help>RT VPNv4 route filtering (well-known community)</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="route-filter-v6">
-      <properties>
-        <help>RT VPNv6 route filtering (well-known community)</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-  </children>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</node>
-<tagNode name="community-list">
-  <properties>
-    <help>Display routes matching the community-list</help>
-    <completionHelp>
-      <list>1-500 name</list>
-    </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>
-  </children>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</tagNode>
-<node name="dampening">
-  <properties>
-    <help>Display detailed information about dampening</help>
-  </properties>
-  <children>
-    <leafNode name="dampened-paths">
-      <properties>
-        <help>Display paths suppressed due to dampening</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="flap-statistics">
-      <properties>
-        <help>Display flap statistics of routes</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="parameters">
-      <properties>
-        <help>Display detail of configured dampening parameters</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-  </children>
-</node>
-<tagNode name="filter-list">
-  <properties>
-    <help>Display routes conforming to the filter-list</help>
-    <completionHelp>
-      <script>vtysh -c 'show bgp as-path-access-list' | grep 'AS path access list' | awk '{print $NF}'</script>
-    </completionHelp>
-  </properties>
-</tagNode>
-<node name="large-community">
-  <properties>
-    <help>Show BGP routes matching the specified large-communities</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</node>
-<leafNode name="neighbors">
-  <properties>
-    <help>Detailed information on TCP and BGP neighbor connections</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</leafNode>
-<tagNode name="neighbors">
-  <properties>
-    <help>Show detailed BGP IPv4 unicast neighbor information</help>
-    <completionHelp>
-      <script>vtysh -c 'show bgp summary' | awk '{print $1'} | grep -e '^[0-9a-f]'</script>
-    </completionHelp>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-  <children>
-    <leafNode name="advertised-routes">
-      <properties>
-        <help>Show routes advertised to a BGP neighbor</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="dampened-routes">
-      <properties>
-        <help>Show dampened routes received from BGP neighbor</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="flap-statistics">
-      <properties>
-        <help>Show flap statistics of the routes learned from BGP neighbor</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="prefix-counts">
-      <properties>
-        <help>Show detailed prefix count information for BGP neighbor</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <node name="received">
-      <properties>
-        <help>Show information received from BGP neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="prefix-filter">
-          <properties>
-            <help>Show prefixlist filter</help>
-          </properties>
-          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="received-routes">
-      <properties>
-        <help>Show received routes from BGP neighbor</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-    <leafNode name="routes">
-      <properties>
-        <help>Show routes learned from BGP neighbor</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-  </children>
-</tagNode>
-<tagNode name="prefix-list">
-  <properties>
-    <help>Display routes conforming to the prefix-list</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</tagNode>
-<tagNode name="regexp">
-  <properties>
-    <help>Display routes matching the AS path regular expression</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</tagNode>
-<tagNode name="route-map">
-  <properties>
-    <help>Show BGP routes matching the specified route map</help>
-    <completionHelp>
-      <path>policy route-map</path>
-    </completionHelp>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</tagNode>
-<!-- included end -->
diff --git a/op-mode-definitions/include/bgp-common.xml.i b/op-mode-definitions/include/bgp-common.xml.i
deleted file mode 100644
index 788fefd2c..000000000
--- a/op-mode-definitions/include/bgp-common.xml.i
+++ /dev/null
@@ -1,170 +0,0 @@
-<!-- included start from bgp-common.xml.i -->
-<leafNode name="attribute-info">
-  <properties>
-    <help>Show BGP attribute information</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</leafNode>
-<leafNode name="cidr-only">
-  <properties>
-    <help>Display only routes with non-natural netmasks</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</leafNode>
-<leafNode name="community-info">
-  <properties>
-    <help>List all bgp community information</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</leafNode>
-#include <include/bgp-afi-common.xml.i>
-#include <include/bgp-afi-ipv4-ipv6-common.xml.i>
-<tagNode name="prefix-list">
-  <properties>
-    <completionHelp>
-      <path>policy prefix-list</path>
-    </completionHelp>
-  </properties>
-</tagNode>
-<node name="ipv4">
-  <properties>
-    <help>Show BGP IPv4 information</help>
-  </properties>
-  <children>
-    <node name="unicast">
-      <properties>
-        <help>Show BGP IPv4 unicast information</help>
-      </properties>
-      <children>
-        <leafNode name="cidr-only">
-          <properties>
-            <help>Display only routes with non-natural netmasks</help>
-          </properties>
-          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-        </leafNode>
-        <node name="community">
-          <properties>
-            <help>Show BGP routes matching the communities</help>
-          </properties>
-          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-        </node>
-        <tagNode name="community">
-          <properties>
-            <help>Display routes matching the specified communities</help>
-            <completionHelp>
-              <list>&lt;AA:NN&gt; local-AS no-advertise no-export</list>
-            </completionHelp>
-          </properties>
-          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-        </tagNode>
-        <tagNode name="community-list">
-          <properties>
-            <help>Show BGP routes matching specified community list</help>
-          </properties>
-          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-          <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>
-          </children>
-        </tagNode>
-        <tagNode name="neighbors">
-          <properties>
-            <help>Show detailed BGP IPv4 unicast neighbor information</help>
-            <completionHelp>
-              <script>vtysh -c "show ip bgp ipv4 unicast summary" | awk '{print $1}' | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b"</script>
-            </completionHelp>
-          </properties>
-          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-          <children>
-            <leafNode name="advertised-routes">
-              <properties>
-                <help>Show routes advertised to a BGP neighbor</help>
-              </properties>
-              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-            </leafNode>
-            <leafNode name="prefix-counts">
-              <properties>
-                <help>Show detailed prefix count information</help>
-              </properties>
-              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-            </leafNode>
-            <leafNode name="received-routes">
-              <properties>
-                <help>Show the received routes from neighbor</help>
-              </properties>
-              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-            </leafNode>
-            <leafNode name="routes">
-              <properties>
-                <help>Show routes learned from neighbor</help>
-              </properties>
-              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-            </leafNode>
-          </children>
-        </tagNode>
-        <leafNode name="paths">
-          <properties>
-            <help>Show BGP path information</help>
-          </properties>
-          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-        </leafNode>
-         <tagNode name="prefix-list">
-          <properties>
-            <help>Show BGP routes matching the specified prefix list</help>
-          </properties>
-          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-        </tagNode>
-        <tagNode name="regexp">
-          <properties>
-            <help>Show BGP routes matching the specified AS path regular expression</help>
-          </properties>
-          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-        </tagNode>
-        <tagNode name="route-map">
-          <properties>
-            <help>Show BGP routes matching the specified route map</help>
-          </properties>
-          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-        </tagNode>
-        <leafNode name="summary">
-          <properties>
-            <help>Show summary of BGP information</help>
-          </properties>
-          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-        </leafNode>
-      </children>
-    </node>
-    <tagNode name="unicast">
-      <properties>
-        <help>Show BGP information for specified IP address or prefix</help>
-        <completionHelp>
-          <list>&lt;x.x.x.x&gt; &lt;x.x.x.x/x&gt;</list>
-        </completionHelp>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </tagNode>
-  </children>
-</node>
-<leafNode name="large-community-info">
-  <properties>
-    <help>Show BGP large-community information</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</leafNode>
-<leafNode name="memory">
-  <properties>
-    <help>Show BGP memory usage</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</leafNode>
-<leafNode name="paths">
-  <properties>
-    <help>Show BGP path information</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</leafNode>
-<!-- included end -->
diff --git a/op-mode-definitions/include/bgp-prefix-bestpath-multipath.xml.i b/op-mode-definitions/include/bgp-prefix-bestpath-multipath.xml.i
deleted file mode 100644
index 224fa6b45..000000000
--- a/op-mode-definitions/include/bgp-prefix-bestpath-multipath.xml.i
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- included start from bgp-prefix-bestpath-multipath.xml.i -->
-<leafNode name="bestpath">
-  <properties>
-    <help>Display only the bestpath</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</leafNode>
-<leafNode name="multipath">
-  <properties>
-    <help>Display only multipaths</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</leafNode>
-<leafNode name="longer-prefixes">
-  <properties>
-    <help>Display route and more specific routes</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</leafNode>
-<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/afi-common.xml.i b/op-mode-definitions/include/bgp/afi-common.xml.i
new file mode 100644
index 000000000..e48482282
--- /dev/null
+++ b/op-mode-definitions/include/bgp/afi-common.xml.i
@@ -0,0 +1,40 @@
+<!-- included start from bgp/afi-common.xml.i -->
+<tagNode name="community">
+  <properties>
+    <help>Community number where AA and NN are (0-65535)</help>
+    <completionHelp>
+      <list>AA:NN</list>
+    </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>
+  </children>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<tagNode name="large-community">
+  <properties>
+    <help>List of large-community numbers</help>
+    <completionHelp>
+      <list>AA:BB:CC</list>
+    </completionHelp>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<leafNode name="statistics">
+  <properties>
+    <help>RIB advertisement statistics</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<leafNode name="summary">
+  <properties>
+    <help>Summary of BGP neighbor status</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
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
new file mode 100644
index 000000000..f1b699347
--- /dev/null
+++ b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-common.xml.i
@@ -0,0 +1,243 @@
+<!-- included start from bgp/afi-ipv4-ipv6-common.xml.i -->
+<node name="community">
+  <properties>
+    <help>Display routes matching the community</help>
+  </properties>
+  <children>
+    <leafNode name="accept-own">
+      <properties>
+        <help>Should accept local VPN route if exported and imported into different VRF (well-known community)</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="accept-own-nexthop">
+      <properties>
+        <help>Should accept VPN route with local nexthop (well-known community)</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="blackhole">
+      <properties>
+        <help>Inform EBGP peers to blackhole traffic to prefix (well-known community)</help>
+      </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>
+    <leafNode name="graceful-shutdown">
+      <properties>
+        <help>Graceful shutdown (well-known community)</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="llgr-stale">
+      <properties>
+        <help>Staled Long-lived Graceful Restart VPN route (well-known community)</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="local-AS">
+      <properties>
+        <help>Do not send outside local AS (well-known community)</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="no-advertise">
+      <properties>
+        <help>Do not advertise to any peer (well-known community)</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="no-export">
+      <properties>
+        <help>Do not export to next AS (well-known community)</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="no-llgr">
+      <properties>
+        <help>Removed because Long-lived Graceful Restart was not enabled for VPN route (well-known community)</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="no-peer">
+      <properties>
+        <help>Do not export to any peer (well-known community)</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="route-filter-translated-v4">
+      <properties>
+        <help>RT translated VPNv4 route filtering (well-known community)</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="route-filter-translated-v6">
+      <properties>
+        <help>RT translated VPNv6 route filtering (well-known community)</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="route-filter-v4">
+      <properties>
+        <help>RT VPNv4 route filtering (well-known community)</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="route-filter-v6">
+      <properties>
+        <help>RT VPNv6 route filtering (well-known community)</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+  </children>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</node>
+<tagNode name="community-list">
+  <properties>
+    <help>Display routes matching the community-list</help>
+    <completionHelp>
+      <list>1-500 name</list>
+    </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>
+  </children>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<node name="dampening">
+  <properties>
+    <help>Display detailed information about dampening</help>
+  </properties>
+  <children>
+    <leafNode name="dampened-paths">
+      <properties>
+        <help>Display paths suppressed due to dampening</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="flap-statistics">
+      <properties>
+        <help>Display flap statistics of routes</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="parameters">
+      <properties>
+        <help>Display detail of configured dampening parameters</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+  </children>
+</node>
+<tagNode name="filter-list">
+  <properties>
+    <help>Display routes conforming to the filter-list</help>
+    <completionHelp>
+      <script>vtysh -c 'show bgp as-path-access-list' | grep 'AS path access list' | awk '{print $NF}'</script>
+    </completionHelp>
+  </properties>
+</tagNode>
+<node name="large-community">
+  <properties>
+    <help>Show BGP routes matching the specified large-communities</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</node>
+<leafNode name="neighbors">
+  <properties>
+    <help>Detailed information on TCP and BGP neighbor connections</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<tagNode name="neighbors">
+  <properties>
+    <help>Show detailed BGP IPv4 unicast neighbor information</help>
+    <completionHelp>
+      <script>vtysh -c 'show bgp summary' | awk '{print $1'} | grep -e '^[0-9a-f]'</script>
+    </completionHelp>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    <leafNode name="advertised-routes">
+      <properties>
+        <help>Show routes advertised to a BGP neighbor</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="dampened-routes">
+      <properties>
+        <help>Show dampened routes received from BGP neighbor</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="flap-statistics">
+      <properties>
+        <help>Show flap statistics of the routes learned from BGP neighbor</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="prefix-counts">
+      <properties>
+        <help>Show detailed prefix count information for BGP neighbor</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <node name="received">
+      <properties>
+        <help>Show information received from BGP neighbor</help>
+      </properties>
+      <children>
+        <leafNode name="prefix-filter">
+          <properties>
+            <help>Show prefixlist filter</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
+      </children>
+    </node>
+    <leafNode name="received-routes">
+      <properties>
+        <help>Show received routes from BGP neighbor</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <leafNode name="routes">
+      <properties>
+        <help>Show routes learned from BGP neighbor</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+  </children>
+</tagNode>
+<tagNode name="prefix-list">
+  <properties>
+    <help>Display routes conforming to the prefix-list</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<tagNode name="regexp">
+  <properties>
+    <help>Display routes matching the AS path regular expression</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<tagNode name="route-map">
+  <properties>
+    <help>Show BGP routes matching the specified route map</help>
+    <completionHelp>
+      <path>policy route-map</path>
+    </completionHelp>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/prefix-bestpath-multipath.xml.i b/op-mode-definitions/include/bgp/prefix-bestpath-multipath.xml.i
new file mode 100644
index 000000000..2d91a8253
--- /dev/null
+++ b/op-mode-definitions/include/bgp/prefix-bestpath-multipath.xml.i
@@ -0,0 +1,20 @@
+<!-- included start from bgp/prefix-bestpath-multipath.xml.i -->
+<leafNode name="bestpath">
+  <properties>
+    <help>Display only the bestpath</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<leafNode name="multipath">
+  <properties>
+    <help>Display only multipaths</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<leafNode name="longer-prefixes">
+  <properties>
+    <help>Display route and more specific routes</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i b/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i
new file mode 100644
index 000000000..e599bfb3f
--- /dev/null
+++ b/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i
@@ -0,0 +1,170 @@
+<!-- included start from bgp/show-ip-bgp-common.xml.i -->
+<leafNode name="attribute-info">
+  <properties>
+    <help>Show BGP attribute information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<leafNode name="cidr-only">
+  <properties>
+    <help>Display only routes with non-natural netmasks</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<leafNode name="community-info">
+  <properties>
+    <help>List all bgp community information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+#include <include/bgp/afi-common.xml.i>
+#include <include/bgp/afi-ipv4-ipv6-common.xml.i>
+<tagNode name="prefix-list">
+  <properties>
+    <completionHelp>
+      <path>policy prefix-list</path>
+    </completionHelp>
+  </properties>
+</tagNode>
+<node name="ipv4">
+  <properties>
+    <help>Show BGP IPv4 information</help>
+  </properties>
+  <children>
+    <node name="unicast">
+      <properties>
+        <help>Show BGP IPv4 unicast information</help>
+      </properties>
+      <children>
+        <leafNode name="cidr-only">
+          <properties>
+            <help>Display only routes with non-natural netmasks</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
+        <node name="community">
+          <properties>
+            <help>Show BGP routes matching the communities</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </node>
+        <tagNode name="community">
+          <properties>
+            <help>Display routes matching the specified communities</help>
+            <completionHelp>
+              <list>&lt;AA:NN&gt; local-AS no-advertise no-export</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <tagNode name="community-list">
+          <properties>
+            <help>Show BGP routes matching specified community list</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+          <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>
+          </children>
+        </tagNode>
+        <tagNode name="neighbors">
+          <properties>
+            <help>Show detailed BGP IPv4 unicast neighbor information</help>
+            <completionHelp>
+              <script>vtysh -c "show ip bgp ipv4 unicast summary" | awk '{print $1}' | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b"</script>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+          <children>
+            <leafNode name="advertised-routes">
+              <properties>
+                <help>Show routes advertised to a BGP neighbor</help>
+              </properties>
+              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+            </leafNode>
+            <leafNode name="prefix-counts">
+              <properties>
+                <help>Show detailed prefix count information</help>
+              </properties>
+              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+            </leafNode>
+            <leafNode name="received-routes">
+              <properties>
+                <help>Show the received routes from neighbor</help>
+              </properties>
+              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+            </leafNode>
+            <leafNode name="routes">
+              <properties>
+                <help>Show routes learned from neighbor</help>
+              </properties>
+              <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+            </leafNode>
+          </children>
+        </tagNode>
+        <leafNode name="paths">
+          <properties>
+            <help>Show BGP path information</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
+         <tagNode name="prefix-list">
+          <properties>
+            <help>Show BGP routes matching the specified prefix list</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <tagNode name="regexp">
+          <properties>
+            <help>Show BGP routes matching the specified AS path regular expression</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <tagNode name="route-map">
+          <properties>
+            <help>Show BGP routes matching the specified route map</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <leafNode name="summary">
+          <properties>
+            <help>Show summary of BGP information</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
+      </children>
+    </node>
+    <tagNode name="unicast">
+      <properties>
+        <help>Show BGP information for specified IP address or prefix</help>
+        <completionHelp>
+          <list>&lt;x.x.x.x&gt; &lt;x.x.x.x/x&gt;</list>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </tagNode>
+  </children>
+</node>
+<leafNode name="large-community-info">
+  <properties>
+    <help>Show BGP large-community information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<leafNode name="memory">
+  <properties>
+    <help>Show BGP memory usage</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<leafNode name="paths">
+  <properties>
+    <help>Show BGP path 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 0d0a88dfb..62abbe938 100644
--- a/op-mode-definitions/show-bgp.xml.in
+++ b/op-mode-definitions/show-bgp.xml.in
@@ -8,7 +8,7 @@
         </properties>
         <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
         <children>
-          #include <include/bgp-afi-ipv4-ipv6-common.xml.i>
+          #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
           <tagNode name="ipv4">
             <properties>
               <help>Network in the BGP routing table to display</help>
@@ -17,7 +17,7 @@
               </completionHelp>
             </properties>
             <children>
-              #include <include/bgp-prefix-bestpath-multipath.xml.i>
+              #include <include/bgp/prefix-bestpath-multipath.xml.i>
             </children>
             <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
           </tagNode>
@@ -26,8 +26,8 @@
               <help>IPv4 Address Family</help>
             </properties>
             <children>
-              #include <include/bgp-afi-common.xml.i>
-              #include <include/bgp-afi-ipv4-ipv6-common.xml.i>
+              #include <include/bgp/afi-common.xml.i>
+              #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
             </children>
           </node>
           <tagNode name="ipv6">
@@ -38,7 +38,7 @@
               </completionHelp>
             </properties>
             <children>
-              #include <include/bgp-prefix-bestpath-multipath.xml.i>
+              #include <include/bgp/prefix-bestpath-multipath.xml.i>
             </children>
             <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
           </tagNode>
@@ -47,8 +47,8 @@
               <help>IPv6 Address Family</help>
             </properties>
             <children>
-              #include <include/bgp-afi-common.xml.i>
-              #include <include/bgp-afi-ipv4-ipv6-common.xml.i>
+              #include <include/bgp/afi-common.xml.i>
+              #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
             </children>
           </node>
           <node name="l2vpn">
@@ -71,7 +71,7 @@
                 </properties>
                 <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                 <children>
-                  #include <include/bgp-afi-common.xml.i>
+                  #include <include/bgp/afi-common.xml.i>
                   <node name="all">
                     <properties>
                       <help>Display information about all EVPN NLRIs</help>
diff --git a/op-mode-definitions/show-ip-bgp.xml.in b/op-mode-definitions/show-ip-bgp.xml.in
index 9a271b4a5..4097bcf2d 100644
--- a/op-mode-definitions/show-ip-bgp.xml.in
+++ b/op-mode-definitions/show-ip-bgp.xml.in
@@ -10,7 +10,7 @@
             </properties>
             <command>vtysh -c "show ip bgp"</command>
             <children>
-              #include <include/bgp-common.xml.i>
+              #include <include/bgp/show-ip-bgp-common.xml.i>
               <tagNode name="vrf">
                 <properties>
                   <help>Show bgp routing protocol for given VRF</help>
@@ -20,7 +20,7 @@
                   </completionHelp>
                 </properties>
                 <children>
-                  #include <include/bgp-common.xml.i>
+                  #include <include/bgp/show-ip-bgp-common.xml.i>
                 </children>
               </tagNode>
             </children>
-- 
cgit v1.2.3