3 files changed, 68 insertions, 8 deletions
diff --git a/op-mode-definitions/monitor-log.xml.in b/op-mode-definitions/monitor-log.xml.in
index b68047bb9..ec428a676 100644
--- a/op-mode-definitions/monitor-log.xml.in
+++ b/op-mode-definitions/monitor-log.xml.in
@@ -93,6 +93,12 @@
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit uacctd.service</command>
           </leafNode>
+          <leafNode name="ipoe-server">
+            <properties>
+              <help>Monitor last lines of IPoE server log</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit accel-ppp@ipoe.service</command>
+          </leafNode>
           <leafNode name="kernel">
             <properties>
               <help>Monitor last lines of Linux Kernel log</help>
@@ -113,7 +119,7 @@
           </leafNode>
           <node name="pppoe">
             <properties>
-              <help>Monitor last lines of PPPoE log</help>
+              <help>Monitor last lines of PPPoE interface log</help>
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit "ppp@pppoe*.service"</command>
             <children>
@@ -121,13 +127,19 @@
                 <properties>
                   <help>Monitor last lines of PPPoE log for specific interface</help>
                   <completionHelp>
-                    <script>${vyos_completion_dir}/list_interfaces.py -t pppoe</script>
+                    <path>interfaces pppoe</path>
                   </completionHelp>
                 </properties>
                 <command>journalctl --no-hostname --boot --follow --unit "ppp@$5.service"</command>
               </tagNode>
             </children>
           </node>
+          <leafNode name="pppoe-server">
+            <properties>
+              <help>Monitor last lines of PPPoE server log</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit accel-ppp@pppoe.service</command>
+          </leafNode>
           <node name="protocol">
             <properties>
               <help>Monitor log for Routing Protocol</help>
@@ -211,7 +223,7 @@
                 <properties>
                   <help>Monitor last lines of specific MACsec interface</help>
                   <completionHelp>
-                    <script>${vyos_completion_dir}/list_interfaces.py -t macsec</script>
+                    <path>interfaces macsec</path>
                   </completionHelp>
                 </properties>
                 <command>SRC=$(cli-shell-api returnValue interfaces macsec "$5" source-interface); journalctl --no-hostname --boot --follow --unit "wpa_supplicant-macsec@$SRC.service"</command>
@@ -246,7 +258,7 @@
                 <properties>
                   <help>Monitor last lines of SSTP client log for specific interface</help>
                   <completionHelp>
-                    <script>${vyos_completion_dir}/list_interfaces.py -t sstpc</script>
+                    <path>interfaces sstpc</path>
                   </completionHelp>
                 </properties>
                 <command>journalctl --no-hostname --boot --follow --unit "ppp@$5.service"</command>
diff --git a/op-mode-definitions/show-log.xml.in b/op-mode-definitions/show-log.xml.in
index 8114f7377..f5e5b1493 100644
--- a/op-mode-definitions/show-log.xml.in
+++ b/op-mode-definitions/show-log.xml.in
@@ -196,6 +196,12 @@
               </tagNode>
             </children>
           </tagNode>
+          <leafNode name="ipoe-server">
+            <properties>
+              <help>Show log for IPoE server</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit accel-ppp@ipoe.service</command>
+          </leafNode>
           <leafNode name="kernel">
             <properties>
               <help>Show log for Linux Kernel</help>
@@ -236,7 +242,7 @@
                 <properties>
                   <help>Show MACsec log on specific interface</help>
                   <completionHelp>
-                    <script>${vyos_completion_dir}/list_interfaces.py -t macsec</script>
+                    <path>interfaces macsec</path>
                   </completionHelp>
                 </properties>
                 <command>SRC=$(cli-shell-api returnValue interfaces macsec "$5" source-interface); journalctl --no-hostname --boot --unit "wpa_supplicant-macsec@$SRC.service"</command>
@@ -262,7 +268,7 @@
           </node>
           <node name="pppoe">
             <properties>
-              <help>Show log for PPPoE</help>
+              <help>Show log for PPPoE interface</help>
             </properties>
             <command>journalctl --no-hostname --boot --unit "ppp@pppoe*.service"</command>
             <children>
@@ -270,13 +276,19 @@
                 <properties>
                   <help>Show PPPoE log on specific interface</help>
                   <completionHelp>
-                    <script>${vyos_completion_dir}/list_interfaces.py -t pppoe</script>
+                    <path>interfaces pppoe</path>
                   </completionHelp>
                 </properties>
                 <command>journalctl --no-hostname --boot --unit "ppp@$5.service"</command>
               </tagNode>
             </children>
           </node>
+          <leafNode name="pppoe-server">
+            <properties>
+              <help>Show log for PPPoE server</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit accel-ppp@pppoe.service</command>
+          </leafNode>
           <node name="protocol">
             <properties>
               <help>Show log for Routing Protocol</help>
@@ -378,7 +390,7 @@
                 <properties>
                   <help>Show SSTP client log on specific interface</help>
                   <completionHelp>
-                    <script>${vyos_completion_dir}/list_interfaces.py -t sstpc</script>
+                    <path>interfaces sstpc</path>
                   </completionHelp>
                 </properties>
                 <command>journalctl --no-hostname --boot --unit "ppp@$5.service"</command>
diff --git a/op-mode-definitions/show-system.xml.in b/op-mode-definitions/show-system.xml.in
index 4a0e6c3b2..746601f43 100644
--- a/op-mode-definitions/show-system.xml.in
+++ b/op-mode-definitions/show-system.xml.in
@@ -7,6 +7,42 @@
           <help>Show system information</help>
         </properties>
         <children>
+          <node name="commit">
+            <properties>
+              <help>Show commit revision log</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/config_mgmt.py show_commit_log</command>
+            <children>
+              <tagNode name="diff">
+                <properties>
+                  <help>Show commit revision diff</help>
+                </properties>
+                <command>${vyos_op_scripts_dir}/config_mgmt.py show_commit_diff --rev "$5"</command>
+              </tagNode>
+              <tagNode name="file">
+                <properties>
+                  <help>Show commit revision file</help>
+                </properties>
+                <command>${vyos_op_scripts_dir}/config_mgmt.py show_commit_file --rev "$5"</command>
+                <children>
+                  <tagNode name="compare">
+                    <properties>
+                      <help>Compare config file revisions</help>
+                    </properties>
+                    <command>${vyos_op_scripts_dir}/config_mgmt.py show_commit_diff --rev "$5" --revb "$7"</command>
+                    <children>
+                      <leafNode name="commands">
+                        <properties>
+                          <help>Compare config file revision commands</help>
+                        </properties>
+                        <command>${vyos_op_scripts_dir}/config_mgmt.py show_commit_diff --rev "$5" --revb "$7" --commands</command>
+                      </leafNode>
+                    </children>
+                  </tagNode>
+                </children>
+              </tagNode>
+            </children>
+          </node>
           <node name="connections">
             <properties>
               <help>Show active network connections on the system</help>