Merge branch 'current' into current

17 files changed, 153 insertions, 111 deletions

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 7dbc4fde5..820d507fd 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
@@ -195,6 +195,12 @@
         </leafNode>
       </children>
     </node>
+    <leafNode name="filtered-routes">
+      <properties>
+        <help>Show filtered routes from BGP neighbor</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
     <leafNode name="received-routes">
       <properties>
         <help>Show received routes from BGP neighbor</help>
diff --git a/op-mode-definitions/include/bgp/evpn-type-1.xml.i b/op-mode-definitions/include/bgp/evpn-type-1.xml.i
new file mode 100644
index 000000000..b5097c8b1
--- /dev/null
+++ b/op-mode-definitions/include/bgp/evpn-type-1.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp/evpn-type-1.xml.i -->
+<leafNode name="1">
+  <properties>
+    <help>EAD (Type-1) route</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/evpn-type-2.xml.i b/op-mode-definitions/include/bgp/evpn-type-2.xml.i
new file mode 100644
index 000000000..827298d62
--- /dev/null
+++ b/op-mode-definitions/include/bgp/evpn-type-2.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp/evpn-type-2.xml.i -->
+<leafNode name="2">
+  <properties>
+    <help>MAC-IP (Type-2) route</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/evpn-type-3.xml.i b/op-mode-definitions/include/bgp/evpn-type-3.xml.i
new file mode 100644
index 000000000..ae90b2e5c
--- /dev/null
+++ b/op-mode-definitions/include/bgp/evpn-type-3.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp/evpn-type-3.xml.i -->
+<leafNode name="3">
+  <properties>
+    <help>Multicast (Type-3) route</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/evpn-type-4.xml.i b/op-mode-definitions/include/bgp/evpn-type-4.xml.i
new file mode 100644
index 000000000..7248b4753
--- /dev/null
+++ b/op-mode-definitions/include/bgp/evpn-type-4.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp/evpn-type-4.xml.i -->
+<leafNode name="4">
+  <properties>
+    <help>Ethernet Segment (Type-4) route</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/evpn-type-5.xml.i b/op-mode-definitions/include/bgp/evpn-type-5.xml.i
new file mode 100644
index 000000000..e3a72168a
--- /dev/null
+++ b/op-mode-definitions/include/bgp/evpn-type-5.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp/evpn-type-5.xml.i -->
+<leafNode name="5">
+  <properties>
+    <help>Prefix (Type-5) route</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/evpn-type-ead.xml.i b/op-mode-definitions/include/bgp/evpn-type-ead.xml.i
new file mode 100644
index 000000000..452de2f9a
--- /dev/null
+++ b/op-mode-definitions/include/bgp/evpn-type-ead.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp/evpn-type-ead.xml.i -->
+<leafNode name="ead">
+  <properties>
+    <help>EAD (Type-1) route</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/evpn-type-es.xml.i b/op-mode-definitions/include/bgp/evpn-type-es.xml.i
new file mode 100644
index 000000000..50c40151a
--- /dev/null
+++ b/op-mode-definitions/include/bgp/evpn-type-es.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp/evpn-type-es.xml.i -->
+<leafNode name="es">
+  <properties>
+    <help>Ethernet Segment (Type-4) route</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/evpn-type-macip.xml.i b/op-mode-definitions/include/bgp/evpn-type-macip.xml.i
new file mode 100644
index 000000000..6f601eb3f
--- /dev/null
+++ b/op-mode-definitions/include/bgp/evpn-type-macip.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp/evpn-type-macip.xml.i -->
+<leafNode name="macip">
+  <properties>
+    <help>MAC-IP (Type-2) route</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/evpn-type-multicast.xml.i b/op-mode-definitions/include/bgp/evpn-type-multicast.xml.i
new file mode 100644
index 000000000..5194dbb56
--- /dev/null
+++ b/op-mode-definitions/include/bgp/evpn-type-multicast.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp/evpn-type-multicast.xml.i -->
+<leafNode name="multicast">
+  <properties>
+    <help>Multicast (Type-3) route</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/bgp/evpn-type-prefix.xml.i b/op-mode-definitions/include/bgp/evpn-type-prefix.xml.i
new file mode 100644
index 000000000..d5054d86b
--- /dev/null
+++ b/op-mode-definitions/include/bgp/evpn-type-prefix.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp/evpn-type-prefix.xml.i -->
+<leafNode name="prefix">
+  <properties>
+    <help>Prefix (Type-5) route</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- 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 c9a112fca..de794a879 100644
--- a/op-mode-definitions/include/bgp/show-bgp-common.xml.i
+++ b/op-mode-definitions/include/bgp/show-bgp-common.xml.i
@@ -171,66 +171,16 @@
                 <help>Specify Route type</help>
               </properties>
               <children>
-                <leafNode name="1">
-                  <properties>
-                    <help>EAD (Type-1) route</help>
-                  </properties>
-                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                </leafNode>
-                <leafNode name="2">
-                  <properties>
-                    <help>MAC-IP (Type-2) route</help>
-                  </properties>
-                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                </leafNode>
-                <leafNode name="3">
-                  <properties>
-                    <help>Multicast (Type-3) route</help>
-                  </properties>
-                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                </leafNode>
-                <leafNode name="4">
-                  <properties>
-                    <help>Ethernet Segment (Type-4) route</help>
-                  </properties>
-                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                </leafNode>
-                <leafNode name="5">
-                  <properties>
-                    <help>Prefix (Type-5) route</help>
-                  </properties>
-                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                </leafNode>
-                <leafNode name="ead">
-                  <properties>
-                    <help>EAD (Type-1) route</help>
-                  </properties>
-                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                </leafNode>
-                <leafNode name="es">
-                  <properties>
-                    <help>Ethernet Segment (Type-4) route</help>
-                  </properties>
-                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                </leafNode>
-                <leafNode name="macip">
-                  <properties>
-                    <help>MAC-IP (Type-2) route</help>
-                  </properties>
-                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                </leafNode>
-                <leafNode name="multicast">
-                  <properties>
-                    <help>Multicast (Type-3) route</help>
-                  </properties>
-                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                </leafNode>
-                <leafNode name="prefix">
-                  <properties>
-                    <help>Prefix (Type-5) route</help>
-                  </properties>
-                  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-                </leafNode>
+                #include <include/bgp/evpn-type-1.xml.i>
+                #include <include/bgp/evpn-type-2.xml.i>
+                #include <include/bgp/evpn-type-3.xml.i>
+                #include <include/bgp/evpn-type-4.xml.i>
+                #include <include/bgp/evpn-type-5.xml.i>
+                #include <include/bgp/evpn-type-ead.xml.i>
+                #include <include/bgp/evpn-type-es.xml.i>
+                #include <include/bgp/evpn-type-macip.xml.i>
+                #include <include/bgp/evpn-type-multicast.xml.i>
+                #include <include/bgp/evpn-type-prefix.xml.i>
               </children>
             </node>
             #include <include/vni-tagnode-all.xml.i>
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
index 36cc9a3fa..db9021f3e 100644
--- a/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i
+++ b/op-mode-definitions/include/bgp/show-ip-bgp-common.xml.i
@@ -93,6 +93,12 @@
               </properties>
               <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
             </leafNode>
+            <leafNode name="filtered-routes">
+              <properties>
+                <help>Show the filtered routes from neighbor</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>
diff --git a/op-mode-definitions/include/isis-common.xml.i b/op-mode-definitions/include/isis-common.xml.i
index 95a171515..e94d868e8 100644
--- a/op-mode-definitions/include/isis-common.xml.i
+++ b/op-mode-definitions/include/isis-common.xml.i
@@ -4,12 +4,7 @@
     <help>Show IS-IS link state database</help>
   </properties>
   <children>
-    <leafNode name="detail">
-      <properties>
-        <help>Show detailed information</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
+    #include <include/vtysh-generic-detail.xml.i>
   </children>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </node>
@@ -36,27 +31,22 @@
     </completionHelp>
   </properties>
   <children>
-    <leafNode name="detail">
-      <properties>
-        <help>Show detailed information</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
+    #include <include/vtysh-generic-detail.xml.i>
   </children>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </node>
-<tagNode name="interface">
+#include <include/vtysh-generic-interface-tagNode.xml.i>
+<node name="mpls">
   <properties>
-    <help>Show specific IS-IS interface</help>
-    <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces</script>
-    </completionHelp>
+    <help>Show MPLS information</help>
   </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</tagNode>
+  <children>
+  #include <include/ldp-sync.xml.i>
+  </children>
+</node>
 <node name="mpls-te">
   <properties>
-    <help>Show IS-IS MPLS traffic engineering information</help>
+    <help>Show MPLS traffic engineering information</help>
   </properties>
   <children>
     <leafNode name="router">
@@ -71,15 +61,7 @@
       </properties>
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
-    <tagNode name="interface">
-      <properties>
-        <help>Show specific IS-IS interface</help>
-        <completionHelp>
-          <script>${vyos_completion_dir}/list_interfaces</script>
-        </completionHelp>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </tagNode>
+    #include <include/vtysh-generic-interface-tagNode.xml.i>
   </children>
 </node>
 <node name="neighbor">
@@ -87,14 +69,9 @@
     <help>Show IS-IS neighbor adjacencies</help>
   </properties>
   <children>
-    <leafNode name="detail">
-      <properties>
-        <help>Show detailed information</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
+    #include <include/vtysh-generic-detail.xml.i>
   </children>
-  <command>vtysh -c "show isis neighbor"</command>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </node>
 <tagNode name="neighbor">
   <properties>
@@ -122,8 +99,14 @@
       </properties>
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
+    <leafNode name="prefix-sid">
+     <properties>
+       <help>Show Prefix-SID information</help>
+     </properties>
+     <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+   </leafNode>
   </children>
-  <command>vtysh -c "show isis route"</command>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </node>
 <node name="segment-routing">
   <properties>
@@ -136,12 +119,6 @@
       </properties>
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
     </leafNode>
-    <leafNode name="prefix-sids">
-      <properties>
-        <help>Show prefix segment IDs</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
   </children>
 </node>
 <leafNode name="spf-delay-ietf">
@@ -176,4 +153,4 @@
   </children>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </node>
-<!-- included end -->
+<!-- included end -->
\ No newline at end of file
diff --git a/op-mode-definitions/include/ldp-sync.xml.i b/op-mode-definitions/include/ldp-sync.xml.i
new file mode 100644
index 000000000..b7b04e7e5
--- /dev/null
+++ b/op-mode-definitions/include/ldp-sync.xml.i
@@ -0,0 +1,11 @@
+<!-- included start from ldp-sync.xml.i -->
+<node name="ldp-sync">
+  <properties>
+    <help>Show LDP-IGP synchronization information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    #include <include/vtysh-generic-interface-tagNode.xml.i>
+  </children>
+</node>
+<!-- included end -->
\ No newline at end of file
diff --git a/op-mode-definitions/include/ospf-common.xml.i b/op-mode-definitions/include/ospf-common.xml.i
index 14b7839ec..979ffb07e 100644
--- a/op-mode-definitions/include/ospf-common.xml.i
+++ b/op-mode-definitions/include/ospf-common.xml.i
@@ -508,15 +508,15 @@
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </node>
-<tagNode name="interface">
+#include <include/vtysh-generic-interface-tagNode.xml.i>
+<node name="mpls">
   <properties>
-    <help>Show IPv4 OSPF information for specified interface</help>
-    <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces</script>
-    </completionHelp>
+    <help>Show MPLS information</help>
   </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</tagNode>
+  <children>
+  #include <include/ldp-sync.xml.i>
+  </children>
+</node>
 <node name="neighbor">
   <properties>
     <help>Show IPv4 OSPF neighbor information</help>
@@ -556,3 +556,4 @@
   </children>
 </node>
 <!-- included end -->
+
diff --git a/op-mode-definitions/include/vtysh-generic-interface-tagNode.xml.i b/op-mode-definitions/include/vtysh-generic-interface-tagNode.xml.i
new file mode 100644
index 000000000..e95961177
--- /dev/null
+++ b/op-mode-definitions/include/vtysh-generic-interface-tagNode.xml.i
@@ -0,0 +1,11 @@
+<!-- included start from vtysh-generic-interface.xml.i -->
+<tagNode name="interface">
+  <properties>
+    <help>Show information about specific interface</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_interfaces</script>
+    </completionHelp>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<!-- included end -->