1 files changed, 2 insertions, 84 deletions
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>