From 843c789a0e92c10965440162f4c2af774e61d32e Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 17 May 2020 16:21:30 +0200
Subject: xml: split dhcp, dhcpv6 to individual files

---
 .../include/dhcp-dhcpv6-options.xml.i              | 41 ----------------------
 interface-definitions/include/dhcp-options.xml.i   | 22 ++++++++++++
 interface-definitions/include/dhcpv6-options.xml.i | 19 ++++++++++
 interface-definitions/include/vif-s.xml.i          |  6 ++--
 interface-definitions/include/vif.xml.i            |  3 +-
 5 files changed, 47 insertions(+), 44 deletions(-)
 delete mode 100644 interface-definitions/include/dhcp-dhcpv6-options.xml.i
 create mode 100644 interface-definitions/include/dhcp-options.xml.i
 create mode 100644 interface-definitions/include/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
deleted file mode 100644
index e4387863b..000000000
--- a/interface-definitions/include/dhcp-dhcpv6-options.xml.i
+++ /dev/null
@@ -1,41 +0,0 @@
-<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>
-  </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/dhcp-options.xml.i b/interface-definitions/include/dhcp-options.xml.i
new file mode 100644
index 000000000..0f71d9321
--- /dev/null
+++ b/interface-definitions/include/dhcp-options.xml.i
@@ -0,0 +1,22 @@
+<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>
diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i
new file mode 100644
index 000000000..c55a5271f
--- /dev/null
+++ b/interface-definitions/include/dhcpv6-options.xml.i
@@ -0,0 +1,19 @@
+<node name="dhcpv6-options">
+  <properties>
+    <help>DHCPv6 options</help>
+  </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 ab2dcd955..a6d7c81ce 100644
--- a/interface-definitions/include/vif-s.xml.i
+++ b/interface-definitions/include/vif-s.xml.i
@@ -9,7 +9,8 @@
   <children>
     #include <include/address-ipv4-ipv6-dhcp.xml.i>
     #include <include/interface-description.xml.i>
-    #include <include/dhcp-dhcpv6-options.xml.i>
+    #include <include/dhcp-options.xml.i>
+    #include <include/dhcpv6-options.xml.i>
     #include <include/interface-disable-link-detect.xml.i>
     #include <include/interface-disable.xml.i>
     <leafNode name="ethertype">
@@ -53,7 +54,8 @@
       <children>
         #include <include/address-ipv4-ipv6-dhcp.xml.i>
         #include <include/interface-description.xml.i>
-        #include <include/dhcp-dhcpv6-options.xml.i>
+        #include <include/dhcp-options.xml.i>
+        #include <include/dhcpv6-options.xml.i>
         #include <include/interface-disable-link-detect.xml.i>
         #include <include/interface-disable.xml.i>
         #include <include/interface-mac.xml.i>
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
index 819534dc1..5a4e52122 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/vif.xml.i
@@ -13,7 +13,8 @@
   <children>
     #include <include/address-ipv4-ipv6-dhcp.xml.i>
     #include <include/interface-description.xml.i>
-    #include <include/dhcp-dhcpv6-options.xml.i>
+    #include <include/dhcp-options.xml.i>
+    #include <include/dhcpv6-options.xml.i>
     #include <include/interface-disable-link-detect.xml.i>
     #include <include/interface-disable.xml.i>
     #include <include/interface-vrf.xml.i>
-- 
cgit v1.2.3