Merge branch 'current' into current

13 files changed, 102 insertions, 60 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>