From 04288af4fcfa89427e8344790cb16942c06b77c5 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sat, 4 Feb 2023 16:13:00 +0100
Subject: dhcp-relay: T2408: use Warning() on deprecated interface CLI node

---
 interface-definitions/dhcp-relay.xml.in | 17 +----------------
 src/conf_mode/dhcp_relay.py             |  2 ++
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/interface-definitions/dhcp-relay.xml.in b/interface-definitions/dhcp-relay.xml.in
index 746cc2fb4..f152a5b64 100644
--- a/interface-definitions/dhcp-relay.xml.in
+++ b/interface-definitions/dhcp-relay.xml.in
@@ -9,22 +9,7 @@
           <priority>910</priority>
         </properties>
         <children>
-          <leafNode name="interface">
-            <properties>
-              <help>Interface Name to use [To be deprecated]. Only for backward compatibility. Use listen-interface and upstream-interface instead of this option </help>
-              <completionHelp>
-                <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script>
-              </completionHelp>
-              <valueHelp>
-                <format>txt</format>
-                <description>Interface name</description>
-              </valueHelp>
-              <constraint>
-                <validator name="interface-name"/>
-              </constraint>
-              <multi/>
-            </properties>
-          </leafNode>
+          #include <include/generic-interface-multi-broadcast.xml.i>
           <leafNode name="listen-interface">
             <properties>
               <help>Interface for DHCP Relay Agent to listen for requests</help>
diff --git a/src/conf_mode/dhcp_relay.py b/src/conf_mode/dhcp_relay.py
index 07ec1c7a3..7e702a446 100755
--- a/src/conf_mode/dhcp_relay.py
+++ b/src/conf_mode/dhcp_relay.py
@@ -18,6 +18,7 @@ import os
 
 from sys import exit
 
+from vyos.base import Warning
 from vyos.config import Config
 from vyos.configdict import dict_merge
 from vyos.template import render
@@ -61,6 +62,7 @@ def verify(relay):
                           'At least one DHCP relay server required.')
 
     if 'interface' in relay:
+        Warning('DHCP relay interface is DEPRECATED - please use upstream-interface and listen-interface instead!')
         if 'upstream_interface' in relay or 'listen_interface' in relay:
             raise ConfigError('<interface> configuration is not compatible with upstream/listen interface')
         else:
-- 
cgit v1.2.3