xml: move dhcp(v6)-options.xml.i under interface include subfolder

11 files changed, 19 insertions, 19 deletions

diff --git a/interface-definitions/include/dhcp-options.xml.i b/interface-definitions/include/interface/dhcp-options.xml.i
index 39a3dbb2e..39a3dbb2e 100644
--- a/interface-definitions/include/dhcp-options.xml.i
+++ b/interface-definitions/include/interface/dhcp-options.xml.i
diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/interface/dhcpv6-options.xml.i
index a569659a4..a569659a4 100644
--- a/interface-definitions/include/dhcpv6-options.xml.i
+++ b/interface-definitions/include/interface/dhcpv6-options.xml.i
diff --git a/interface-definitions/include/interface/vif-s.xml.i b/interface-definitions/include/interface/vif-s.xml.i
index dc0d91909..85885c153 100644
--- a/interface-definitions/include/interface/vif-s.xml.i
+++ b/interface-definitions/include/interface/vif-s.xml.i
@@ -10,8 +10,8 @@
   <children>
     #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
     #include <include/interface/interface-description.xml.i>
-    #include <include/dhcp-options.xml.i>
-    #include <include/dhcpv6-options.xml.i>
+    #include <include/interface/dhcp-options.xml.i>
+    #include <include/interface/dhcpv6-options.xml.i>
     #include <include/interface/interface-disable-link-detect.xml.i>
     #include <include/interface/interface-disable.xml.i>
     <leafNode name="protocol">
@@ -50,8 +50,8 @@
       <children>
         #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
         #include <include/interface/interface-description.xml.i>
-        #include <include/dhcp-options.xml.i>
-        #include <include/dhcpv6-options.xml.i>
+        #include <include/interface/dhcp-options.xml.i>
+        #include <include/interface/dhcpv6-options.xml.i>
         #include <include/interface/interface-disable-link-detect.xml.i>
         #include <include/interface/interface-disable.xml.i>
         #include <include/interface/interface-ipv4-options.xml.i>
diff --git a/interface-definitions/include/interface/vif.xml.i b/interface-definitions/include/interface/vif.xml.i
index 60d66f751..4e7aeb0f9 100644
--- a/interface-definitions/include/interface/vif.xml.i
+++ b/interface-definitions/include/interface/vif.xml.i
@@ -14,8 +14,8 @@
   <children>
     #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
     #include <include/interface/interface-description.xml.i>
-    #include <include/dhcp-options.xml.i>
-    #include <include/dhcpv6-options.xml.i>
+    #include <include/interface/dhcp-options.xml.i>
+    #include <include/interface/dhcpv6-options.xml.i>
     #include <include/interface/interface-disable-link-detect.xml.i>
     #include <include/interface/interface-disable.xml.i>
     #include <include/interface/interface-vrf.xml.i>
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index 0792bdb8f..cf9fb73eb 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -50,8 +50,8 @@
             </children>
           </node>
           #include <include/interface/interface-description.xml.i>
-          #include <include/dhcp-options.xml.i>
-          #include <include/dhcpv6-options.xml.i>
+          #include <include/interface/dhcp-options.xml.i>
+          #include <include/interface/dhcpv6-options.xml.i>
           #include <include/interface/interface-disable-link-detect.xml.i>
           #include <include/interface/interface-disable.xml.i>
           #include <include/interface/interface-vrf.xml.i>
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index 8b68ee992..15feedca1 100644
--- a/interface-definitions/interfaces-bridge.xml.in
+++ b/interface-definitions/interfaces-bridge.xml.in
@@ -35,8 +35,8 @@
             <defaultValue>300</defaultValue>
           </leafNode>
           #include <include/interface/interface-description.xml.i>
-          #include <include/dhcp-options.xml.i>
-          #include <include/dhcpv6-options.xml.i>
+          #include <include/interface/dhcp-options.xml.i>
+          #include <include/interface/dhcpv6-options.xml.i>
           #include <include/interface/interface-disable-link-detect.xml.i>
           #include <include/interface/interface-disable.xml.i>
           #include <include/interface/interface-vrf.xml.i>
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index b13072404..fe5f92da0 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -18,8 +18,8 @@
         <children>
           #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
           #include <include/interface/interface-description.xml.i>
-          #include <include/dhcp-options.xml.i>
-          #include <include/dhcpv6-options.xml.i>
+          #include <include/interface/dhcp-options.xml.i>
+          #include <include/interface/dhcpv6-options.xml.i>
           <leafNode name="disable-flow-control">
             <properties>
               <help>Disable Ethernet flow control (pause frames)</help>
diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in
index 975c0ff9a..96479e057 100644
--- a/interface-definitions/interfaces-pppoe.xml.in
+++ b/interface-definitions/interfaces-pppoe.xml.in
@@ -52,7 +52,7 @@
             </properties>
             <defaultValue>auto</defaultValue>
           </leafNode>
-          #include <include/dhcpv6-options.xml.i>
+          #include <include/interface/dhcpv6-options.xml.i>
           #include <include/interface/interface-description.xml.i>
           #include <include/interface/interface-disable.xml.i>
           #include <include/interface/interface-vrf.xml.i>
diff --git a/interface-definitions/interfaces-pseudo-ethernet.xml.in b/interface-definitions/interfaces-pseudo-ethernet.xml.in
index 2fe3b5dfa..136841290 100644
--- a/interface-definitions/interfaces-pseudo-ethernet.xml.in
+++ b/interface-definitions/interfaces-pseudo-ethernet.xml.in
@@ -18,8 +18,8 @@
         <children>
           #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
           #include <include/interface/interface-description.xml.i>
-          #include <include/dhcp-options.xml.i>
-          #include <include/dhcpv6-options.xml.i>
+          #include <include/interface/dhcp-options.xml.i>
+          #include <include/interface/dhcpv6-options.xml.i>
           #include <include/interface/interface-disable-link-detect.xml.i>
           #include <include/interface/interface-disable.xml.i>
           #include <include/interface/interface-vrf.xml.i>
diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index 14b4b4bf5..aaeb285f1 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -465,8 +465,8 @@
             </properties>
           </leafNode>
           #include <include/interface/interface-description.xml.i>
-          #include <include/dhcp-options.xml.i>
-          #include <include/dhcpv6-options.xml.i>
+          #include <include/interface/dhcp-options.xml.i>
+          #include <include/interface/dhcpv6-options.xml.i>
           <leafNode name="disable-broadcast-ssid">
             <properties>
               <help>Disable broadcast of SSID from access-point</help>
diff --git a/interface-definitions/interfaces-wwan.xml.in b/interface-definitions/interfaces-wwan.xml.in
index 5d899a280..647ce0bc1 100644
--- a/interface-definitions/interfaces-wwan.xml.in
+++ b/interface-definitions/interfaces-wwan.xml.in
@@ -26,8 +26,8 @@
             </properties>
           </leafNode>
           #include <include/interface/authentication.xml.i>
-          #include <include/dhcp-options.xml.i>
-          #include <include/dhcpv6-options.xml.i>
+          #include <include/interface/dhcp-options.xml.i>
+          #include <include/interface/dhcpv6-options.xml.i>
           #include <include/interface/interface-description.xml.i>
           #include <include/interface/interface-disable.xml.i>
           #include <include/interface/interface-vrf.xml.i>