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

5 files changed, 170 insertions, 3 deletions

diff --git a/interface-definitions/l2tp-server.xml.in b/interface-definitions/l2tp-server.xml.in
index 98c17b8b2..7fc844054 100644
--- a/interface-definitions/l2tp-server.xml.in
+++ b/interface-definitions/l2tp-server.xml.in
@@ -28,9 +28,9 @@
                   </constraint>
                 </properties>
               </leafNode>
-              <leafNode name="outside-nexthop">
+              <leafNode name="gateway-address">
                 <properties>
-                  <help>Nexthop IP address for reaching the VPN clients</help>
+                  <help>Gatway address uses as client tunnel termination point</help>
                   <constraint>
                     <validator name="ipv4-address"/>
                   </constraint>
diff --git a/interface-definitions/system-ip.xml.in b/interface-definitions/system-ip.xml.in
new file mode 100644
index 000000000..14b3b8a07
--- /dev/null
+++ b/interface-definitions/system-ip.xml.in
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="system">
+    <children>
+      <node name="ip" owner="${vyos_conf_scripts_dir}/system-ip.py">
+        <properties>
+          <help>IPv4 Settings</help>
+          <priority>400</priority>
+        </properties>
+        <children>
+          <node name="arp">
+            <properties>
+              <help>Parameters for ARP cache</help>
+            </properties>
+            <children>
+              <leafNode name="table-size">
+                <properties>
+                  <help>Maximum number of entries to keep in the ARP cache</help>
+                  <completionHelp>
+                    <list>1024 2048 4096 8192 16384 32768</list>
+                  </completionHelp>
+                  <constraint>
+                    <regex>(1024|2048|4096|8192|16384|32768)</regex>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+          <leafNode name="disable-forwarding">
+            <properties>
+              <help>Disable IPv4 forwarding on all interfaces</help>
+              <valueless/>
+            </properties>
+          </leafNode>
+          <node name="multipath">
+            <properties>
+              <help>IPv4 multipath settings</help>
+            </properties>
+            <children>
+              <leafNode name="ignore-unreachable-nexthops">
+                <properties>
+                  <help>Ignore next hops that are not in the ARP table</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+              <leafNode name="layer4-hashing">
+                <properties>
+                  <help>Use layer 4 information for ECMP hashing</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/system-ipv6.xml.in b/interface-definitions/system-ipv6.xml.in
new file mode 100644
index 000000000..47fbeb4e1
--- /dev/null
+++ b/interface-definitions/system-ipv6.xml.in
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="system">
+    <children>
+      <node name="ipv6" owner="${vyos_conf_scripts_dir}/system-ipv6.py">
+        <properties>
+          <help>IPv6 Settings</help>
+          <priority>290</priority>
+        </properties>
+        <children>
+          <leafNode name="disable-forwarding">
+            <properties>
+              <help>Disable IPv6 forwarding on all interfaces</help>
+              <valueless/>
+            </properties>
+          </leafNode>
+          <leafNode name="disable">
+            <properties>
+              <help>Disable assignment of IPv6 addresses on all interfaces</help>
+              <valueless/>
+            </properties>
+          </leafNode>
+          <node name="multipath">
+            <properties>
+              <help>IPv4 multipath settings</help>
+            </properties>
+            <children>
+              <leafNode name="layer4-hashing">
+                <properties>
+                  <help>Use layer 4 information for ECMP hashing</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+          <node name="neighbor">
+            <properties>
+              <help>Parameters for Neighbor cache</help>
+            </properties>
+            <children>
+              <leafNode name="table-size">
+                <properties>
+                  <help>Maximum number of entries to keep in the Neighbor cache</help>
+                  <completionHelp>
+                    <list>1024 2048 4096 8192 16384 32768</list>
+                  </completionHelp>
+                  <constraint>
+                    <regex>(1024|2048|4096|8192|16384|32768)</regex>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+          <leafNode name="strict-dad">
+            <properties>
+              <help>Disable IPv6 operation on interface when DAD fails on LL addr</help>
+              <valueless/>
+            </properties>
+          </leafNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/system-options.xml.in b/interface-definitions/system-options.xml.in
new file mode 100644
index 000000000..5fa0635bd
--- /dev/null
+++ b/interface-definitions/system-options.xml.in
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="system">
+    <children>
+      <node name="options" owner="${vyos_conf_scripts_dir}/system-options.py">
+        <properties>
+          <help>System Options</help>
+          <priority>400</priority>
+        </properties>
+        <children>
+          <leafNode name="ctrl-alt-del-action">
+            <properties>
+              <help>Ctrl-Alt-Delete action</help>
+              <completionHelp>
+                <list>ignore reboot poweroff</list>
+              </completionHelp>
+              <valueHelp>
+                <format>ignore</format>
+                <description>Ignore Ctrl-Alt-Delete</description>
+              </valueHelp>
+              <valueHelp>
+                <format>reboot</format>
+                <description>Reboot VyOS</description>
+              </valueHelp>
+              <valueHelp>
+                <format>poweroff</format>
+                <description>Poweroff VyOS</description>
+              </valueHelp>
+              <constraint>
+                <regex>(ignore|reboot|poweroff)</regex>
+              </constraint>
+              <constraintErrorMessage>Must be ignore, reboot, or poweroff</constraintErrorMessage>
+            </properties>
+           </leafNode>
+           <leafNode name="reboot-on-panic">
+             <properties>
+               <help>Reboot system on kernel panic</help>
+               <valueless/>
+             </properties>
+           </leafNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/system-time-zone.xml.in b/interface-definitions/system-time-zone.xml.in
index 1ef739735..ff815c9d3 100644
--- a/interface-definitions/system-time-zone.xml.in
+++ b/interface-definitions/system-time-zone.xml.in
@@ -2,7 +2,7 @@
 <interfaceDefinition>
   <node name="system">
     <children>
-      <leafNode name="time-zone" owner="${vyos_conf_scripts_dir}/timezone.py">
+      <leafNode name="time-zone" owner="${vyos_conf_scripts_dir}/system-timezone.py">
         <properties>
           <help>Local time zone (default UTC)</help>
           <priority>100</priority>