6 files changed, 121 insertions, 45 deletions
diff --git a/op-mode-definitions/disks.xml.in b/op-mode-definitions/disks.xml.in
index 2102a2e8e..117ac5065 100644
--- a/op-mode-definitions/disks.xml.in
+++ b/op-mode-definitions/disks.xml.in
@@ -20,7 +20,7 @@
                 <script>${vyos_completion_dir}/list_disks.py --exclude ${COMP_WORDS[2]}</script>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/format_disk.py --target $3 --proto $5</command>
+            <command>sudo ${vyos_op_scripts_dir}/format_disk.py --target $3 --proto $5</command>
           </tagNode>
         </children>
       </tagNode>
diff --git a/op-mode-definitions/include/bfd-common.xml.i b/op-mode-definitions/include/bfd-common.xml.i
new file mode 100644
index 000000000..eebfbdad4
--- /dev/null
+++ b/op-mode-definitions/include/bfd-common.xml.i
@@ -0,0 +1,54 @@
+<!-- included start from bfd-common.xml.i -->
+<node name="bfd">
+  <properties>
+    <help>Show Bidirectional Forwarding Detection (BFD)</help>
+  </properties>
+  <children>
+    <node name="peer">
+      <properties>
+        <help>Show all Bidirectional Forwarding Detection (BFD) peer status</help>
+      </properties>
+      <command>vtysh -c "show bfd peers"</command>
+      <children>
+        <leafNode name="counters">
+          <properties>
+            <help>Show Bidirectional Forwarding Detection (BFD) peer counters</help>
+          </properties>
+          <command>vtysh -c "show bfd peers counters"</command>
+        </leafNode>
+      </children>
+    </node>
+    <tagNode name="peer">
+      <properties>
+        <help>Show Bidirectional Forwarding Detection (BFD) peer status</help>
+        <completionHelp>
+          <script>vtysh -c "show bfd peers" | awk '/[:blank:]*peer/ { printf "%s\n", $2 }'</script>
+        </completionHelp>
+      </properties>
+      <command>vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("vtysh -c \"show bfd " peer "\"") }'</command>
+      <children>
+        <leafNode name="counters">
+          <properties>
+            <help>Show Bidirectional Forwarding Detection (BFD) peer counters</help>
+          </properties>
+          <command>vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("vtysh -c \"show bfd " peer " counters\"") }'</command>
+        </leafNode>
+      </children>
+    </tagNode>
+    <node name="peers">
+      <properties>
+        <help>Show Bidirectional Forwarding Detection peers</help>
+      </properties>
+      <command>vtysh -c "show bfd peers"</command>
+      <children>
+        <leafNode name="brief">
+          <properties>
+            <help>Show Bidirectional Forwarding Detection (BFD) peers brief</help>
+          </properties>
+          <command>vtysh -c "show bfd peers brief"</command>
+        </leafNode>
+      </children>
+    </node>
+  </children>
+</node>
+<!-- included end -->
diff --git a/op-mode-definitions/show-bfd.xml.in b/op-mode-definitions/show-bfd.xml.in
new file mode 100644
index 000000000..7339c92a2
--- /dev/null
+++ b/op-mode-definitions/show-bfd.xml.in
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+      #include <include/bfd-common.xml.i>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/show-configuration.xml.in b/op-mode-definitions/show-configuration.xml.in
index 318942ab0..5a2fdedfa 100644
--- a/op-mode-definitions/show-configuration.xml.in
+++ b/op-mode-definitions/show-configuration.xml.in
@@ -30,6 +30,21 @@
             <!-- no admin check -->
             <command>${vyos_op_scripts_dir}/show_configuration_files.sh</command>
           </node>
+          <node name="json">
+            <properties>
+              <help>Show running configuration in JSON format</help>
+            </properties>
+            <!-- no admin check -->
+            <command>${vyos_op_scripts_dir}/show_configuration_json.py</command>
+            <children>
+              <node name="pretty">
+                <properties>
+                  <help>Show running configuration in readable JSON format</help>
+                </properties>
+                <command>${vyos_op_scripts_dir}/show_configuration_json.py --pretty</command>
+              </node>
+            </children>
+          </node>
         </children>
       </node>
     </children>
diff --git a/op-mode-definitions/show-interfaces-geneve.xml.in b/op-mode-definitions/show-interfaces-geneve.xml.in
new file mode 100644
index 000000000..a47933315
--- /dev/null
+++ b/op-mode-definitions/show-interfaces-geneve.xml.in
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+      <node name="interfaces">
+        <children>
+          <tagNode name="geneve">
+            <properties>
+              <help>Show specified GENEVE interface information</help>
+              <completionHelp>
+                <path>interfaces geneve</path>
+              </completionHelp>
+            </properties>
+            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <children>
+              <leafNode name="brief">
+                <properties>
+                  <help>Show summary of the specified GENEVE interface information</help>
+                </properties>
+                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+              </leafNode>
+            </children>
+          </tagNode>
+          <node name="geneve">
+            <properties>
+              <help>Show GENEVE interface information</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=geneve --action=show-brief</command>
+            <children>
+              <leafNode name="detail">
+                <properties>
+                  <help>Show detailed GENEVE interface information</help>
+                </properties>
+                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=geneve --action=show</command>
+              </leafNode>
+            </children>
+          </node>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/show-protocols.xml.in b/op-mode-definitions/show-protocols.xml.in
index d595e2c3c..48bfa10dc 100644
--- a/op-mode-definitions/show-protocols.xml.in
+++ b/op-mode-definitions/show-protocols.xml.in
@@ -7,50 +7,7 @@
           <help>Show protocol specific information</help>
         </properties>
         <children>
-          <node name="bfd">
-            <properties>
-              <help>Show Bidirectional Forwarding Detection (BFD)</help>
-            </properties>
-            <children>
-              <node name="peer">
-                <properties>
-                  <help>Show all Bidirectional Forwarding Detection (BFD) peer status</help>
-                </properties>
-                <command>vtysh -c "show bfd peers"</command>
-                <children>
-                  <leafNode name="counters">
-                    <properties>
-                      <help>Show Bidirectional Forwarding Detection (BFD) peer counters</help>
-                    </properties>
-                    <command>vtysh -c "show bfd peers counters"</command>
-                  </leafNode>
-                </children>
-              </node>
-              <tagNode name="peer">
-                <properties>
-                  <help>Show Bidirectional Forwarding Detection (BFD) peer status</help>
-                  <completionHelp>
-                    <script>vtysh -c "show bfd peers" | awk '/[:blank:]*peer/ { printf "%s\n", $2 }'</script>
-                  </completionHelp>
-                </properties>
-                <command>vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("vtysh -c \"show bfd " peer "\"") }'</command>
-                <children>
-                  <leafNode name="counters">
-                    <properties>
-                      <help>Show Bidirectional Forwarding Detection (BFD) peer counters</help>
-                    </properties>
-                    <command>vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("vtysh -c \"show bfd " peer " counters\"") }'</command>
-                  </leafNode>
-                </children>
-              </tagNode>
-              <leafNode name="peers">
-                <properties>
-                  <help>Show Bidirectional Forwarding Detection (BFD) peers brief</help>
-                </properties>
-                <command>vtysh -c "show bfd peers brief"</command>
-              </leafNode>
-            </children>
-          </node>
+          #include <include/bfd-common.xml.i>
           <node name="static">
             <properties>
               <help>Show static protocol parameters</help>