From c55140f8bbd8e8f0e7c112a419027b65d479add6 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Wed, 6 Mar 2024 21:53:46 +0100
Subject: dhcp: T6102: Fix clear DHCP lease op-mode

* Add `clear dhcpv6-server lease`
* Standardize using vyos.opmode
---
 op-mode-definitions/clear-dhcp-server-lease.xml.in | 20 ---------------
 op-mode-definitions/dhcp.xml.in                    | 30 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 20 deletions(-)
 delete mode 100644 op-mode-definitions/clear-dhcp-server-lease.xml.in

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/clear-dhcp-server-lease.xml.in b/op-mode-definitions/clear-dhcp-server-lease.xml.in
deleted file mode 100644
index aef0eb22a..000000000
--- a/op-mode-definitions/clear-dhcp-server-lease.xml.in
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="clear">
-    <children>
-      <node name="dhcp-server">
-        <properties>
-          <help>Clear DHCP server lease</help>
-        </properties>
-        <children>
-          <tagNode name="lease">
-            <properties>
-              <help>DHCP server lease</help>
-            </properties>
-            <command>sudo ${vyos_op_scripts_dir}/clear_dhcp_lease.py --ip $4</command>
-          </tagNode>
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>
diff --git a/op-mode-definitions/dhcp.xml.in b/op-mode-definitions/dhcp.xml.in
index 0db7471e5..3c42c8e8f 100644
--- a/op-mode-definitions/dhcp.xml.in
+++ b/op-mode-definitions/dhcp.xml.in
@@ -1,5 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interfaceDefinition>
+  <node name="clear">
+    <children>
+      <node name="dhcp-server">
+        <properties>
+          <help>Clear DHCP server lease</help>
+        </properties>
+        <children>
+          <tagNode name="lease">
+            <properties>
+              <help>DHCP server lease</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/dhcp.py clear_dhcp_server_lease --family inet --address $4</command>
+          </tagNode>
+        </children>
+      </node>
+      <node name="dhcpv6-server">
+        <properties>
+          <help>Clear DHCPv6 server lease</help>
+        </properties>
+        <children>
+          <tagNode name="lease">
+            <properties>
+              <help>DHCPv6 server lease</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/dhcp.py clear_dhcp_server_lease --family inet6 --address $4</command>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
   <node name="show">
     <children>
       <node name="dhcp">
-- 
cgit v1.2.3