From 020f217c2e4bfcff3cecb0b33c93af517775f4ae Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 23 Dec 2024 13:31:32 +0100
Subject: xml: T5738: re-use XML building blocks for interfaces as much as
 possible

Change XML definitions to re-use already existing building blocks, or merge
two building block sinto one (e.g. static route interfaces).
---
 interface-definitions/service_dhcpv6-server.xml.in | 32 ++--------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

(limited to 'interface-definitions/service_dhcpv6-server.xml.in')

diff --git a/interface-definitions/service_dhcpv6-server.xml.in b/interface-definitions/service_dhcpv6-server.xml.in
index cf14388e8..a6763a345 100644
--- a/interface-definitions/service_dhcpv6-server.xml.in
+++ b/interface-definitions/service_dhcpv6-server.xml.in
@@ -48,21 +48,7 @@
             <children>
               #include <include/generic-disable-node.xml.i>
               #include <include/generic-description.xml.i>
-              <leafNode name="interface">
-                <properties>
-                  <help>Optional interface for this shared network to accept requests from</help>
-                  <completionHelp>
-                    <script>${vyos_completion_dir}/list_interfaces</script>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>txt</format>
-                    <description>Interface name</description>
-                  </valueHelp>
-                  <constraint>
-                    #include <include/constraint/interface-name.xml.i>
-                  </constraint>
-                </properties>
-              </leafNode>
+              #include <include/generic-interface.xml.i>
               #include <include/dhcp/option-v6.xml.i>
               <tagNode name="subnet">
                 <properties>
@@ -77,21 +63,7 @@
                 </properties>
                 <children>
                   #include <include/dhcp/option-v6.xml.i>
-                  <leafNode name="interface">
-                    <properties>
-                      <help>Optional interface for this subnet to accept requests from</help>
-                      <completionHelp>
-                        <script>${vyos_completion_dir}/list_interfaces</script>
-                      </completionHelp>
-                      <valueHelp>
-                        <format>txt</format>
-                        <description>Interface name</description>
-                      </valueHelp>
-                      <constraint>
-                        #include <include/constraint/interface-name.xml.i>
-                      </constraint>
-                    </properties>
-                  </leafNode>
+                  #include <include/generic-interface.xml.i>
                   <tagNode name="range">
                     <properties>
                       <help>Parameters setting ranges for assigning IPv6 addresses</help>
-- 
cgit v1.2.3