8 files changed, 159 insertions, 0 deletions
diff --git a/op-mode-definitions/show-console-server.xml b/op-mode-definitions/show-console-server.xml
new file mode 100644
index 000000000..e47b6cfaa
--- /dev/null
+++ b/op-mode-definitions/show-console-server.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="connect">
+    <children>
+      <tagNode name="console">
+        <properties>
+          <help>Connect to device attached to serial console server</help>
+          <completionHelp>
+            <path>service console-server device</path>
+          </completionHelp>
+        </properties>
+        <command>/usr/bin/console "$3"</command>
+      </tagNode>
+    </children>
+  </node>
+  <node name="show">
+    <children>
+      <node name="log">
+        <children>
+          <leafNode name="console-server">
+            <properties>
+              <help>Show log for serial console server</help>
+            </properties>
+            <command>/usr/bin/journalctl -u conserver-server.service</command>
+          </leafNode>
+        </children>
+      </node>
+      <node name="console-server">
+        <properties>
+          <help>Show Console-Server information</help>
+        </properties>
+        <children>
+          <leafNode name="ports">
+            <properties>
+              <help>Examine console ports and configured baud rates</help>
+            </properties>
+            <command>/usr/bin/console -x</command>
+          </leafNode>
+          <leafNode name="user">
+            <properties>
+              <help>Show users on various consoles</help>
+            </properties>
+            <command>/usr/bin/console -u</command>
+          </leafNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/show-ip-ports.xml b/op-mode-definitions/show-ip-ports.xml
new file mode 100644
index 000000000..a74b68ffc
--- /dev/null
+++ b/op-mode-definitions/show-ip-ports.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+      <node name="ip">
+        <children>
+          <leafNode name="ports">
+            <properties>
+              <help>Show IP ports in use by various system services</help>
+            </properties>
+            <command>sudo /usr/bin/netstat -tulnp</command>
+          </leafNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/show-route-map.xml b/op-mode-definitions/show-route-map.xml
new file mode 100644
index 000000000..0e376757b
--- /dev/null
+++ b/op-mode-definitions/show-route-map.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+      <node name="route-map">
+        <properties>
+          <help>Show route-map information</help>
+        </properties>
+        <command>/usr/bin/vtysh -c "show route-map"</command>
+      </node>
+      <tagNode name="route-map">
+        <properties>
+          <help>Show specified route-map information</help>
+          <completionHelp>
+            <path>policy route-map</path>
+          </completionHelp>
+        </properties>
+        <command>/usr/bin/vtysh -c "show route-map $3"</command>
+      </tagNode>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/show-rpki.xml b/op-mode-definitions/show-rpki.xml
new file mode 100644
index 000000000..d68c3b862
--- /dev/null
+++ b/op-mode-definitions/show-rpki.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+      <node name="rpki">
+        <properties>
+          <help>Show RPKI information</help>
+        </properties>
+        <children>
+          <leafNode name="cache-connection">
+            <properties>
+              <help>Show RPKI cache connections</help>
+            </properties>
+            <command>/usr/bin/vtysh -c "show rpki cache-connection"</command>
+          </leafNode>
+          <leafNode name="cache-server">
+             <properties>
+               <help>Show RPKI cache servers information</help>
+             </properties>
+             <command>/usr/bin/vtysh -c "show rpki cache-server"</command>
+          </leafNode>
+          <leafNode name="prefix-table">
+             <properties>
+               <help>Show RPKI-validated prefixes</help>
+             </properties>
+             <command>/usr/bin/vtysh -c "show rpki prefix-table"</command>
+          </leafNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/show-system.xml b/op-mode-definitions/show-system.xml
index a39d9b481..74b34ae92 100644
--- a/op-mode-definitions/show-system.xml
+++ b/op-mode-definitions/show-system.xml
@@ -124,6 +124,12 @@
                 </properties>
                 <command>cat /proc/meminfo</command>
               </leafNode>
+              <leafNode name="routing-daemons">
+                <properties>
+                  <help>Show memory usage of all routing protocols</help>
+                </properties>
+                <command>/usr/bin/vtysh -c "show memory"</command>
+              </leafNode>
             </children>
           </node>
           <node name="processes">
@@ -152,6 +158,12 @@
               </leafNode>
             </children>
           </node>
+          <leafNode name="routing-daemons">
+            <properties>
+              <help>Show Quagga routing daemons</help>
+            </properties>
+            <command>/usr/bin/vtysh -c "show daemons"</command>
+          </leafNode>
           <leafNode name="storage">
             <properties>
               <help>Show filesystem usage</help>
diff --git a/op-mode-definitions/show-table.xml b/op-mode-definitions/show-table.xml
new file mode 100644
index 000000000..b093a5de7
--- /dev/null
+++ b/op-mode-definitions/show-table.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+      <leafNode name="table">
+        <properties>
+          <help>Show routing tables</help>
+        </properties>
+        <command>/usr/bin/vtysh -c "show zebra router table summary"</command>
+      </leafNode>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/show-version.xml b/op-mode-definitions/show-version.xml
index 8bf23de82..aae5bb008 100644
--- a/op-mode-definitions/show-version.xml
+++ b/op-mode-definitions/show-version.xml
@@ -20,6 +20,12 @@
              </properties>
              <command>${vyos_op_scripts_dir}/show_version.py --all</command>
           </leafNode>
+          <leafNode name="quagga">
+             <properties>
+               <help>Show Quagga version information</help>
+             </properties>
+             <command>/usr/bin/vtysh -c "show version"</command>
+          </leafNode>
         </children>
       </node>
     </children>
diff --git a/op-mode-definitions/show-vrf.xml b/op-mode-definitions/show-vrf.xml
index 360153d8e..1c806908b 100644
--- a/op-mode-definitions/show-vrf.xml
+++ b/op-mode-definitions/show-vrf.xml
@@ -16,6 +16,14 @@
             </completionHelp>
         </properties>
         <command>${vyos_op_scripts_dir}/show_vrf.py -e "$3"</command>
+        <children>
+          <leafNode name="processes">
+            <properties>
+              <help>Shows all process ids associated with VRF</help>
+            </properties>
+            <command>/usr/sbin/ip vrf pids "$3"</command>
+          </leafNode>
+        </children>
       </tagNode>
     </children>
   </node>