6 files changed, 55 insertions, 12 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/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-outbound-interface.xml.i b/interface-definitions/include/nat-interface.xml.i
index d562f7f03..c49483297 100644
--- a/interface-definitions/include/nat-outbound-interface.xml.i
+++ b/interface-definitions/include/nat-interface.xml.i
@@ -2,6 +2,7 @@
   <properties>
     <help>Outbound interface of NAT traffic</help>
     <completionHelp>
+      <list>any</list>
       <script>${vyos_completion_dir}/list_interfaces.py</script>
     </completionHelp>
   </properties>
diff --git a/interface-definitions/include/source-address-ipv4-ipv6.xml.i b/interface-definitions/include/source-address-ipv4-ipv6.xml.i
new file mode 100644
index 000000000..6d2d77c95
--- /dev/null
+++ b/interface-definitions/include/source-address-ipv4-ipv6.xml.i
@@ -0,0 +1,17 @@
+<leafNode name="source-address">
+  <properties>
+    <help>IPv4/IPv6 source address</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>IPv4 source-address</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6</format>
+      <description>IPv6 source-address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+      <validator name="ipv6-address"/>
+    </constraint>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/source-interface.xml.i b/interface-definitions/include/source-interface.xml.i
new file mode 100644
index 000000000..ae579c2a6
--- /dev/null
+++ b/interface-definitions/include/source-interface.xml.i
@@ -0,0 +1,12 @@
+<leafNode name="source-interface">
+  <properties>
+    <help>Physical interface used for connection</help>
+    <valueHelp>
+      <format>interface</format>
+      <description>Physical interface used for connection</description>
+    </valueHelp>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_interfaces.py</script>
+    </completionHelp>
+  </properties>
+</leafNode>