Merge branch 'current' into crux

4 files changed, 229 insertions, 20 deletions

diff --git a/interface-definitions/dhcp-relay.xml b/interface-definitions/dhcp-relay.xml
new file mode 100644
index 000000000..c918d25a3
--- /dev/null
+++ b/interface-definitions/dhcp-relay.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<!-- DHCP relay configuration -->
+<interfaceDefinition>
+  <node name="service">
+    <children>
+      <node name="dhcp-relay" owner="${vyos_conf_scripts_dir}/dhcp_relay.py">
+        <properties>
+          <help>Host Configuration Protocol (DHCP) relay agent</help>
+          <priority>910</priority>
+        </properties>
+        <children>
+          <leafNode name="interface">
+            <properties>
+              <help>DHCP relay interface [REQUIRED]</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py -b</script>
+              </completionHelp>
+              <multi/>
+            </properties>
+          </leafNode>
+          <node name="relay-options">
+            <properties>
+              <help>Relay options</help>
+            </properties>
+            <children>
+              <leafNode name="hop-count">
+                <properties>
+                  <help>Policy to discard packets that have reached specified hop-count</help>
+                  <valueHelp>
+                    <format>1-255</format>
+                    <description>Hop count (default: 10)</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-255"/>
+                  </constraint>
+                  <constraintErrorMessage>hop-count must be a value between 1 and 255</constraintErrorMessage>
+                </properties>
+              </leafNode>
+              <leafNode name="max-size">
+                <properties>
+                  <help>Maximum packet size to send to a DHCPv4/BOOTP server</help>
+                  <valueHelp>
+                    <format>64-1400</format>
+                    <description>Maximum packet size (default: 576)</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 64-1400"/>
+                  </constraint>
+                  <constraintErrorMessage>max-size must be a value between 64 and 1400</constraintErrorMessage>
+                </properties>
+              </leafNode>
+              <leafNode name="port">
+                <properties>
+                  <help>Port number to listen on</help>
+                  <valueHelp>
+                    <format>1-65535</format>
+                    <description>Port to listen on</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-65535"/>
+                  </constraint>
+                  <constraintErrorMessage>port must be a value between 1 and 65535</constraintErrorMessage>
+                </properties>
+              </leafNode>
+              <leafNode name="relay-agents-packets">
+                <properties>
+                  <help>Policy to handle incoming DHCPv4 packets which already contain relay agent options (default: forward)</help>
+                  <valueHelp>
+                    <format>append</format>
+                    <description>append own relay options to packet</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>replace</format>
+                    <description>replace existing agent option field</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>forward</format>
+                    <description>forward packet unchanged</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>discard</format>
+                    <description>discard packet (default action if giaddr not set in packet)</description>
+                  </valueHelp>
+                  <constraint>
+                    <regex>(append|replace|forward|discard)</regex>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+          <leafNode name="server">
+            <properties>
+              <help>DHCP server address</help>
+              <valueHelp>
+                <format>ipv4</format>
+                <description>DHCP server IPv4 address</description>
+              </valueHelp>
+              <multi/>
+              <constraint>
+                <validator name="ipv4-address"/>
+              </constraint>
+            </properties>
+          </leafNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/dhcpv6-relay.xml b/interface-definitions/dhcpv6-relay.xml
new file mode 100644
index 000000000..d6e6daf51
--- /dev/null
+++ b/interface-definitions/dhcpv6-relay.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<!-- DHCPv6 relay configuration -->
+<interfaceDefinition>
+  <node name="service">
+    <children>
+      <node name="dhcpv6-relay" owner="${vyos_conf_scripts_dir}/dhcpv6_relay.py">
+        <properties>
+          <help>DHCPv6 Relay Agent parameters</help>
+          <priority>900</priority>
+        </properties>
+        <children>
+          <tagNode name="listen-interface">
+            <properties>
+              <help>Interface for DHCPv6 Relay Agent to listen for requests</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py</script>
+              </completionHelp>
+            </properties>
+            <children>
+              <leafNode name="address">
+                <properties>
+                  <help>IPv6 address on listen-interface listen for requests on</help>
+                  <valueHelp>
+                    <format>ipv6</format>
+                    <description>IPv6 address on listen interface</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="ipv6-address"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </tagNode>
+          <leafNode name="listen-port">
+            <properties>
+              <help>UDP port to listen for requests on</help>
+              <valueHelp>
+                <format>1-65535</format>
+                <description>Port to listen on</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 1-65535"/>
+              </constraint>
+              <constraintErrorMessage>port must be a value between 1 and 65535</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <leafNode name="max-hop-count">
+            <properties>
+              <help>Maximum hop count for which requests will be processed</help>
+              <valueHelp>
+                <format>1-255</format>
+                <description>Hop count (default: 10)</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 1-255"/>
+              </constraint>
+              <constraintErrorMessage>max-hop-count must be a value between 1 and 255</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <tagNode name="upstream-interface">
+            <properties>
+              <help>Interface for DHCPv6 Relay Agent forward requests out</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py</script>
+              </completionHelp>
+            </properties>
+            <children>
+              <leafNode name="address">
+                <properties>
+                    <help>IPv6 address to forward requests to</help>
+                  <valueHelp>
+                    <format>ipv6</format>
+                    <description>IPv6 address of the DHCP server</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="ipv6-address"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </tagNode>
+          <leafNode name="use-interface-id-option">
+            <properties>
+              <help>Option to set DHCPv6 interface-ID option</help>
+              <valueless/>
+            </properties>
+          </leafNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/dns-forwarding.xml b/interface-definitions/dns-forwarding.xml
index 01e8ad7d3..e3d33e8cc 100644
--- a/interface-definitions/dns-forwarding.xml
+++ b/interface-definitions/dns-forwarding.xml
@@ -35,26 +35,26 @@
               <leafNode name="dnssec">
                 <properties>
                   <help>DNSSEC mode</help>
-                    <valueHelp>
-                      <format>off</format>
-                      <description></description>
-                    </valueHelp>
-                    <valueHelp>
-                      <format>process-no-validate</format>
-                      <description></description>
-                    </valueHelp>
-                    <valueHelp>
-                      <format>process</format>
-                      <description></description>
-                    </valueHelp>
-                    <valueHelp>
-                      <format>log-fail</format>
-                      <description></description>
-                    </valueHelp>
-                    <valueHelp>
-                      <format>validate</format>
-                      <description></description>
-                    </valueHelp>
+                  <valueHelp>
+                    <format>off</format>
+                    <description/>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>process-no-validate</format>
+                    <description/>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>process</format>
+                    <description/>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>log-fail</format>
+                    <description/>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>validate</format>
+                    <description/>
+                  </valueHelp>
                   <constraint>
                     <regex>(off|process-no-validate|process|log-fail|validate)</regex>
                   </constraint>
diff --git a/interface-definitions/ssh.xml b/interface-definitions/ssh.xml
index c5504453e..c0ce976d6 100644
--- a/interface-definitions/ssh.xml
+++ b/interface-definitions/ssh.xml
@@ -161,11 +161,20 @@
                 <format>1-65535</format>
                 <description>Numeric IP port</description>
               </valueHelp>
+              <multi/>
               <constraint>
                 <validator name="numeric" argument="--range 1-65535"/>
               </constraint>
             </properties>
           </leafNode>
+          <leafNode name="client-keepalive-interval">
+            <properties>
+              <help>how often send keep alives in seconds</help>
+              <constraint>
+                <validator name="numeric" argument="--range 1-65535"/> 
+              </constraint>
+            </properties>
+          </leafNode>
         </children>
       </node>
     </children>