Merge branch 'current' into T5014-dnat

13 files changed, 195 insertions, 202 deletions

diff --git a/op-mode-definitions/dhcp.xml.in b/op-mode-definitions/dhcp.xml.in
index 66584efc3..6855fe447 100644
--- a/op-mode-definitions/dhcp.xml.in
+++ b/op-mode-definitions/dhcp.xml.in
@@ -7,6 +7,30 @@
           <help>Show DHCP (Dynamic Host Configuration Protocol) information</help>
         </properties>
         <children>
+          <node name="client">
+            <properties>
+              <help>Show DHCP client information</help>
+            </properties>
+            <children>
+              <node name="leases">
+                <properties>
+                  <help>Show DHCP client leases</help>
+                </properties>
+                <children>
+                  <tagNode name="interface">
+                    <properties>
+                      <help> Show DHCP client information for a given interface</help>
+                      <completionHelp>
+                        <script>${vyos_completion_dir}/list_interfaces --broadcast</script>
+                      </completionHelp>
+                    </properties>
+                    <command>${vyos_op_scripts_dir}/dhcp.py show_client_leases --family inet --interface $6</command>
+                  </tagNode>
+                </children>
+                <command>${vyos_op_scripts_dir}/dhcp.py show_client_leases --family inet</command>
+              </node>
+             </children>
+          </node>
           <node name="server">
             <properties>
               <help>Show DHCP server information</help>
diff --git a/op-mode-definitions/include/monitor-background.xml.i b/op-mode-definitions/include/monitor-background.xml.i
deleted file mode 100644
index 9931127e3..000000000
--- a/op-mode-definitions/include/monitor-background.xml.i
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- included start from monitor-background.xml.i -->
-<node name="background">
-  <properties>
-    <help>Monitor in background</help>
-  </properties>
-  <children>
-    <node name="start">
-      <properties>
-        <help>Start background monitoring</help>
-      </properties>
-      <command>${vyatta_bindir}/vyatta-monitor-background ${3^^} ${3}</command>
-    </node>
-    <node name="stop">
-      <properties>
-        <help>Stop background monitoring</help>
-      </properties>
-      <command>${vyatta_bindir}/vyatta-monitor-background-stop ${3^^}</command>
-    </node>
-  </children>
-</node>
-<!-- included end -->
diff --git a/op-mode-definitions/include/ospf-common.xml.i b/op-mode-definitions/include/ospf/common.xml.i
index 979ffb07e..c8341bd3e 100644
--- a/op-mode-definitions/include/ospf-common.xml.i
+++ b/op-mode-definitions/include/ospf/common.xml.i
@@ -502,6 +502,7 @@
     </tagNode>
   </children>
 </node>
+#include <include/ospf/graceful-restart.xml.i>
 <node name="interface">
   <properties>
     <help>Show IPv4 OSPF interface information</help>
@@ -556,4 +557,3 @@
   </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/monitor-bridge.xml.in b/op-mode-definitions/monitor-bridge.xml.in
index 712a924f1..a43fa6dd9 100644
--- a/op-mode-definitions/monitor-bridge.xml.in
+++ b/op-mode-definitions/monitor-bridge.xml.in
@@ -4,14 +4,14 @@
     <children>
       <node name="bridge">
         <properties>
-          <help>Monitoring bridge database generated objects and address changes</help>
+          <help>Monitor bridge database changes</help>
         </properties>
         <command>sudo bridge monitor all</command>
         <children>
           <node name="link">
             <command>sudo bridge monitor link</command>
             <properties>
-              <help>Monitoring bridge database generated connection interface changes</help>
+              <help>Monitor bridge database generated connection interface changes</help>
             </properties>
           </node>
           <node name="fdb">
diff --git a/op-mode-definitions/monitor-log.xml.in b/op-mode-definitions/monitor-log.xml.in
index 8f3f73478..ee52a7eb8 100644
--- a/op-mode-definitions/monitor-log.xml.in
+++ b/op-mode-definitions/monitor-log.xml.in
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="monitor">
+    <properties>
+      <help>Monitor system information</help>
+    </properties>
     <children>
       <node name="log">
         <properties>
@@ -27,6 +30,12 @@
               </leafNode>
             </children>
           </node>
+          <leafNode name="conntrack-sync">
+            <properties>
+              <help>Monitor last lines of conntrack-sync log</help>
+            </properties>
+            <command>journalctl --no-hostname --follow --boot --unit conntrackd.service</command>
+          </leafNode>
           <node name="dhcp">
             <properties>
               <help>Monitor last lines of Dynamic Host Control Protocol log</help>
@@ -117,6 +126,23 @@
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit chrony.service</command>
           </leafNode>
+          <node name="openvpn">
+            <properties>
+              <help>Monitor last lines of OpenVPN log</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit openvpn@*.service</command>
+            <children>
+              <tagNode name="interface">
+                <properties>
+                  <help>Monitor last lines of specific OpenVPN interface log</help>
+                  <completionHelp>
+                    <path>interfaces openvpn</path>
+                  </completionHelp>
+                </properties>
+                <command>journalctl --no-hostname --boot --unit openvpn@$5.service</command>
+              </tagNode>
+            </children>
+          </node>
           <node name="pppoe">
             <properties>
               <help>Monitor last lines of PPPoE interface log</help>
@@ -248,9 +274,45 @@
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit ssh.service</command>
           </leafNode>
+          <leafNode name="vpn">
+            <properties>
+              <help>Monitor last lines of ALL Virtual Private Network services</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit strongswan.service --unit accel-ppp@*.service --unit ocserv.service</command>
+          </leafNode>
+          <leafNode name="ipsec">
+            <properties>
+              <help>Monitor last lines of IPsec log</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit strongswan.service</command>
+          </leafNode>
+          <leafNode name="l2tp">
+            <properties>
+              <help>Monitor last lines of L2TP log</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit accel-ppp@l2tp.service</command>
+          </leafNode>
+          <leafNode name="openconnect">
+            <properties>
+              <help>Monitor last lines of OpenConnect log</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit ocserv.service</command>
+          </leafNode>
+          <leafNode name="pptp">
+            <properties>
+              <help>Monitor last lines of PPTP log</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit accel-ppp@pptp.service</command>
+          </leafNode>
+          <leafNode name="sstp">
+            <properties>
+              <help>Monitor last lines of Secure Socket Tunneling Protocol server</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --follow --unit accel-ppp@sstp.service</command>
+          </leafNode>
           <node name="sstpc">
             <properties>
-              <help>Monitor last lines of Secure Socket Tunneling Protocol log</help>
+              <help>Monitor last lines of Secure Socket Tunneling Protocol client</help>
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit "ppp@sstpc*.service"</command>
             <children>
@@ -265,49 +327,6 @@
               </tagNode>
             </children>
           </node>
-          <node name="vpn">
-            <properties>
-              <help>Monitor Virtual Private Network services</help>
-            </properties>
-            <children>
-              <leafNode name="all">
-                <properties>
-                  <help>Monitor last lines of ALL VPNs</help>
-                </properties>
-                <command>journalctl --no-hostname --boot --follow --unit strongswan.service --unit accel-ppp@*.service --unit ocserv.service</command>
-              </leafNode>
-              <leafNode name="ipsec">
-                <properties>
-                  <help>Monitor last lines of IPsec log</help>
-                </properties>
-                <command>journalctl --no-hostname --boot --follow --unit strongswan.service</command>
-              </leafNode>
-              <leafNode name="l2tp">
-                <properties>
-                  <help>Monitor last lines of L2TP log</help>
-                </properties>
-                <command>journalctl --no-hostname --boot --follow --unit accel-ppp@l2tp.service</command>
-              </leafNode>
-              <leafNode name="openconnect">
-                <properties>
-                  <help>Monitor last lines of OpenConnect log</help>
-                </properties>
-                <command>journalctl --no-hostname --boot --follow --unit ocserv.service</command>
-              </leafNode>
-              <leafNode name="pptp">
-                <properties>
-                  <help>Monitor last lines of PPTP log</help>
-                </properties>
-                <command>journalctl --no-hostname --boot --follow --unit accel-ppp@pptp.service</command>
-              </leafNode>
-              <leafNode name="sstp">
-                <properties>
-                  <help>Monitor last lines of SSTP log</help>
-                </properties>
-                <command>journalctl --no-hostname --boot --follow --unit accel-ppp@sstp.service</command>
-              </leafNode>
-            </children>
-          </node>
           <leafNode name="vpp">
             <properties>
               <help>Monitor last lines of Vector Packet Processor log</help>
@@ -320,12 +339,6 @@
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit keepalived.service</command>
           </leafNode>
-          <leafNode name="webproxy">
-            <properties>
-              <help>Monitor last lines of Webproxy log</help>
-            </properties>
-            <command>journalctl --no-hostname --boot --follow --unit squid.service</command>
-          </leafNode>
         </children>
       </node>
     </children>
diff --git a/op-mode-definitions/monitor-ndp.xml.in b/op-mode-definitions/monitor-ndp.xml.in
index 26d881f1a..3b08f3d73 100644
--- a/op-mode-definitions/monitor-ndp.xml.in
+++ b/op-mode-definitions/monitor-ndp.xml.in
@@ -4,14 +4,14 @@
     <children>
       <node name="ndp">
         <properties>
-          <help>Monitor the NDP information received by the router through the device</help>
+          <help>Monitor Neighbor Discovery Protocol (NDP) information</help>
         </properties>
         <command>sudo ndptool monitor</command>
         <children>
           <tagNode name="interface">
             <command>sudo ndptool monitor --ifname=$4</command>
             <properties>
-              <help>Monitor ndp protocol on specified interface</help>
+              <help>Monitor Neighbor Discovery Protocol on specified interface</help>
               <completionHelp>
                 <script>${vyos_completion_dir}/list_interfaces</script>
               </completionHelp>
@@ -20,7 +20,7 @@
               <tagNode name="type">
                 <command>sudo ndptool monitor --ifname=$4 --msg-type=$6</command>
                 <properties>
-                  <help>Monitor specific types of NDP protocols</help>
+                  <help>Monitor specific Neighbor Discovery Protocol type</help>
                   <completionHelp>
                     <list>rs ra ns na</list>
                   </completionHelp>
@@ -31,7 +31,7 @@
           <tagNode name="type">
             <command>sudo ndptool monitor --msg-type=$4</command>
             <properties>
-              <help>Monitor specific types of NDP protocols</help>
+              <help>Monitor specific Neighbor Discovery Protocol type</help>
               <completionHelp>
                 <list>rs ra ns na</list>
               </completionHelp>
diff --git a/op-mode-definitions/monitor-protocol.xml.in b/op-mode-definitions/monitor-protocol.xml.in
index f3af3575c..f05a1945f 100644
--- a/op-mode-definitions/monitor-protocol.xml.in
+++ b/op-mode-definitions/monitor-protocol.xml.in
@@ -12,7 +12,6 @@
               <help>Monitor the Border Gateway Protocol (BGP)</help>
             </properties>
             <children>
-              #include <include/monitor-background.xml.i>
               <node name="disable">
                 <properties>
                   <help>Disable Border Gateway Protocol (BGP) debugging</help>
@@ -266,7 +265,6 @@
               <help>Monitor Open Shortest Path First (OSPF) protocol</help>
             </properties>
             <children>
-              #include <include/monitor-background.xml.i>
               <node name="disable">
                 <properties>
                   <help>Disable Open Shortest Path First (OSPF) debugging</help>
@@ -650,25 +648,6 @@
               <help>Monitor the IPv6 Open Shortest Path First (OSPFv3) protocol</help>
             </properties>
             <children>
-              <node name="background">
-                <properties>
-                  <help>Monitor in background</help>
-                </properties>
-                <children>
-                  <node name="start">
-                    <properties>
-                      <help>Start background monitoring</help>
-                    </properties>
-                    <command>${vyatta_bindir}/vyatta-monitor-background OSPFv3 ospf6</command>
-                  </node>
-                  <node name="stop">
-                    <properties>
-                      <help>Stop background monitoring</help>
-                    </properties>
-                    <command>${vyatta_bindir}/vyatta-monitor-background-stop OSPFv3</command>
-                  </node>
-                </children>
-              </node>
               <node name="disable">
                 <properties>
                   <help>Disable IPv6 Open Shortest Path First (OSPFv3) protocol debugging</help>
@@ -1192,25 +1171,6 @@
               <help>Monitor the Routing Information Base (RIB)</help>
             </properties>
             <children>
-              <node name="background">
-                <properties>
-                  <help>Monitor in background</help>
-                </properties>
-                <children>
-                  <node name="start">
-                    <properties>
-                      <help>Start background monitoring</help>
-                    </properties>
-                    <command>${vyatta_bindir}/vyatta-monitor-background RIB zebra</command>
-                  </node>
-                  <node name="stop">
-                    <properties>
-                      <help>Stop background monitoring</help>
-                    </properties>
-                    <command>${vyatta_bindir}/vyatta-monitor-background-stop RIB</command>
-                  </node>
-                </children>
-              </node>
               <node name="disable">
                 <properties>
                   <help>Disable Route Information Base (RIB) debugging</help>
@@ -1360,7 +1320,6 @@
               <help>Monitor the Routing Information Protocol (RIP)</help>
             </properties>
             <children>
-              #include <include/monitor-background.xml.i>
               <node name="disable">
                 <properties>
                   <help>Disable Routing Information Protocol (RIP) debugging</help>
@@ -1452,7 +1411,6 @@
               <help>Monitor the Routing Information Protocol Next Generation (RIPng) protocol</help>
             </properties>
             <children>
-              #include <include/monitor-background.xml.i>
               <node name="disable">
                 <properties>
                   <help>Disable Routing Information Protocol Next Generation (RIPNG) debugging</help>
diff --git a/op-mode-definitions/show-bridge.xml.in b/op-mode-definitions/show-bridge.xml.in
index acf3a00c7..a272ea204 100644
--- a/op-mode-definitions/show-bridge.xml.in
+++ b/op-mode-definitions/show-bridge.xml.in
@@ -42,6 +42,18 @@
             </properties>
             <command>${vyos_op_scripts_dir}/bridge.py show_fdb --interface=$3</command>
           </leafNode>
+          <leafNode name="detail">
+            <properties>
+              <help>Display bridge interface details</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/bridge.py show_detail --interface=$3</command>
+          </leafNode>
+          <leafNode name="nexthop-group">
+            <properties>
+              <help>Display bridge interface nexthop-group</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/bridge.py show_detail --nexthop_group --interface=$3</command>
+          </leafNode>
         </children>
       </tagNode>
     </children>
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>
diff --git a/op-mode-definitions/show-log.xml.in b/op-mode-definitions/show-log.xml.in
index 579e348f7..925a780ac 100644
--- a/op-mode-definitions/show-log.xml.in
+++ b/op-mode-definitions/show-log.xml.in
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
+    <properties>
+      <help>Show system information</help>
+    </properties>
     <children>
       <tagNode name="log">
         <properties>
@@ -395,23 +398,6 @@
             </properties>
             <command>journalctl --no-hostname --boot --unit ssh.service</command>
           </leafNode>
-          <node name="sstpc">
-            <properties>
-              <help>Show log for SSTP client</help>
-            </properties>
-            <command>journalctl --no-hostname --boot --unit "ppp@sstpc*.service"</command>
-            <children>
-              <tagNode name="interface">
-                <properties>
-                  <help>Show SSTP client log on specific interface</help>
-                  <completionHelp>
-                    <path>interfaces sstpc</path>
-                  </completionHelp>
-                </properties>
-                <command>journalctl --no-hostname --boot --unit "ppp@$5.service"</command>
-              </tagNode>
-            </children>
-          </node>
           <tagNode name="tail">
             <properties>
               <help>Show last n changes to messages</help>
@@ -427,47 +413,57 @@
             </properties>
             <command>tail -n 10 /var/log/messages</command>
           </node>
-          <node name="vpn">
+          <leafNode name="vpn">
+            <properties>
+              <help>Monitor last lines of ALL Virtual Private Network services</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit strongswan.service --unit accel-ppp@*.service --unit ocserv.service</command>
+          </leafNode>
+          <leafNode name="ipsec">
+            <properties>
+              <help>Show log for IPsec</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit strongswan.service</command>
+          </leafNode>
+          <leafNode name="l2tp">
+            <properties>
+              <help>Show log for L2TP</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit accel-ppp@l2tp.service</command>
+          </leafNode>
+          <leafNode name="openconnect">
+            <properties>
+              <help>Show log for OpenConnect</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit ocserv.service</command>
+          </leafNode>
+          <leafNode name="pptp">
+            <properties>
+              <help>Show log for PPTP</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit accel-ppp@pptp.service</command>
+          </leafNode>
+          <leafNode name="sstp">
+            <properties>
+              <help>Show log for Secure Socket Tunneling Protocol (SSTP) server</help>
+            </properties>
+            <command>journalctl --no-hostname --boot --unit accel-ppp@sstp.service</command>
+          </leafNode>
+          <node name="sstpc">
             <properties>
-              <help>Show log for Virtual Private Network (VPN)</help>
+              <help>Show log for Secure Socket Tunneling Protocol (SSTP) client</help>
             </properties>
+            <command>journalctl --no-hostname --boot --unit "ppp@sstpc*.service"</command>
             <children>
-              <leafNode name="all">
-                <properties>
-                  <help>Show log for ALL</help>
-                </properties>
-                <command>journalctl --no-hostname --boot --unit strongswan.service --unit accel-ppp@*.service --unit ocserv.service</command>
-              </leafNode>
-              <leafNode name="ipsec">
-                <properties>
-                  <help>Show log for IPsec</help>
-                </properties>
-                <command>journalctl --no-hostname --boot --unit strongswan.service</command>
-              </leafNode>
-              <leafNode name="l2tp">
-                <properties>
-                  <help>Show log for L2TP</help>
-                </properties>
-                <command>journalctl --no-hostname --boot --unit accel-ppp@l2tp.service</command>
-              </leafNode>
-              <leafNode name="openconnect">
-                <properties>
-                  <help>Show log for OpenConnect</help>
-                </properties>
-                <command>journalctl --no-hostname --boot --unit ocserv.service</command>
-              </leafNode>
-              <leafNode name="pptp">
-                <properties>
-                  <help>Show log for PPTP</help>
-                </properties>
-                <command>journalctl --no-hostname --boot --unit accel-ppp@pptp.service</command>
-              </leafNode>
-              <leafNode name="sstp">
+              <tagNode name="interface">
                 <properties>
-                  <help>Show log for SSTP</help>
+                  <help>Show SSTP client log on specific interface</help>
+                  <completionHelp>
+                    <path>interfaces sstpc</path>
+                  </completionHelp>
                 </properties>
-                <command>journalctl --no-hostname --boot --unit accel-ppp@sstp.service</command>
-              </leafNode>
+                <command>journalctl --no-hostname --boot --unit "ppp@$5.service"</command>
+              </tagNode>
             </children>
           </node>
           <leafNode name="vpp">
diff --git a/op-mode-definitions/webproxy.xml.in b/op-mode-definitions/webproxy.xml.in
index 5ae1577d8..57df44ff8 100644
--- a/op-mode-definitions/webproxy.xml.in
+++ b/op-mode-definitions/webproxy.xml.in
@@ -2,43 +2,28 @@
 <interfaceDefinition>
   <node name="monitor">
     <children>
-      <node name="webproxy">
-        <properties>
-          <help>Monitor WebProxy service</help>
-        </properties>
-        <command>${vyatta_bindir}/vyatta-monitor Webproxy squid</command>
+      <node name="log">
         <children>
-          <node name="access-log">
-            <properties>
-              <help>Monitor the last lines of the squid access log</help>
-            </properties>
-            <command>if [ -f /var/log/squid/access.log ]; then sudo tail --follow=name /var/log/squid/access.log; else echo "WebProxy access-log does not exist"; fi</command>
-          </node>
-          <node name="background">
+          <node name="webproxy">
             <properties>
-              <help>Monitor Webproxy in the background</help>
+              <help>Monitor last lines of Webproxy log</help>
             </properties>
+            <command>journalctl --no-hostname --boot --follow --unit squid.service</command>
             <children>
-              <node name="start">
+              <leafNode name="access-log">
                 <properties>
-                  <help>Start background monitoring of Webproxy</help>
+                  <help>Monitor the last lines of the Webproxy access log</help>
                 </properties>
-                <command>${vyatta_bindir}/vyatta-monitor-background Webproxy squid</command>
-              </node>
-              <node name="stop">
+                <command>if [ -f /var/log/squid/access.log ]; then sudo tail --follow=name /var/log/squid/access.log; else echo "WebProxy access-log does not exist"; fi</command>
+              </leafNode>
+              <leafNode name="cache-log">
                 <properties>
-                  <help>Stop background monitoring of Webproxy</help>
+                  <help>Monitor the last lines of the Webproxy cache log</help>
                 </properties>
-                <command>${vyatta_bindir}/vyatta-monitor-background-stop Webproxy </command>
-              </node>
+                <command>if [ -f /var/log/squid/cache.log ]; then sudo tail --follow=name /var/log/squid/cache.log; else echo "WebProxy cache-log does not exist"; fi</command>
+              </leafNode>
             </children>
           </node>
-          <node name="cache-log">
-            <properties>
-              <help>Monitor the last lines of the squid cache log</help>
-            </properties>
-            <command>if [ -f /var/log/squid/cache.log ]; then sudo tail --follow=name /var/log/squid/cache.log; else echo "WebProxy cache-log does not exist"; fi</command>
-          </node>
         </children>
       </node>
     </children>
@@ -102,6 +87,17 @@
               <help>Update the webproxy blacklist database</help>
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/webproxy_update_blacklist.sh --update-blacklist</command>
+            <children>
+              <tagNode name="vrf">
+                <properties>
+                  <help>Update webproxy blacklist database via specified VRF</help>
+                  <completionHelp>
+                    <path>vrf name</path>
+                  </completionHelp>
+                </properties>
+                <command>sudo ${vyos_op_scripts_dir}/webproxy_update_blacklist.sh --update-blacklist --vrf "${5}" </command>
+              </tagNode>
+            </children>
           </node>
         </children>
       </node>