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

4 files changed, 166 insertions, 6 deletions

diff --git a/interface-definitions/include/interface/dhcp-options.xml.i b/interface-definitions/include/interface/dhcp-options.xml.i
new file mode 100644
index 000000000..39a3dbb2e
--- /dev/null
+++ b/interface-definitions/include/interface/dhcp-options.xml.i
@@ -0,0 +1,60 @@
+<!-- include start from dhcp-options.xml.i -->
+<node name="dhcp-options">
+  <properties>
+    <help>DHCP client settings/options</help>
+  </properties>
+  <children>
+    <leafNode name="client-id">
+      <properties>
+        <help>Identifier used by client to identify itself to the DHCP server</help>
+      </properties>
+    </leafNode>
+    <leafNode name="host-name">
+      <properties>
+        <help>Override system host-name sent to DHCP server</help>
+      </properties>
+    </leafNode>
+    <leafNode name="vendor-class-id">
+      <properties>
+        <help>Identify the vendor client type to the DHCP server</help>
+      </properties>
+    </leafNode>
+    <leafNode name="no-default-route">
+      <properties>
+        <help>Do not request routers from DHCP server</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="default-route-distance">
+      <properties>
+        <help>Distance for the default route from DHCP server</help>
+        <valueHelp>
+          <format>u32:1-255</format>
+          <description>Distance for the default route from DHCP server (default 210)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-255"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="reject">
+      <properties>
+        <help>IP addresses or subnets from which to reject DHCP leases</help>
+        <valueHelp>
+          <format>ipv4</format>
+          <description>IPv4 address to match</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ipv4net</format>
+          <description>IPv4 prefix to match</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv4-address"/>
+          <validator name="ipv4-prefix"/>
+        </constraint>
+        <multi/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/dhcpv6-options.xml.i b/interface-definitions/include/interface/dhcpv6-options.xml.i
new file mode 100644
index 000000000..a569659a4
--- /dev/null
+++ b/interface-definitions/include/interface/dhcpv6-options.xml.i
@@ -0,0 +1,100 @@
+<!-- include start from dhcpv6-options.xml.i -->
+<node name="dhcpv6-options">
+  <properties>
+    <help>DHCPv6 client settings/options</help>
+  </properties>
+  <children>
+    <leafNode name="duid">
+      <properties>
+        <help>DHCP unique identifier (DUID) to be sent by dhcpv6 client</help>
+        <valueHelp>
+          <format>duid</format>
+          <description>DHCP unique identifier (DUID)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv6-duid"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="parameters-only">
+      <properties>
+        <help>Acquire only config parameters, no address</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <tagNode name="pd">
+      <properties>
+        <help>DHCPv6 prefix delegation interface statement</help>
+        <valueHelp>
+          <format>instance number</format>
+          <description>Prefix delegation instance (>= 0)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--non-negative"/>
+        </constraint>
+      </properties>
+      <children>
+        <leafNode name="length">
+          <properties>
+            <help>Request IPv6 prefix length from peer</help>
+            <valueHelp>
+              <format>32-64</format>
+              <description>Length of delegated prefix</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 32-64"/>
+            </constraint>
+          </properties>
+          <defaultValue>64</defaultValue>
+        </leafNode>
+        <tagNode name="interface">
+          <properties>
+            <help>Delegate IPv6 prefix from provider to this interface</help>
+            <completionHelp>
+              <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script>
+            </completionHelp>
+          </properties>
+          <children>
+            <leafNode name="address">
+              <properties>
+                <help>Local interface address assigned to interface</help>
+                <valueHelp>
+                  <format>&gt;0</format>
+                  <description>Used to form IPv6 interface address (default: EUI-64)</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="numeric" argument="--non-negative"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            <leafNode name="sla-id">
+              <properties>
+                <help>Interface site-Level aggregator (SLA)</help>
+                <valueHelp>
+                  <format>0-128</format>
+                  <description>Decimal integer which fits in the length of SLA IDs</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="numeric" argument="--range 0-128"/>
+                </constraint>
+              </properties>
+            </leafNode>
+          </children>
+        </tagNode>
+      </children>
+    </tagNode>
+    <leafNode name="rapid-commit">
+      <properties>
+        <help>Wait for immediate reply instead of advertisements</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="temporary">
+      <properties>
+        <help>IPv6 temporary address</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
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>