3 files changed, 56 insertions, 0 deletions
diff --git a/op-mode-definitions/include/bfd-common.xml.i b/op-mode-definitions/include/bfd-common.xml.i
new file mode 100644
index 000000000..eebfbdad4
--- /dev/null
+++ b/op-mode-definitions/include/bfd-common.xml.i
@@ -0,0 +1,54 @@
+<!-- included start from bfd-common.xml.i -->
+<node name="bfd">
+  <properties>
+    <help>Show Bidirectional Forwarding Detection (BFD)</help>
+  </properties>
+  <children>
+    <node name="peer">
+      <properties>
+        <help>Show all Bidirectional Forwarding Detection (BFD) peer status</help>
+      </properties>
+      <command>vtysh -c "show bfd peers"</command>
+      <children>
+        <leafNode name="counters">
+          <properties>
+            <help>Show Bidirectional Forwarding Detection (BFD) peer counters</help>
+          </properties>
+          <command>vtysh -c "show bfd peers counters"</command>
+        </leafNode>
+      </children>
+    </node>
+    <tagNode name="peer">
+      <properties>
+        <help>Show Bidirectional Forwarding Detection (BFD) peer status</help>
+        <completionHelp>
+          <script>vtysh -c "show bfd peers" | awk '/[:blank:]*peer/ { printf "%s\n", $2 }'</script>
+        </completionHelp>
+      </properties>
+      <command>vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("vtysh -c \"show bfd " peer "\"") }'</command>
+      <children>
+        <leafNode name="counters">
+          <properties>
+            <help>Show Bidirectional Forwarding Detection (BFD) peer counters</help>
+          </properties>
+          <command>vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("vtysh -c \"show bfd " peer " counters\"") }'</command>
+        </leafNode>
+      </children>
+    </tagNode>
+    <node name="peers">
+      <properties>
+        <help>Show Bidirectional Forwarding Detection peers</help>
+      </properties>
+      <command>vtysh -c "show bfd peers"</command>
+      <children>
+        <leafNode name="brief">
+          <properties>
+            <help>Show Bidirectional Forwarding Detection (BFD) peers brief</help>
+          </properties>
+          <command>vtysh -c "show bfd peers brief"</command>
+        </leafNode>
+      </children>
+    </node>
+  </children>
+</node>
+<!-- included end -->
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
index ba6edb256..f6737c8bd 100644
--- a/op-mode-definitions/include/bgp/afi-ipv4-ipv6-vpn.xml.i
+++ b/op-mode-definitions/include/bgp/afi-ipv4-ipv6-vpn.xml.i
@@ -19,5 +19,6 @@
     #include <include/bgp/afi-common.xml.i>
     #include <include/bgp/afi-ipv4-ipv6-common.xml.i>
   </children>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </node>
 <!-- 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
index e599bfb3f..36cc9a3fa 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
@@ -35,6 +35,7 @@
       <properties>
         <help>Show BGP IPv4 unicast information</help>
       </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
         <leafNode name="cidr-only">
           <properties>