8 files changed, 35 insertions, 0 deletions
diff --git a/interface-definitions/include/interface-mtu-1200-9000.xml.i b/interface-definitions/include/interface-mtu-1200-9000.xml.i
index 336845b77..de48db65e 100644
--- a/interface-definitions/include/interface-mtu-1200-9000.xml.i
+++ b/interface-definitions/include/interface-mtu-1200-9000.xml.i
@@ -10,4 +10,5 @@
     </constraint>
     <constraintErrorMessage>MTU must be between 1200 and 9000</constraintErrorMessage>
   </properties>
+  <defaultValue>1500</defaultValue>
 </leafNode>
diff --git a/interface-definitions/include/interface-mtu-1450-9000.xml.i b/interface-definitions/include/interface-mtu-1450-9000.xml.i
index 87296a050..d15987394 100644
--- a/interface-definitions/include/interface-mtu-1450-9000.xml.i
+++ b/interface-definitions/include/interface-mtu-1450-9000.xml.i
@@ -10,4 +10,5 @@
     </constraint>
     <constraintErrorMessage>MTU must be between 1450 and 9000</constraintErrorMessage>
   </properties>
+  <defaultValue>1500</defaultValue>
 </leafNode>
diff --git a/interface-definitions/include/interface-mtu-64-8024.xml.i b/interface-definitions/include/interface-mtu-64-8024.xml.i
index e917c816f..e60867e35 100644
--- a/interface-definitions/include/interface-mtu-64-8024.xml.i
+++ b/interface-definitions/include/interface-mtu-64-8024.xml.i
@@ -10,4 +10,5 @@
     </constraint>
     <constraintErrorMessage>MTU must be between 64 and 8024</constraintErrorMessage>
   </properties>
+  <defaultValue>1500</defaultValue>
 </leafNode>
diff --git a/interface-definitions/include/interface-mtu-68-1500.xml.i b/interface-definitions/include/interface-mtu-68-1500.xml.i
index 81223c332..d47efd2c9 100644
--- a/interface-definitions/include/interface-mtu-68-1500.xml.i
+++ b/interface-definitions/include/interface-mtu-68-1500.xml.i
@@ -10,4 +10,5 @@
     </constraint>
     <constraintErrorMessage>MTU must be between 68 and 1500</constraintErrorMessage>
   </properties>
+  <defaultValue>1500</defaultValue>
 </leafNode>
diff --git a/interface-definitions/include/interface-mtu-68-9000.xml.i b/interface-definitions/include/interface-mtu-68-9000.xml.i
index ad11afa80..8fae2043c 100644
--- a/interface-definitions/include/interface-mtu-68-9000.xml.i
+++ b/interface-definitions/include/interface-mtu-68-9000.xml.i
@@ -10,4 +10,5 @@
     </constraint>
     <constraintErrorMessage>MTU must be between 68 and 9000</constraintErrorMessage>
   </properties>
+  <defaultValue>1500</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>