From 52830ddfad973ff8acac48cc1ce57af655d9ed5a Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Fri, 21 Jul 2023 21:23:18 +0200
Subject: ospf: T5377: add op-mode commands to display GR status

---
 op-mode-definitions/include/ospf-common.xml.i      | 559 ---------------------
 op-mode-definitions/include/ospf/common.xml.i      | 559 +++++++++++++++++++++
 .../include/ospf/graceful-restart.xml.i            |  13 +
 op-mode-definitions/show-ip-ospf.xml.in            |   4 +-
 op-mode-definitions/show-ipv6-ospfv3.xml.in        |   2 +
 5 files changed, 576 insertions(+), 561 deletions(-)
 delete mode 100644 op-mode-definitions/include/ospf-common.xml.i
 create mode 100644 op-mode-definitions/include/ospf/common.xml.i
 create mode 100644 op-mode-definitions/include/ospf/graceful-restart.xml.i

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/include/ospf-common.xml.i b/op-mode-definitions/include/ospf-common.xml.i
deleted file mode 100644
index 979ffb07e..000000000
--- a/op-mode-definitions/include/ospf-common.xml.i
+++ /dev/null
@@ -1,559 +0,0 @@
-<!-- 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>
-#include <include/vtysh-generic-interface-tagNode.xml.i>
-<node name="mpls">
-  <properties>
-    <help>Show MPLS information</help>
-  </properties>
-  <children>
-  #include <include/ldp-sync.xml.i>
-  </children>
-</node>
-<node name="neighbor">
-  <properties>
-    <help>Show IPv4 OSPF neighbor information</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-  <children>
-    <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</script>
-    </completionHelp>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</tagNode>
-<node name="route">
-  <properties>
-    <help>Show IPv4 OSPF route information</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-  <children>
-    <leafNode name="detail">
-      <properties>
-        <help>Show detailed IPv4 OSPF route information</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </leafNode>
-  </children>
-</node>
-<!-- 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..c8341bd3e
--- /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>
+#include <include/ospf/graceful-restart.xml.i>
+<node name="interface">
+  <properties>
+    <help>Show IPv4 OSPF interface information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</node>
+#include <include/vtysh-generic-interface-tagNode.xml.i>
+<node name="mpls">
+  <properties>
+    <help>Show MPLS information</help>
+  </properties>
+  <children>
+  #include <include/ldp-sync.xml.i>
+  </children>
+</node>
+<node name="neighbor">
+  <properties>
+    <help>Show IPv4 OSPF neighbor information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    <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</script>
+    </completionHelp>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</tagNode>
+<node name="route">
+  <properties>
+    <help>Show IPv4 OSPF route information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    <leafNode name="detail">
+      <properties>
+        <help>Show detailed IPv4 OSPF route information</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </leafNode>
+  </children>
+</node>
+<!-- included end -->
diff --git a/op-mode-definitions/include/ospf/graceful-restart.xml.i b/op-mode-definitions/include/ospf/graceful-restart.xml.i
new file mode 100644
index 000000000..736d8f951
--- /dev/null
+++ b/op-mode-definitions/include/ospf/graceful-restart.xml.i
@@ -0,0 +1,13 @@
+<node name="graceful-restart">
+    <properties>
+      <help>Show IPv4 OSPF Graceful Restart</help>
+    </properties>
+    <children>
+      <leafNode name="helper">
+        <properties>
+          <help>OSPF Graceful Restart helper details</help>
+        </properties>
+        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      </leafNode>
+    </children>
+  </node>
diff --git a/op-mode-definitions/show-ip-ospf.xml.in b/op-mode-definitions/show-ip-ospf.xml.in
index 704ed984f..f3b9da90c 100644
--- a/op-mode-definitions/show-ip-ospf.xml.in
+++ b/op-mode-definitions/show-ip-ospf.xml.in
@@ -13,7 +13,7 @@
             </properties>
             <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
             <children>
-              #include <include/ospf-common.xml.i>
+              #include <include/ospf/common.xml.i>
               <tagNode name="vrf">
                 <properties>
                   <help>Show OSPF routing protocol for given VRF</help>
@@ -24,7 +24,7 @@
                 </properties>
                 <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
                 <children>
-                  #include <include/ospf-common.xml.i>
+                  #include <include/ospf/common.xml.i>
                 </children>
               </tagNode>
             </children>
diff --git a/op-mode-definitions/show-ipv6-ospfv3.xml.in b/op-mode-definitions/show-ipv6-ospfv3.xml.in
index a63465472..e1fcf470f 100644
--- a/op-mode-definitions/show-ipv6-ospfv3.xml.in
+++ b/op-mode-definitions/show-ipv6-ospfv3.xml.in
@@ -41,6 +41,7 @@
               </tagNode>
               #include <include/ospfv3/border-routers.xml.i>
               #include <include/ospfv3/database.xml.i>
+              #include <include/ospf/graceful-restart.xml.i>
               #include <include/ospfv3/interface.xml.i>
               #include <include/ospfv3/linkstate.xml.i>
               #include <include/ospfv3/neighbor.xml.i>
@@ -94,6 +95,7 @@
                   </tagNode>
                   #include <include/ospfv3/border-routers.xml.i>
                   #include <include/ospfv3/database.xml.i>
+                  #include <include/ospf/graceful-restart.xml.i>
                   #include <include/ospfv3/interface.xml.i>
                   #include <include/ospfv3/linkstate.xml.i>
                   #include <include/ospfv3/neighbor.xml.i>
-- 
cgit v1.2.3