6 files changed, 53 insertions, 2 deletions
diff --git a/op-mode-definitions/show-configuration.xml b/op-mode-definitions/show-configuration.xml
index 0b1507ba4..90c1533fb 100644
--- a/op-mode-definitions/show-configuration.xml
+++ b/op-mode-definitions/show-configuration.xml
@@ -29,7 +29,7 @@
             <help> Show available saved configurations </help>
           </properties>
           <!-- no admin check -->
-          <command>${vyos_op_scripts_dir}/show-configuration-files.sh</command>
+          <command>${vyos_op_scripts_dir}/show_configuration_files.sh</command>
         </node>
       </children>
     </node>
diff --git a/op-mode-definitions/show-disk.xml b/op-mode-definitions/show-disk.xml
index db473959a..8a8e35515 100644
--- a/op-mode-definitions/show-disk.xml
+++ b/op-mode-definitions/show-disk.xml
@@ -14,7 +14,7 @@
           <properties>
             <help>Show disk drive formatting</help>
           </properties>
-          <command>${vyos_op_scripts_dir}/show-disk-format.sh $3</command>
+          <command>${vyos_op_scripts_dir}/show_disk_format.sh $3</command>
         </leafNode>
       </children>
     </tagNode>
diff --git a/op-mode-definitions/show-host.xml b/op-mode-definitions/show-host.xml
new file mode 100644
index 000000000..39c6c3acc
--- /dev/null
+++ b/op-mode-definitions/show-host.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+    <node name="host">
+      <properties>
+        <help>Show host information</help>
+      </properties>
+      <children>
+        <leafNode name="date">
+          <properties>
+            <help>Show host current date</help>
+          </properties>
+          <command>/bin/date</command>
+        </leafNode>
+
+        <leafNode name="domain">
+          <properties>
+            <help>Show domain name</help>
+          </properties>
+          <command>/bin/domainname -d</command>
+        </leafNode>
+
+        <leafNode name="name">
+          <properties>
+            <help>Show host name</help>
+          </properties>
+          <command>/bin/hostname</command>
+        </leafNode>
+
+        <leafNode name="os">
+          <properties>
+            <help>Show host operating system details</help>
+          </properties>
+          <command>/bin/uname -a</command>
+        </leafNode>
+
+        <tagNode name="lookup">
+          <properties>
+            <help>Lookup host information for hostname|IPv4 address</help>
+          </properties>
+          <command>/usr/bin/host $4</command>
+        </tagNode>
+
+
+      </children>
+    </node>
+
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/src/op_mode/show-configuration-files.sh b/src/op_mode/show_configuration_files.sh
index ad8e0747c..ad8e0747c 100755
--- a/src/op_mode/show-configuration-files.sh
+++ b/src/op_mode/show_configuration_files.sh
diff --git a/src/op_mode/show-disk-format.sh b/src/op_mode/show_disk_format.sh
index 61b15a52b..61b15a52b 100755
--- a/src/op_mode/show-disk-format.sh
+++ b/src/op_mode/show_disk_format.sh
diff --git a/src/op_mode/show-raid.sh b/src/op_mode/show_raid.sh
index ba4174692..ba4174692 100755
--- a/src/op_mode/show-raid.sh
+++ b/src/op_mode/show_raid.sh