From 939c7c16a5add4443aebc37a55c2a33e4fccb8d0 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 3 Dec 2019 22:25:43 +0100
Subject: T1843: use include files for IPv4/IPv6 interface address
 configuration

As 219779bc6151 ("T1843: run interface-definitions though GCC preprocessor")
implemented the foundation of using the GCC preprocessor to make our XML
definitions more lightweight this commit transforms the configuration of
an IPv4/IPv6 address to this new style. It implementes it for the following
interface types:

* bond
* bridge
* dummy
* ethernet
* geneve
* loopback
* vxlan
* wireguard
* wireless
---
 interface-definitions/interfaces-wireless.xml.in | 30 +-----------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

(limited to 'interface-definitions/interfaces-wireless.xml.in')

diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index 6bc49dddb..d8779cf72 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -16,35 +16,7 @@
           </valueHelp>
         </properties>
         <children>
-          <leafNode name="address">
-            <properties>
-              <help>IP address</help>
-              <completionHelp>
-                <list>dhcp dhcpv6</list>
-              </completionHelp>
-              <valueHelp>
-                <format>ipv4net</format>
-                <description>IPv4 address and prefix length</description>
-              </valueHelp>
-              <valueHelp>
-                <format>ipv6net</format>
-                <description>IPv6 address and prefix length</description>
-              </valueHelp>
-              <valueHelp>
-                <format>dhcp</format>
-                <description>Dynamic Host Configuration Protocol</description>
-              </valueHelp>
-              <valueHelp>
-                <format>dhcpv6</format>
-                <description>Dynamic Host Configuration Protocol for IPv6</description>
-              </valueHelp>
-              <constraint>
-                <validator name="ip-cidr"/>
-                <regex>(dhcp|dhcpv6)</regex>
-              </constraint>
-              <multi/>
-            </properties>
-          </leafNode>
+          #include "include/address-ipv4-ipv6-dhcp.xml.i"
           <node name="capabilities">
             <properties>
               <help>HT and VHT capabilities for your card</help>
-- 
cgit v1.2.3