From 6c51461bfe1e29ecc6ea84288d080330f974111d Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 3 Dec 2019 23:06:48 +0100
Subject: T1843: use include files for DHCP/DHCPv6 options

As 219779b ("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 DHCP/
DHCPv6 configuration options to this new style. It implementes it for the
following interface types:

* bonding
* bridge
* ethernet
* wireless
* vif/vif-s interfaces
---
 .../include/dhcp-dhcpv6-options.xml.i              | 42 +++++++++++
 interface-definitions/include/vif-s.xml.i          | 86 +---------------------
 interface-definitions/include/vif.xml.i            | 43 +----------
 3 files changed, 45 insertions(+), 126 deletions(-)
 create mode 100644 interface-definitions/include/dhcp-dhcpv6-options.xml.i

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/dhcp-dhcpv6-options.xml.i b/interface-definitions/include/dhcp-dhcpv6-options.xml.i
new file mode 100644
index 000000000..104b1fbe0
--- /dev/null
+++ b/interface-definitions/include/dhcp-dhcpv6-options.xml.i
@@ -0,0 +1,42 @@
+<node name="dhcp-options">
+  <properties>
+    <help>DHCP options</help>
+  </properties>
+  <children>
+    <leafNode name="client-id">
+      <properties>
+        <help>DHCP client identifier</help>
+      </properties>
+    </leafNode>
+    <leafNode name="host-name">
+      <properties>
+        <help>DHCP client host name (overrides system host name)</help>
+      </properties>
+    </leafNode>
+    <leafNode name="vendor-class-id">
+      <properties>
+        <help>DHCP client vendor type</help>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<node name="dhcpv6-options">
+  <properties>
+    <help>DHCPv6 options</help>
+    <priority>319</priority>
+  </properties>
+  <children>
+    <leafNode name="parameters-only">
+      <properties>
+        <help>Acquire only config parameters, no address</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="temporary">
+      <properties>
+        <help>IPv6 "temporary" address</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i
index 8828aca13..51a68c859 100644
--- a/interface-definitions/include/vif-s.xml.i
+++ b/interface-definitions/include/vif-s.xml.i
@@ -17,48 +17,7 @@
         <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
       </properties>
     </leafNode>
-    <node name="dhcp-options">
-      <properties>
-        <help>DHCP options</help>
-      </properties>
-      <children>
-        <leafNode name="client-id">
-          <properties>
-            <help>DHCP client identifier</help>
-          </properties>
-        </leafNode>
-        <leafNode name="host-name">
-          <properties>
-            <help>DHCP client host name (overrides the system host name)</help>
-          </properties>
-        </leafNode>
-        <leafNode name="vendor-class-id">
-          <properties>
-            <help>DHCP client vendor type</help>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="dhcpv6-options">
-      <properties>
-        <help>DHCPv6 options</help>
-        <priority>319</priority>
-      </properties>
-      <children>
-        <leafNode name="parameters-only">
-          <properties>
-            <help>Acquire only config parameters, no address</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="temporary">
-          <properties>
-            <help>IPv6 "temporary" address</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
+    #include <include/dhcp-dhcpv6-options.xml.i>
     <leafNode name="disable-link-detect">
       <properties>
         <help>Ignore link state changes</help>
@@ -135,48 +94,7 @@
             <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
           </properties>
         </leafNode>
-        <node name="dhcp-options">
-          <properties>
-            <help>DHCP options</help>
-          </properties>
-          <children>
-            <leafNode name="client-id">
-              <properties>
-                <help>DHCP client identifier</help>
-              </properties>
-            </leafNode>
-            <leafNode name="host-name">
-              <properties>
-                <help>DHCP client host name (overrides the system host name)</help>
-              </properties>
-            </leafNode>
-            <leafNode name="vendor-class-id">
-              <properties>
-                <help>DHCP client vendor type</help>
-              </properties>
-            </leafNode>
-          </children>
-        </node>
-        <node name="dhcpv6-options">
-          <properties>
-            <help>DHCPv6 options</help>
-            <priority>319</priority>
-          </properties>
-          <children>
-            <leafNode name="parameters-only">
-              <properties>
-                <help>Acquire only config parameters, no address</help>
-                <valueless/>
-              </properties>
-            </leafNode>
-            <leafNode name="temporary">
-              <properties>
-                <help>IPv6 "temporary" address</help>
-                <valueless/>
-              </properties>
-            </leafNode>
-          </children>
-        </node>
+        #include <include/dhcp-dhcpv6-options.xml.i>
         <leafNode name="disable-link-detect">
           <properties>
             <help>Ignore link state changes</help>
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
index 489107ece..0cc3d3dc8 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/vif.xml.i
@@ -21,48 +21,7 @@
         <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
       </properties>
     </leafNode>
-    <node name="dhcp-options">
-      <properties>
-        <help>DHCP options</help>
-      </properties>
-      <children>
-        <leafNode name="client-id">
-          <properties>
-            <help>DHCP client identifier</help>
-          </properties>
-        </leafNode>
-        <leafNode name="host-name">
-          <properties>
-            <help>DHCP client host name (overrides system host name)</help>
-          </properties>
-        </leafNode>
-        <leafNode name="vendor-class-id">
-          <properties>
-            <help>DHCP client vendor type</help>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="dhcpv6-options">
-      <properties>
-        <help>DHCPv6 options</help>
-        <priority>319</priority>
-      </properties>
-      <children>
-        <leafNode name="parameters-only">
-          <properties>
-            <help>Acquire only config parameters, no address</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="temporary">
-          <properties>
-            <help>IPv6 "temporary" address</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
+    #include <include/dhcp-dhcpv6-options.xml.i>
     <leafNode name="disable-link-detect">
       <properties>
         <help>Ignore link state changes</help>
-- 
cgit v1.2.3