Merge pull request #790 from sever-sever/T3434

bgp: ospf: T3434: op-mode refactoring for support vrf

4 files changed, 744 insertions, 713 deletions

diff --git a/op-mode-definitions/include/bgp-common.xml.i b/op-mode-definitions/include/bgp-common.xml.i
new file mode 100644
index 000000000..a1154d965
--- /dev/null
+++ b/op-mode-definitions/include/bgp-common.xml.i
@@ -0,0 +1,170 @@
+<!-- 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/ospf-common.xml.i b/op-mode-definitions/include/ospf-common.xml.i
new file mode 100644
index 000000000..0edc3c37f
--- /dev/null
+++ b/op-mode-definitions/include/ospf-common.xml.i
@@ -0,0 +1,559 @@
+<!-- included start from ospf-common.xml.i -->
+<leafNode name="border-routers">
+  <properties>
+    <help>Show IPv4 OSPF border-routers information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<node name="database">
+  <properties>
+    <help>Show IPv4 OSPF database information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    <node name="asbr-summary">
+      <properties>
+        <help>Show IPv4 OSPF ASBR summary database</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF ASBR summary database for given address of advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <node name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF ASBR summary database for given address of advertised router</help>
+          </properties>
+        </node>
+      </children>
+    </node>
+    <tagNode name="asbr-summary">
+      <properties>
+        <help>Show IPv4 OSPF ASBR summary database information of given address</help>
+        <completionHelp>
+          <list>&lt;x.x.x.x&gt;</list>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <node name="adv-router">
+          <properties>
+            <help>Show advertising router link states</help>
+          </properties>
+        </node>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF ASBR summary database of given address for given advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <leafNode name="self-originate">
+          <properties>
+            <help>Show summary of self-originate IPv4 OSPF ASBR database</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
+      </children>
+    </tagNode>
+    <node name="external">
+      <properties>
+        <help>Show IPv4 OSPF external database</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF external database for specified IP address of advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <node name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF external database for specified IP address of advertised router</help>
+          </properties>
+        </node>
+      </children>
+    </node>
+    <tagNode name="external">
+      <properties>
+        <help>Show IPv4 OSPF external database information of specified IP address</help>
+        <completionHelp>
+          <list>&lt;x.x.x.x&gt;</list>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <node name="adv-router">
+          <properties>
+            <help>Show advertising router link states</help>
+          </properties>
+        </node>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF external database of specified IP address for specified advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <leafNode name="self-originate">
+          <properties>
+            <help>Show self-originate IPv4 OSPF external database</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
+      </children>
+    </tagNode>
+    <leafNode name="max-age">
+      <properties>
+        <help>Show IPv4 OSPF max-age database</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <node name="network">
+      <properties>
+        <help>Show IPv4 OSPF network database</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF network database for specified IP address of advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <node name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF network database for given address of advertised router</help>
+          </properties>
+        </node>
+      </children>
+    </node>
+    <tagNode name="network">
+      <properties>
+        <help>Show IPv4 OSPF network database information of specified IP address</help>
+        <completionHelp>
+          <list>&lt;x.x.x.x&gt;</list>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <node name="adv-router">
+          <properties>
+            <help>Show advertising router link states</help>
+          </properties>
+        </node>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF network database of specified IP address for specified advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <leafNode name="self-originate">
+          <properties>
+            <help>Show self-originate IPv4 OSPF network database</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
+      </children>
+    </tagNode>
+    <node name="nssa-external">
+      <properties>
+        <help>Show IPv4 OSPF NSSA external database</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF NSSA external database for specified IP address of advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <node name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF NSSA external database for specified IP address of advertised router</help>
+          </properties>
+        </node>
+      </children>
+    </node>
+    <tagNode name="nssa-external">
+      <properties>
+        <help>Show IPv4 OSPF NSSA external database information of specified IP address</help>
+        <completionHelp>
+          <list>&lt;x.x.x.x&gt;</list>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <node name="adv-router">
+          <properties>
+            <help>Show advertising router link states</help>
+          </properties>
+        </node>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF NSSA external database of specified IP address for specified advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <leafNode name="self-originate">
+          <properties>
+            <help>Show self-originate IPv4 OSPF NSSA external database</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
+      </children>
+    </tagNode>
+    <node name="opaque-area">
+      <properties>
+        <help>Show IPv4 OSPF opaque-area database</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF opaque-area database for specified IP address of advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <node name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF opaque-area database for specified IP address of advertised router</help>
+          </properties>
+        </node>
+      </children>
+    </node>
+    <tagNode name="opaque-area">
+      <properties>
+        <help>Show IPv4 OSPF opaque-area database information of specified IP address</help>
+        <completionHelp>
+          <list>&lt;x.x.x.x&gt;</list>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <node name="adv-router">
+          <properties>
+            <help>Show advertising router link states</help>
+          </properties>
+        </node>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF opaque-area database of specified IP address for specified advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <leafNode name="self-originate">
+          <properties>
+            <help>Show self-originate IPv4 OSPF opaque-area database</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
+      </children>
+    </tagNode>
+    <node name="opaque-as">
+      <properties>
+        <help>Show IPv4 OSPF opaque-as database</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF opaque-as database for specified IP address of advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <node name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF opaque-as database for specified IP address of advertised router</help>
+          </properties>
+        </node>
+      </children>
+    </node>
+    <tagNode name="opaque-as">
+      <properties>
+        <help>Show IPv4 OSPF opaque-as database information of specified IP address</help>
+        <completionHelp>
+          <list>&lt;x.x.x.x&gt;</list>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <node name="adv-router">
+          <properties>
+            <help>Show advertising router link states</help>
+          </properties>
+        </node>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF opaque-as database of specified IP address for specified advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <leafNode name="self-originate">
+          <properties>
+            <help>Show self-originate IPv4 OSPF opaque-as database</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
+      </children>
+    </tagNode>
+    <node name="opaque-link">
+      <properties>
+        <help>Show IPv4 OSPF opaque-link database</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF opaque-link database for specified IP address of advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <node name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF opaque-link database for specified IP address of advertised router</help>
+          </properties>
+        </node>
+      </children>
+    </node>
+    <tagNode name="opaque-link">
+      <properties>
+        <help>Show IPv4 OSPF opaque-link database information of specified IP address</help>
+        <completionHelp>
+          <list>&lt;x.x.x.x&gt;</list>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <node name="adv-router">
+          <properties>
+            <help>Show advertising router link states</help>
+          </properties>
+        </node>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF opaque-link database of specified IP address for specified advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <leafNode name="self-originate">
+          <properties>
+            <help>Show self-originate IPv4 OSPF opaque-link database</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
+      </children>
+    </tagNode>
+    <node name="router">
+      <properties>
+        <help>Show IPv4 OSPF router database</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF router database for specified IP address of advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <node name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF router database for specified IP address of advertised router</help>
+          </properties>
+        </node>
+      </children>
+    </node>
+    <tagNode name="router">
+      <properties>
+        <help>Show IPv4 OSPF router database information of specified IP address</help>
+        <completionHelp>
+          <list>&lt;x.x.x.x&gt;</list>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <node name="adv-router">
+          <properties>
+            <help>Show advertising router link states</help>
+          </properties>
+        </node>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF router database of specified IP address for specified advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <leafNode name="self-originate">
+          <properties>
+            <help>Show self-originate IPv4 OSPF router database</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
+      </children>
+    </tagNode>
+    <leafNode name="self-originate">
+      <properties>
+        <help>Show IPv4 OSPF self-originate database</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+    <node name="summary">
+      <properties>
+        <help>Show summary of IPv4 OSPF database</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF summary database for specified IP address of advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <node name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF summary database for specified IP address of advertised router</help>
+          </properties>
+        </node>
+      </children>
+    </node>
+    <tagNode name="summary">
+      <properties>
+        <help>Show IPv4 OSPF summary database information of specified IP address</help>
+        <completionHelp>
+          <list>&lt;x.x.x.x&gt;</list>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <node name="adv-router">
+          <properties>
+            <help>Show advertising router link states</help>
+          </properties>
+        </node>
+        <tagNode name="adv-router">
+          <properties>
+            <help>Show IPv4 OSPF summary database of specified IP address for specified advertised router</help>
+            <completionHelp>
+             <list>&lt;x.x.x.x&gt;</list>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+        <leafNode name="self-originate">
+          <properties>
+            <help>Show self-originate IPv4 OSPF summary database</help>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </leafNode>
+      </children>
+    </tagNode>
+  </children>
+</node>
+<node name="interface">
+  <properties>
+    <help>Show IPv4 OSPF interface information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</node>
+<tagNode name="interface">
+  <properties>
+    <help>Show IPv4 OSPF information for specified interface</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_interfaces.py</script>
+    </completionHelp>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<node name="neighbor">
+  <properties>
+    <help>Show IPv4 OSPF neighbor information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    <tagNode name="address">
+      <properties>
+        <help>Show IPv4 OSPF neighbor information for specified IP address</help>
+        <completionHelp>
+          <list>&lt;x.x.x.x&gt;</list>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </tagNode>
+    <node name="detail">
+      <properties>
+        <help>Show detailed IPv4 OSPF neighbor information</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </node>
+  </children>
+</node>
+<tagNode name="neighbor">
+  <properties>
+    <help>Show IPv4 OSPF neighbor information for specified IP address or interface</help>
+    <completionHelp>
+      <list>&lt;x.x.x.x&gt;</list>
+      <script>${vyos_completion_dir}/list_interfaces.py</script>
+    </completionHelp>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<leafNode name="route">
+  <properties>
+    <help>Show IPv4 OSPF route information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/show-ip-bgp.xml.in b/op-mode-definitions/show-ip-bgp.xml.in
index 690de0a1d..9a271b4a5 100644
--- a/op-mode-definitions/show-ip-bgp.xml.in
+++ b/op-mode-definitions/show-ip-bgp.xml.in
@@ -10,174 +10,19 @@
             </properties>
             <command>vtysh -c "show ip bgp"</command>
             <children>
-              <leafNode name="attribute-info">
-                <properties>
-                  <help>Show BGP attribute information</help>
-                </properties>
-                <command>vtysh -c "show ip bgp attribute-info"</command>
-              </leafNode>
-              <leafNode name="cidr-only">
-                <properties>
-                  <help>Display only routes with non-natural netmasks</help>
-                </properties>
-                <command>vtysh -c "show ip bgp cidr-only"</command>
-              </leafNode>
-              <leafNode name="community-info">
-                <properties>
-                  <help>List all bgp community information</help>
-                </properties>
-                <command>vtysh -c "show ip bgp community-info"</command>
-              </leafNode>
-              #include <include/bgp-afi-common.xml.i>
-              #include <include/bgp-afi-ipv4-ipv6-common.xml.i>
-              <tagNode name="prefix-list">
+              #include <include/bgp-common.xml.i>
+              <tagNode name="vrf">
                 <properties>
+                  <help>Show bgp routing protocol for given VRF</help>
                   <completionHelp>
-                    <path>policy prefix-list</path>
+                    <path>vrf name</path>
+                    <list>all</list>
                   </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>vtysh -c "show ip bgp ipv4 unicast cidr-only"</command>
-                      </leafNode>
-                      <node name="community">  <!--  START new code -->
-                        <properties>
-                          <help>Show BGP routes matching the communities</help>
-                        </properties>
-                        <command>vtysh -c "show ip bgp ipv4 unicast community"</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>vtysh -c "show ip bgp ipv4 unicast community $7"</command>
-                      </tagNode>
-                      <tagNode name="community-list">
-                        <properties>
-                          <help>Show BGP routes matching specified community list</help>
-                        </properties>
-                        <command>vtysh -c "show ip bgp ipv4 unicast community-list $7"</command>
-                        <children>
-                          <leafNode name="exact-match">
-                            <properties>
-                              <help>Show BGP routes exactly matching specified community list</help>
-                            </properties>
-                            <command>vtysh -c "show ip bgp ipv4 unicast community-list $7 exact-match"</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>vtysh -c "show ip bgp ipv4 unicast neighbors $7"</command>
-                        <children>
-                          <leafNode name="advertised-routes">
-                            <properties>
-                              <help>Show routes advertised to a BGP neighbor</help>
-                            </properties>
-                            <command>vtysh -c "show ip bgp ipv4 unicast neighbor $7 advertised-routes"</command>
-                          </leafNode>
-                          <leafNode name="prefix-counts">
-                            <properties>
-                              <help>Show detailed prefix count information</help>
-                            </properties>
-                            <command>vtysh -c "show ip bgp ipv4 unicast neighbor $7 prefix-counts"</command>
-                          </leafNode>
-                          <leafNode name="received-routes">
-                            <properties>
-                              <help>Show the received routes from neighbor</help>
-                            </properties>
-                            <command>vtysh -c "show ip bgp ipv4 unicast neighbor $7 received-routes"</command>
-                          </leafNode>
-                          <leafNode name="routes">
-                            <properties>
-                              <help>Show routes learned from neighbor</help>
-                            </properties>
-                            <command>vtysh -c "show ip bgp ipv4 unicast neighbor $7 routes"</command>
-                          </leafNode>
-                        </children>
-                      </tagNode>
-                      <leafNode name="paths">
-                        <properties>
-                          <help>Show BGP path information</help>
-                        </properties>
-                        <command>vtysh -c "show ip bgp ipv4 unicast paths"</command>
-                      </leafNode>
-                       <tagNode name="prefix-list">
-                        <properties>
-                          <help>Show BGP routes matching the specified prefix list</help>
-                        </properties>
-                        <command>vtysh -c "show ip bgp ipv4 unicast prefix-list $7"</command>
-                      </tagNode>
-                      <tagNode name="regexp">
-                        <properties>
-                          <help>Show BGP routes matching the specified AS path regular expression</help>
-                        </properties>
-                        <command>vtysh -c "show ip bgp ipv4 unicast regexp $5"</command>
-                      </tagNode>
-                      <tagNode name="route-map">
-                        <properties>
-                          <help>Show BGP routes matching the specified route map</help>
-                        </properties>
-                        <command>vtysh -c "show ip bgp route-map $5"</command>
-                      </tagNode>
-                      <leafNode name="summary">
-                        <properties>
-                          <help>Show summary of BGP information</help>
-                        </properties>
-                        <command>vtysh -c "show ip bgp summary"</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>vtysh -c "show ip bgp $6"</command>
-                  </tagNode>
+                  #include <include/bgp-common.xml.i>
                 </children>
-              </node>
-              <leafNode name="large-community-info">
-                <properties>
-                  <help>Show BGP large-community information</help>
-                </properties>
-                <command>vtysh -c "show ip bgp large-community-info"</command>
-              </leafNode>
-              <leafNode name="memory">
-                <properties>
-                  <help>Show BGP memory usage</help>
-                </properties>
-                <command>vtysh -c "show ip bgp memory"</command>
-              </leafNode>
-              <leafNode name="paths">
-                <properties>
-                  <help>Show BGP path information</help>
-                </properties>
-                <command>vtysh -c "show ip bgp paths"</command>
-              </leafNode>
+              </tagNode>
             </children>
           </node>
         </children>
diff --git a/op-mode-definitions/show-ip-ospf.xml.in b/op-mode-definitions/show-ip-ospf.xml.in
index fc298123b..704ed984f 100644
--- a/op-mode-definitions/show-ip-ospf.xml.in
+++ b/op-mode-definitions/show-ip-ospf.xml.in
@@ -11,565 +11,22 @@
             <properties>
               <help>Show IPv4 Open Shortest Path First (OSPF) routing information</help>
             </properties>
-            <command>vtysh -c "show ip ospf"</command>
+            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
             <children>
-              <leafNode name="border-routers">
+              #include <include/ospf-common.xml.i>
+              <tagNode name="vrf">
                 <properties>
-                  <help>Show IPv4 OSPF border-routers information</help>
-                </properties>
-                <command>vtysh -c "show ip ospf border-routers"</command>
-              </leafNode>
-              <node name="database">
-                <properties>
-                  <help>Show IPv4 OSPF database information</help>
-                </properties>
-                <command>vtysh -c "show ip ospf database"</command>
-                <children>
-                  <node name="asbr-summary">
-                    <properties>
-                      <help>Show IPv4 OSPF ASBR summary database</help>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database asbr-summary"</command>
-                    <children>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF ASBR summary database for given address of advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database asbr-summary adv-router $7"</command>
-                      </tagNode>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF ASBR summary database for given address of advertised router</help>
-                        </properties>
-                      </node>
-                    </children>
-                  </node>
-                  <tagNode name="asbr-summary">
-                    <properties>
-                      <help>Show IPv4 OSPF ASBR summary database information of given address</help>
-                      <completionHelp>
-                        <list>&lt;x.x.x.x&gt;</list>
-                      </completionHelp>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database asbr-summary $6"</command>
-                    <children>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show advertising router link states</help>
-                        </properties>
-                      </node>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF ASBR summary database of given address for given advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database asbr-summary $6 adv-router $8"</command>
-                      </tagNode>
-                      <leafNode name="self-originate">
-                        <properties>
-                          <help>Show summary of self-originate IPv4 OSPF ASBR database</help>
-                        </properties>
-                        <command>show ip ospf database asbr-summary $6 self-originate</command>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                  <node name="external">
-                    <properties>
-                      <help>Show IPv4 OSPF external database</help>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database external"</command>
-                    <children>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF external database for specified IP address of advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database external adv-router $7"</command>
-                      </tagNode>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF external database for specified IP address of advertised router</help>
-                        </properties>
-                      </node>
-                    </children>
-                  </node>
-                  <tagNode name="external">
-                    <properties>
-                      <help>Show IPv4 OSPF external database information of specified IP address</help>
-                      <completionHelp>
-                        <list>&lt;x.x.x.x&gt;</list>
-                      </completionHelp>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database external $6"</command>
-                    <children>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show advertising router link states</help>
-                        </properties>
-                      </node>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF external database of specified IP address for specified advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database external $6 adv-router $8"</command>
-                      </tagNode>
-                      <leafNode name="self-originate">
-                        <properties>
-                          <help>Show self-originate IPv4 OSPF external database</help>
-                        </properties>
-                        <command>show ip ospf database external $6 self-originate</command>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                  <leafNode name="max-age">
-                    <properties>
-                      <help>Show IPv4 OSPF max-age database</help>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database max-age"</command>
-                  </leafNode>
-                  <node name="network">
-                    <properties>
-                      <help>Show IPv4 OSPF network database</help>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database network"</command>
-                    <children>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF network database for specified IP address of advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database network adv-router $7"</command>
-                      </tagNode>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF network database for given address of advertised router</help>
-                        </properties>
-                      </node>
-                    </children>
-                  </node>
-                  <tagNode name="network">
-                    <properties>
-                      <help>Show IPv4 OSPF network database information of specified IP address</help>
-                      <completionHelp>
-                        <list>&lt;x.x.x.x&gt;</list>
-                      </completionHelp>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database network $6"</command>
-                    <children>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show advertising router link states</help>
-                        </properties>
-                      </node>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF network database of specified IP address for specified advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database network $6 adv-router $8"</command>
-                      </tagNode>
-                      <leafNode name="self-originate">
-                        <properties>
-                          <help>Show self-originate IPv4 OSPF network database</help>
-                        </properties>
-                        <command>show ip ospf database network $6 self-originate</command>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                  <node name="nssa-external">
-                    <properties>
-                      <help>Show IPv4 OSPF NSSA external database</help>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database nssa-external"</command>
-                    <children>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF NSSA external database for specified IP address of advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database nssa-external adv-router $7"</command>
-                      </tagNode>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF NSSA external database for specified IP address of advertised router</help>
-                        </properties>
-                      </node>
-                    </children>
-                  </node>
-                  <tagNode name="nssa-external">
-                    <properties>
-                      <help>Show IPv4 OSPF NSSA external database information of specified IP address</help>
-                      <completionHelp>
-                        <list>&lt;x.x.x.x&gt;</list>
-                      </completionHelp>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database nssa-external $6"</command>
-                    <children>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show advertising router link states</help>
-                        </properties>
-                      </node>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF NSSA external database of specified IP address for specified advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database nssa-external $6 adv-router $8"</command>
-                      </tagNode>
-                      <leafNode name="self-originate">
-                        <properties>
-                          <help>Show self-originate IPv4 OSPF NSSA external database</help>
-                        </properties>
-                        <command>show ip ospf database nssa-external $6 self-originate</command>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                  <node name="opaque-area">
-                    <properties>
-                      <help>Show IPv4 OSPF opaque-area database</help>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database opaque-area"</command>
-                    <children>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF opaque-area database for specified IP address of advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database opaque-area adv-router $7"</command>
-                      </tagNode>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF opaque-area database for specified IP address of advertised router</help>
-                        </properties>
-                      </node>
-                    </children>
-                  </node>
-                  <tagNode name="opaque-area">
-                    <properties>
-                      <help>Show IPv4 OSPF opaque-area database information of specified IP address</help>
-                      <completionHelp>
-                        <list>&lt;x.x.x.x&gt;</list>
-                      </completionHelp>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database opaque-area $6"</command>
-                    <children>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show advertising router link states</help>
-                        </properties>
-                      </node>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF opaque-area database of specified IP address for specified advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database opaque-area $6 adv-router $8"</command>
-                      </tagNode>
-                      <leafNode name="self-originate">
-                        <properties>
-                          <help>Show self-originate IPv4 OSPF opaque-area database</help>
-                        </properties>
-                        <command>show ip ospf database opaque-area $6 self-originate</command>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                  <node name="opaque-as">
-                    <properties>
-                      <help>Show IPv4 OSPF opaque-as database</help>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database opaque-as"</command>
-                    <children>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF opaque-as database for specified IP address of advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database opaque-as adv-router $7"</command>
-                      </tagNode>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF opaque-as database for specified IP address of advertised router</help>
-                        </properties>
-                      </node>
-                    </children>
-                  </node>
-                  <tagNode name="opaque-as">
-                    <properties>
-                      <help>Show IPv4 OSPF opaque-as database information of specified IP address</help>
-                      <completionHelp>
-                        <list>&lt;x.x.x.x&gt;</list>
-                      </completionHelp>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database opaque-as $6"</command>
-                    <children>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show advertising router link states</help>
-                        </properties>
-                      </node>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF opaque-as database of specified IP address for specified advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database opaque-as $6 adv-router $8"</command>
-                      </tagNode>
-                      <leafNode name="self-originate">
-                        <properties>
-                          <help>Show self-originate IPv4 OSPF opaque-as database</help>
-                        </properties>
-                        <command>show ip ospf database opaque-as $6 self-originate</command>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                  <node name="opaque-link">
-                    <properties>
-                      <help>Show IPv4 OSPF opaque-link database</help>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database opaque-link"</command>
-                    <children>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF opaque-link database for specified IP address of advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database opaque-link adv-router $7"</command>
-                      </tagNode>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF opaque-link database for specified IP address of advertised router</help>
-                        </properties>
-                      </node>
-                    </children>
-                  </node>
-                  <tagNode name="opaque-link">
-                    <properties>
-                      <help>Show IPv4 OSPF opaque-link database information of specified IP address</help>
-                      <completionHelp>
-                        <list>&lt;x.x.x.x&gt;</list>
-                      </completionHelp>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database opaque-link $6"</command>
-                    <children>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show advertising router link states</help>
-                        </properties>
-                      </node>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF opaque-link database of specified IP address for specified advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database opaque-link $6 adv-router $8"</command>
-                      </tagNode>
-                      <leafNode name="self-originate">
-                        <properties>
-                          <help>Show self-originate IPv4 OSPF opaque-link database</help>
-                        </properties>
-                        <command>show ip ospf database opaque-link $6 self-originate</command>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                  <node name="router">
-                    <properties>
-                      <help>Show IPv4 OSPF router database</help>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database router"</command>
-                    <children>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF router database for specified IP address of advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database router adv-router $7"</command>
-                      </tagNode>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF router database for specified IP address of advertised router</help>
-                        </properties>
-                      </node>
-                    </children>
-                  </node>
-                  <tagNode name="router">
-                    <properties>
-                      <help>Show IPv4 OSPF router database information of specified IP address</help>
-                      <completionHelp>
-                        <list>&lt;x.x.x.x&gt;</list>
-                      </completionHelp>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database router $6"</command>
-                    <children>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show advertising router link states</help>
-                        </properties>
-                      </node>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF router database of specified IP address for specified advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database router $6 adv-router $8"</command>
-                      </tagNode>
-                      <leafNode name="self-originate">
-                        <properties>
-                          <help>Show self-originate IPv4 OSPF router database</help>
-                        </properties>
-                        <command>show ip ospf database router $6 self-originate</command>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                  <leafNode name="self-originate">
-                    <properties>
-                      <help>Show IPv4 OSPF self-originate database</help>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database self-originate"</command>
-                  </leafNode>
-                  <node name="summary">
-                    <properties>
-                      <help>Show summary of IPv4 OSPF database</help>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database summary"</command>
-                    <children>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF summary database for specified IP address of advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database summary adv-router $7"</command>
-                      </tagNode>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF summary database for specified IP address of advertised router</help>
-                        </properties>
-                      </node>
-                    </children>
-                  </node>
-                  <tagNode name="summary">
-                    <properties>
-                      <help>Show IPv4 OSPF summary database information of specified IP address</help>
-                      <completionHelp>
-                        <list>&lt;x.x.x.x&gt;</list>
-                      </completionHelp>
-                    </properties>
-                    <command>vtysh -c "show ip ospf database summary $6"</command>
-                    <children>
-                      <node name="adv-router">
-                        <properties>
-                          <help>Show advertising router link states</help>
-                        </properties>
-                      </node>
-                      <tagNode name="adv-router">
-                        <properties>
-                          <help>Show IPv4 OSPF summary database of specified IP address for specified advertised router</help>
-                          <completionHelp>
-                            <list>&lt;x.x.x.x&gt;</list>
-                          </completionHelp>
-                        </properties>
-                        <command>vtysh -c "show ip ospf database summary $6 adv-router $8"</command>
-                      </tagNode>
-                      <leafNode name="self-originate">
-                        <properties>
-                          <help>Show self-originate IPv4 OSPF summary database</help>
-                        </properties>
-                        <command>show ip ospf database summary $6 self-originate</command>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                </children>
-              </node>
-              <node name="interface">
-                <properties>
-                  <help>Show IPv4 OSPF interface information</help>
-                </properties>
-                <command>vtysh -c "show ip ospf interface"</command>
-              </node>
-              <tagNode name="interface">
-                <properties>
-                  <help>Show IPv4 OSPF information for specified interface</help>
+                  <help>Show OSPF routing protocol for given VRF</help>
                   <completionHelp>
-                    <script>${vyos_completion_dir}/list_interfaces.py</script>
+                    <path>vrf name</path>
+                    <list>all</list>
                   </completionHelp>
                 </properties>
-                <command>vtysh -c "show ip ospf interface $5"</command>
-              </tagNode>
-              <node name="neighbor">
-                <properties>
-                  <help>Show IPv4 OSPF neighbor information</help>
-                </properties>
-                <command>vtysh -c "show ip ospf neighbor"</command>
+                <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                 <children>
-                  <tagNode name="address">
-                    <properties>
-                      <help>Show IPv4 OSPF neighbor information for specified IP address</help>
-                      <completionHelp>
-                        <list>&lt;x.x.x.x&gt;</list>
-                      </completionHelp>
-                    </properties>
-                    <command>vtysh -c "show ip ospf neighbor $6"</command>
-                  </tagNode>
-                  <node name="detail">
-                    <properties>
-                      <help>Show detailed IPv4 OSPF neighbor information</help>
-                    </properties>
-                    <command>vtysh -c "show ip ospf neighbor detail"</command>
-                  </node>
+                  #include <include/ospf-common.xml.i>
                 </children>
-              </node>
-              <tagNode name="neighbor">
-                <properties>
-                  <help>Show IPv4 OSPF neighbor information for specified IP address or interface</help>
-                  <completionHelp>
-                    <list>&lt;x.x.x.x&gt;</list>
-                    <script>${vyos_completion_dir}/list_interfaces.py</script>
-                  </completionHelp>
-                </properties>
-                <command>vtysh -c "show ip ospf neighbor $5"</command>
               </tagNode>
-              <leafNode name="route">
-                <properties>
-                  <help>Show IPv4 OSPF route information</help>
-                </properties>
-                <command>vtysh -c "show ip ospf route"</command>
-              </leafNode>
             </children>
           </node>
         </children>