Merge remote-tracking branch 'upstream/current' into current

6 files changed, 50 insertions, 35 deletions

diff --git a/interface-definitions/include/accel-radius-additions.xml.in b/interface-definitions/include/accel-radius-additions.xml.in
index 227a043cd..e37b68514 100644
--- a/interface-definitions/include/accel-radius-additions.xml.in
+++ b/interface-definitions/include/accel-radius-additions.xml.in
@@ -2,6 +2,18 @@
   <children>
     <tagNode name="server">
       <children>
+        <leafNode name="acct-port">
+          <properties>
+            <help>Accounting port</help>
+            <valueHelp>
+              <format>1-65535</format>
+              <description>Numeric IP port (default: 1813)</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 1-65535"/>
+            </constraint>
+          </properties>
+        </leafNode>
         <leafNode name="fail-time">
           <properties>
             <help>Mark server unavailable for &lt;n&gt; seconds on failure</help>
diff --git a/interface-definitions/include/bgp-afi-aggregate-address.xml.i b/interface-definitions/include/bgp-afi-aggregate-address.xml.i
index 40c030fc1..050ee0074 100644
--- a/interface-definitions/include/bgp-afi-aggregate-address.xml.i
+++ b/interface-definitions/include/bgp-afi-aggregate-address.xml.i
@@ -1,12 +1,12 @@
-<leafNode name="as-set">

-  <properties>

-    <help>Generate AS-set path information for this aggregate address</help>

-    <valueless/>

-  </properties>

-</leafNode>

-<leafNode name="summary-only">

-  <properties>

-    <help>Announce the aggregate summary network only</help>

-    <valueless/>

-  </properties>

-</leafNode>

+<leafNode name="as-set">
+  <properties>
+    <help>Generate AS-set path information for this aggregate address</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="summary-only">
+  <properties>
+    <help>Announce the aggregate summary network only</help>
+    <valueless/>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/dhcp-options.xml.i b/interface-definitions/include/dhcp-options.xml.i
index 0f71d9321..9989291fc 100644
--- a/interface-definitions/include/dhcp-options.xml.i
+++ b/interface-definitions/include/dhcp-options.xml.i
@@ -1,6 +1,6 @@
 <node name="dhcp-options">
   <properties>
-    <help>DHCP options</help>
+    <help>DHCP client settings/options</help>
   </properties>
   <children>
     <leafNode name="client-id">
diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i
index 98a87dba2..b0a806806 100644
--- a/interface-definitions/include/dhcpv6-options.xml.i
+++ b/interface-definitions/include/dhcpv6-options.xml.i
@@ -1,11 +1,24 @@
 <node name="dhcpv6-options">
   <properties>
-    <help>DHCPv6 options</help>
+    <help>DHCPv6 client settings/options</help>
   </properties>
   <children>
-    <node name="prefix-delegation">
+    <leafNode name="parameters-only">
       <properties>
-        <help>DHCPv6 Prefix Delegation Options</help>
+        <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">
@@ -19,6 +32,7 @@
               <validator name="numeric" argument="--range 32-64"/>
             </constraint>
           </properties>
+          <defaultValue>64</defaultValue>
         </leafNode>
         <tagNode name="interface">
           <properties>
@@ -52,31 +66,19 @@
                 </constraint>
               </properties>
             </leafNode>
-            <leafNode name="sla-len">
-              <properties>
-                <help>Site-Level aggregator (SLA) length</help>
-                <valueHelp>
-                  <format>0-128</format>
-                  <description>Length of delegated prefix</description>
-                </valueHelp>
-                <constraint>
-                  <validator name="numeric" argument="--range 0-128"/>
-                </constraint>
-              </properties>
-            </leafNode>
           </children>
         </tagNode>
       </children>
-    </node>
-    <leafNode name="parameters-only">
+    </tagNode>
+    <leafNode name="rapid-commit">
       <properties>
-        <help>Acquire only config parameters, no address</help>
+        <help>Wait for immediate reply instead of advertisements</help>
         <valueless/>
       </properties>
     </leafNode>
     <leafNode name="temporary">
       <properties>
-        <help>IPv6 "temporary" address</help>
+        <help>IPv6 temporary address</help>
         <valueless/>
       </properties>
     </leafNode>
diff --git a/interface-definitions/include/interface-arp-cache-timeout.xml.i b/interface-definitions/include/interface-arp-cache-timeout.xml.i
index 81d35f593..e65321158 100644
--- a/interface-definitions/include/interface-arp-cache-timeout.xml.i
+++ b/interface-definitions/include/interface-arp-cache-timeout.xml.i
@@ -10,4 +10,5 @@
     </constraint>
     <constraintErrorMessage>ARP cache entry timeout must be between 1 and 86400 seconds</constraintErrorMessage>
   </properties>
+  <defaultValue>30</defaultValue>
 </leafNode>
diff --git a/interface-definitions/include/nat-rule.xml.i b/interface-definitions/include/nat-rule.xml.i
index f62a08987..a2d058479 100644
--- a/interface-definitions/include/nat-rule.xml.i
+++ b/interface-definitions/include/nat-rule.xml.i
@@ -2,13 +2,13 @@
   <properties>
     <help>Rule number for NAT</help>
     <valueHelp>
-      <format>1-9999</format>
+      <format>1-999999</format>
       <description>Number for this NAT rule</description>
     </valueHelp>
     <constraint>
-      <validator name="numeric" argument="--range 1-9999"/>
+      <validator name="numeric" argument="--range 1-999999"/>
     </constraint>
-    <constraintErrorMessage>NAT rule number must be between 1 and 9999</constraintErrorMessage>
+    <constraintErrorMessage>NAT rule number must be between 1 and 999999</constraintErrorMessage>
   </properties>
   <children>
     <leafNode name="description">