Merge branch 'current' into equuleus

11 files changed, 702 insertions, 61 deletions

diff --git a/interface-definitions/dhcp-server.xml b/interface-definitions/dhcp-server.xml
index 87999f496..7d42294e8 100644
--- a/interface-definitions/dhcp-server.xml
+++ b/interface-definitions/dhcp-server.xml
@@ -46,9 +46,9 @@
             <properties>
               <help>DHCP shared network name [REQUIRED]</help>
               <constraint>
-                <regex>^[-_a-zA-Z0-9.]+$</regex>
+                <regex>[-_a-zA-Z0-9.]+</regex>
               </constraint>
-              <constraintErrorMessage>Invalid DHCP pool name</constraintErrorMessage>
+              <constraintErrorMessage>Invalid shared network name. May only contain letters, numbers and .-_</constraintErrorMessage>
             </properties>
             <children>
               <leafNode name="authoritative">
@@ -151,7 +151,7 @@
                   </leafNode>
                   <leafNode name="exclude">
                     <properties>
-                      <help>IP address that needs to be excluded from DHCP lease range</help>
+                      <help>IP address to exclude from DHCP lease range</help>
                       <valueHelp>
                         <format>ipv4</format>
                         <description>IPv4 address to exclude from lease range</description>
@@ -183,9 +183,9 @@
                         <properties>
                           <help>DHCP failover peer name [REQUIRED]</help>
                           <constraint>
-                            <regex>^[-_a-zA-Z0-9.]+$</regex>
+                            <regex>[-_a-zA-Z0-9.]+</regex>
                           </constraint>
-                          <constraintErrorMessage>Invalid failover peer name</constraintErrorMessage>
+                          <constraintErrorMessage>Invalid failover peer name. May only contain letters, numbers and .-_</constraintErrorMessage>
                         </properties>
                       </leafNode>
                       <leafNode name="peer-address">
@@ -193,7 +193,7 @@
                           <help>IP address of failover peer [REQUIRED]</help>
                           <valueHelp>
                             <format>ipv4</format>
-                            <description>IPv4 address to exclude from lease range</description>
+                            <description>IPv4 address of failover peer</description>
                           </valueHelp>
                           <constraint>
                             <validator name="ipv4-address"/>
@@ -225,12 +225,12 @@
                       <help>Lease timeout in seconds (default: 86400)</help>
                       <valueHelp>
                         <format>0-4294967295</format>
-                        <description>DHCP lease time in seconds must be between 0 and 4294967295 (49 days)</description>
+                        <description>DHCP lease time in seconds</description>
                       </valueHelp>
                       <constraint>
                         <validator name="numeric" argument="--range 0-4294967295"/>
                       </constraint>
-                      <constraintErrorMessage>DHCP lease time must be 0 to 4294967295</constraintErrorMessage>
+                      <constraintErrorMessage>DHCP lease time must be between 0 and 4294967295 (49 days)</constraintErrorMessage>
                     </properties>
                   </leafNode>
                   <leafNode name="ntp-server">
@@ -288,9 +288,9 @@
                     <properties>
                       <help>DHCP lease range</help>
                       <constraint>
-                        <regex>^[-_a-zA-Z0-9.]+$</regex>
+                        <regex>[-_a-zA-Z0-9.]+</regex>
                       </constraint>
-                      <constraintErrorMessage>Invalid DHCP lease range name</constraintErrorMessage>
+                      <constraintErrorMessage>Invalid DHCP lease range name. May only contain letters, numbers and .-_</constraintErrorMessage>
                     </properties>
                     <children>
                       <leafNode name="start">
@@ -321,22 +321,22 @@
                   </tagNode>
                   <tagNode name="static-mapping">
                     <properties>
-                      <help>Static mapping for specified address type</help>
+                      <help>Name of static mapping</help>
                       <constraint>
-                        <regex>^[-_a-zA-Z0-9.]+$</regex>
+                        <regex>[-_a-zA-Z0-9.]+</regex>
                       </constraint>
-                      <constraintErrorMessage>Invalid static-mapping name</constraintErrorMessage>
+                      <constraintErrorMessage>Invalid static mapping name. May only contain letters, numbers and .-_</constraintErrorMessage>
                     </properties>
                     <children>
                       <leafNode name="disable">
                         <properties>
-                          <help>Option to disable static-mapping</help>
+                          <help>Option to disable static mapping</help>
                           <valueless/>
                         </properties>
                       </leafNode>
                       <leafNode name="ip-address">
                         <properties>
-                          <help>Static mapping for specified IP address [REQUIRED]</help>
+                          <help>Fixed IP address of static mapping</help>
                           <valueHelp>
                             <format>ipv4</format>
                             <description>IPv4 address used in static mapping</description>
@@ -348,7 +348,7 @@
                       </leafNode>
                       <leafNode name="mac-address">
                         <properties>
-                          <help>Static mapping for specified MAC address [REQUIRED]</help>
+                          <help>MAC address of static mapping [REQUIRED]</help>
                           <valueHelp>
                             <format>h:h:h:h:h:h</format>
                             <description>MAC address used in static mapping [REQUIRED]</description>
@@ -358,6 +358,7 @@
                       <leafNode name="static-mapping-parameters">
                         <properties>
                           <help>Additional static-mapping parameters for DHCP server.
+                Will be placed inside the "host" block of the mapping.
                 You must use the syntax of dhcpd.conf in this text-field.
                 Using this without proper knowledge may result in a crashed
                 DHCP server. Check system log to look for errors.</help>
@@ -414,10 +415,14 @@
                   <leafNode name="time-offset">
                     <properties>
                       <help>Offset of the client's subnet in seconds from Coordinated Universal Time (UTC)</help>
+                      <valueHelp>
+                        <format>[-]N</format>
+                        <description>Time offset (number, may be negative)</description>
+                      </valueHelp>
                       <constraint>
-                        <regex>^-?[0-9]+$</regex>
+                        <regex>-?[0-9]+</regex>
                       </constraint>
-                      <constraintErrorMessage>Invalid time offset valuee</constraintErrorMessage>
+                      <constraintErrorMessage>Invalid time offset value</constraintErrorMessage>
                     </properties>
                   </leafNode>
                   <leafNode name="time-server">
diff --git a/interface-definitions/dhcpv6-server.xml b/interface-definitions/dhcpv6-server.xml
index e63eb2242..28b56a64d 100644
--- a/interface-definitions/dhcpv6-server.xml
+++ b/interface-definitions/dhcpv6-server.xml
@@ -32,9 +32,9 @@
             <properties>
               <help>DHCPv6 shared network name [REQUIRED]</help>
               <constraint>
-                <regex>^[-_a-zA-Z0-9.]+$</regex>
+                <regex>[-_a-zA-Z0-9.]+</regex>
               </constraint>
-              <constraintErrorMessage>Invalid DHCPv6 pool name</constraintErrorMessage>
+              <constraintErrorMessage>Invalid DHCPv6 shared network name. May only contain letters, numbers and .-_</constraintErrorMessage>
             </properties>
             <children>
               <leafNode name="disable">
@@ -112,9 +112,9 @@
                     <properties>
                       <help>Domain name for client to search</help>
                       <constraint>
-                        <regex>^[-_a-zA-Z0-9.]+$</regex>
+                        <regex>[-_a-zA-Z0-9.]+</regex>
                       </constraint>
-                      <constraintErrorMessage>Invalid domain name syntax</constraintErrorMessage>
+                      <constraintErrorMessage>Invalid domain name. May only contain letters, numbers and .-_</constraintErrorMessage>
                       <multi/>
                     </properties>
                   </leafNode>
@@ -157,9 +157,9 @@
                     <properties>
                       <help>NIS domain name for client to use</help>
                       <constraint>
-                        <regex>^[-_a-zA-Z0-9.]+$</regex>
+                        <regex>[-_a-zA-Z0-9.]+</regex>
                       </constraint>
-                      <constraintErrorMessage>Invalid NIS domain name syntax</constraintErrorMessage>
+                      <constraintErrorMessage>Invalid NIS domain name</constraintErrorMessage>
                     </properties>
                   </leafNode>
                   <leafNode name="nis-server">
@@ -179,9 +179,9 @@
                     <properties>
                       <help>NIS+ domain name for client to use</help>
                       <constraint>
-                        <regex>^[-_a-zA-Z0-9.]+$</regex>
+                        <regex>[-_a-zA-Z0-9.]+</regex>
                       </constraint>
-                      <constraintErrorMessage>Invalid NIS+ domain name syntax</constraintErrorMessage>
+                      <constraintErrorMessage>Invalid NIS+ domain name. May only contain letters, numbers and .-_</constraintErrorMessage>
                     </properties>
                   </leafNode>
                   <leafNode name="nisplus-server">
@@ -260,15 +260,15 @@
                     <properties>
                       <help>SIP server name</help>
                       <constraint>
-                        <regex>^[-_a-zA-Z0-9.]+$</regex>
+                        <regex>[-_a-zA-Z0-9.]+</regex>
                       </constraint>
-                      <constraintErrorMessage>Invalid SIP server name syntax</constraintErrorMessage>
+                      <constraintErrorMessage>Invalid SIP server name. May only contain letters, numbers and .-_</constraintErrorMessage>
                       <multi/>
                     </properties>
                   </leafNode>
                   <leafNode name="sntp-server">
                     <properties>
-                      <help>IPv6 address of an SNTP Server for client to use</help>
+                      <help>IPv6 address of an SNTP server for client to use</help>
                       <constraint>
                         <validator name="ipv6-address"/>
                       </constraint>
@@ -278,25 +278,37 @@
                   <tagNode name="static-mapping">
                     <properties>
                       <help>Name of static mapping</help>
+                      <constraint>
+                        <regex>[-_a-zA-Z0-9.]+</regex>
+                      </constraint>
+                      <constraintErrorMessage>Invalid static mapping name. May only contain letters, numbers and .-_</constraintErrorMessage>
                     </properties>
                     <children>
                       <leafNode name="disable">
                         <properties>
-                          <help>Option to disable static-mapping</help>
+                          <help>Option to disable static mapping</help>
                           <valueless/>
                         </properties>
                       </leafNode>
                       <leafNode name="identifier">
                         <properties>
-                          <help>Client identifier for this static mapping</help>
+                          <help>Client identifier (DUID) for this static mapping</help>
+                          <valueHelp>
+                            <format>h[[:h]...]</format>
+                            <description>DUID: colon-separated hex list (as used by isc-dhcp option dhcpv6.client-id)</description>
+                          </valueHelp>
+                          <constraint>
+                            <regex>([0-9A-Fa-f]{1,2}[:])*([0-9A-Fa-f]{1,2})</regex>
+                          </constraint>
+                          <constraintErrorMessage>Invalid DUID. Must be in the format h[[:h]...] where each \"h\" is 1 to 2 hex characters.</constraintErrorMessage>
                         </properties>
                       </leafNode>
                       <leafNode name="ipv6-address">
                         <properties>
-                          <help>Client IPv5 address for this static mapping</help>
+                          <help>Client IPv6 address for this static mapping</help>
                           <valueHelp>
                             <format>ipv6</format>
-                            <description>IPv6 address for this tatic mapping</description>
+                            <description>IPv6 address for this static mapping</description>
                           </valueHelp>
                           <constraint>
                             <validator name="ipv6-address"/>
diff --git a/interface-definitions/dns-domain-name.xml b/interface-definitions/dns-domain-name.xml
index a2c66495f..c16f0b02a 100644
--- a/interface-definitions/dns-domain-name.xml
+++ b/interface-definitions/dns-domain-name.xml
@@ -3,7 +3,7 @@
 <interfaceDefinition>
   <node name="system">
     <children>
-      <leafNode name="name-server">
+      <leafNode name="name-server" owner="${vyos_conf_scripts_dir}/host_name.py">
         <properties>
           <help>Domain Name Server (DNS)</help>
           <priority>400</priority>
diff --git a/interface-definitions/dynamic-dns.xml b/interface-definitions/dns-dynamic.xml
index 974bbcbce..8e7e77475 100644
--- a/interface-definitions/dynamic-dns.xml
+++ b/interface-definitions/dns-dynamic.xml
@@ -4,6 +4,9 @@
   <node name="service">
     <children>
       <node name="dns">
+        <properties>
+          <help>Domain Name System related services</help>
+        </properties>
         <children>
           <node name="dynamic" owner="${vyos_conf_scripts_dir}/dynamic_dns.py">
             <properties>
@@ -75,47 +78,47 @@
                       </valueHelp>
                       <valueHelp>
                         <format>afraid</format>
-                        <description></description>
+                        <description/>
                       </valueHelp>
                       <valueHelp>
                         <format>changeip</format>
-                        <description></description>
+                        <description/>
                       </valueHelp>
                       <valueHelp>
                         <format>cloudflare</format>
-                        <description></description>
+                        <description/>
                       </valueHelp>
                       <valueHelp>
                         <format>dnspark</format>
-                        <description></description>
+                        <description/>
                       </valueHelp>
                       <valueHelp>
                         <format>dslreports</format>
-                        <description></description>
+                        <description/>
                       </valueHelp>
                       <valueHelp>
                         <format>dyndns</format>
-                        <description></description>
+                        <description/>
                       </valueHelp>
                       <valueHelp>
                         <format>easydns</format>
-                        <description></description>
+                        <description/>
                       </valueHelp>
                       <valueHelp>
                         <format>namecheap</format>
-                        <description></description>
+                        <description/>
                       </valueHelp>
                       <valueHelp>
                         <format>noip</format>
-                        <description></description>
+                        <description/>
                       </valueHelp>
                       <valueHelp>
                         <format>sitelutions</format>
-                        <description></description>
+                        <description/>
                       </valueHelp>
                       <valueHelp>
                         <format>zoneedit</format>
-                        <description></description>
+                        <description/>
                       </valueHelp>
                     </properties>
                     <children>
@@ -144,43 +147,43 @@
                           </valueHelp>
                           <valueHelp>
                             <format>changeip</format>
-                            <description></description>
+                            <description/>
                           </valueHelp>
                           <valueHelp>
                             <format>cloudflare</format>
-                            <description></description>
+                            <description/>
                           </valueHelp>
                           <valueHelp>
                             <format>dnspark</format>
-                            <description></description>
+                            <description/>
                           </valueHelp>
                           <valueHelp>
                             <format>dslreports1</format>
-                            <description></description>
+                            <description/>
                           </valueHelp>
                           <valueHelp>
                             <format>dyndns2</format>
-                            <description></description>
+                            <description/>
                           </valueHelp>
                           <valueHelp>
                             <format>easydns</format>
-                            <description></description>
+                            <description/>
                           </valueHelp>
                           <valueHelp>
                             <format>namecheap</format>
-                            <description></description>
+                            <description/>
                           </valueHelp>
                           <valueHelp>
                             <format>noip</format>
-                            <description></description>
+                            <description/>
                           </valueHelp>
                           <valueHelp>
                             <format>sitelutions</format>
-                            <description></description>
+                            <description/>
                           </valueHelp>
                           <valueHelp>
                             <format>zoneedit1</format>
-                            <description></description>
+                            <description/>
                           </valueHelp>
                         </properties>
                       </leafNode>
@@ -207,12 +210,12 @@
                       <leafNode name="skip">
                         <properties>
                           <help>Skip everything before this on the given URL</help>
-                         </properties>
+                        </properties>
                       </leafNode>
                       <leafNode name="url">
                         <properties>
                           <help>URL to obtain the current external IP address</help>
-                         </properties>
+                        </properties>
                       </leafNode>
                     </children>
                   </node>
diff --git a/interface-definitions/dns-forwarding.xml b/interface-definitions/dns-forwarding.xml
index b989434f2..56820608c 100644
--- a/interface-definitions/dns-forwarding.xml
+++ b/interface-definitions/dns-forwarding.xml
@@ -4,6 +4,9 @@
   <node name="service">
     <children>
       <node name="dns">
+        <properties>
+          <help>Domain Name System related services</help>
+        </properties>
         <children>
           <node name="forwarding" owner="${vyos_conf_scripts_dir}/dns_forwarding.py">
             <properties>
diff --git a/interface-definitions/https.xml b/interface-definitions/https.xml
new file mode 100644
index 000000000..828de449c
--- /dev/null
+++ b/interface-definitions/https.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<!-- HTTPS configuration -->
+<interfaceDefinition>
+  <node name="service">
+    <children>
+      <node name="https" owner="${vyos_conf_scripts_dir}/https.py">
+        <properties>
+          <help>HTTPS configuration</help>
+          <priority>1001</priority>
+        </properties>
+        <children>
+          <leafNode name="listen-address">
+            <properties>
+              <help>Addresses to listen for HTTPS requests</help>
+              <valueHelp>
+                <format>ipv4</format>
+                <description>HTTPS IPv4 address</description>
+              </valueHelp>
+              <valueHelp>
+                <format>ipv6</format>
+                <description>HTTPS IPv6 address</description>
+              </valueHelp>
+              <multi/>
+              <constraint>
+                <validator name="ipv4-address"/>
+                <validator name="ipv6-address"/>
+              </constraint>
+            </properties>
+          </leafNode>
+          <node name="api" owner="${vyos_conf_scripts_dir}/http-api.py">
+            <properties>
+              <help>VyOS HTTP API configuration</help>
+              <priority>1002</priority>
+            </properties>
+            <children>
+              <leafNode name="port">
+                <properties>
+                  <help>Port for HTTP API service</help>
+                  <valueHelp>
+                    <format>1-65535</format>
+                    <description>Numeric IP port</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-65535"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <node name="keys">
+                <properties>
+                  <help>HTTP API keys</help>
+                </properties>
+                <children>
+                  <tagNode name="id">
+                    <properties>
+                      <help>HTTP API id</help>
+                    </properties>
+                    <children>
+                      <leafNode name="key">
+                        <properties>
+                          <help>HTTP API plaintext key</help>
+                        </properties>
+                      </leafNode>
+                    </children>
+                  </tagNode>
+                </children>
+              </node>
+              <leafNode name="strict">
+                <properties>
+                  <help>Enforce strict path checking</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+              <leafNode name="debug">
+                <properties>
+                  <help>Debug</help>
+                  <valueless/>
+                  <hidden/>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
+
diff --git a/interface-definitions/ipoe-server.xml b/interface-definitions/ipoe-server.xml
new file mode 100644
index 000000000..6c93d3699
--- /dev/null
+++ b/interface-definitions/ipoe-server.xml
@@ -0,0 +1,369 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="service">
+    <children>
+      <node name="ipoe-server" owner="${vyos_conf_scripts_dir}/ipoe_server.py">
+        <properties>
+          <help>Internet Protocol over Ethernet (IPoE) Server</help>
+          <priority>900</priority>
+        </properties>
+        <children>
+          <tagNode name="interface">
+            <properties>
+              <help>Network interface to server IPoE</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py</script>
+              </completionHelp>
+            </properties>
+            <children>
+              <leafNode name="network-mode">
+                <properties>
+                  <help>Network Layer IPoE serves on</help>
+                  <completionHelp>
+                    <list>L2 L3</list>
+                  </completionHelp>
+                  <constraint>
+                    <regex>^(L2|L3)</regex>
+                  </constraint>
+                  <valueHelp>
+                    <format>L2</format>
+                    <description>client share the same subnet</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>L3</format>
+                    <description>clients are behind this router</description>
+                  </valueHelp>
+                </properties>
+              </leafNode>
+              <leafNode name="network">
+                <properties>
+                  <help>Enables clients to share the same network or each client has its own vlan</help>
+                  <completionHelp>
+                    <list>shared vlan</list>
+                  </completionHelp>
+                  <constraint>
+                    <regex>^(shared|vlan)</regex>
+                  </constraint>
+                  <valueHelp>
+                    <format>shared</format>
+                    <description>Multiple clients share the same network</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>vlan</format>
+                    <description>One VLAN per client</description>    
+                  </valueHelp>
+                </properties>
+              </leafNode>
+              <leafNode name="client-subnet">
+                <properties>
+                  <help>Client address pool</help>
+                  <valueHelp>
+                    <format>ipv4net</format>
+                    <description>IPv4 address and prefix length</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="ipv4-prefix"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <node name="external-dhcp">
+                <properties>
+                  <help>DHCP requests will be forwarded</help>
+                </properties>
+                <children>
+                  <leafNode name="dhcp-relay">
+                    <properties>
+                      <help>DHCP Server the request will be redirected to.</help>
+                      <valueHelp>
+                        <format>ipv4</format>
+                        <description>IPv4 address of the DHCP Server</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="ipv4-address"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="giaddr">
+                    <properties>
+                      <help>address of the relay agent (Relay Agent IP Address)</help>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+              <leafNode name="vlan-id">
+                <properties>
+                  <help>VLAN monitor for the automatic creation of vlans (user per vlan)</help>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-4096"/>
+                  </constraint>
+                  <constraintErrorMessage>VLAN ID needs to be between 1 and 4096</constraintErrorMessage>
+                  <multi />
+                </properties>
+              </leafNode>
+              <leafNode name="vlan-range">
+                <properties>
+                  <help>VLAN monitor for the automatic creation of vlans (user per vlan)</help>
+                  <constraint>
+                    <regex>(409[0-6]|40[0-8][0-9]|[1-3][0-9]{3}|[1-9][0-9]{0,2})-(409[0-6]|40[0-8][0-9]|[1-3][0-9]{3}|[1-9][0-9]{0,2})</regex>
+                  </constraint>
+                  <multi />
+                </properties>
+              </leafNode>
+            </children>
+          </tagNode>
+          <node name="dns-server">
+            <properties>
+              <help>DNS servers offered via internal DHCP</help>
+            </properties>
+            <children>
+              <leafNode name="server-1">
+                <properties>
+                  <help>IP address of the primary DNS server</help>
+                  <constraint>
+                    <validator name="ipv4-address"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="server-2">
+                <properties>
+                  <help>IP address of the secondary DNS server</help>
+                  <constraint>
+                    <validator name="ipv4-address"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+          <node name="dnsv6-server">
+            <properties>
+              <help>DNSv6 servers offered via internal DHCPv6</help>
+            </properties>
+            <children>
+              <leafNode name="server-1">
+                <properties>
+                  <help>IP address of the primary DNS server</help>
+                  <constraint>
+                    <validator name="ipv6-address"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="server-2">
+                <properties>
+                  <help>IP address of the secondary DNS server</help>
+                  <constraint>
+                    <validator name="ipv6-address"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="server-3">
+                <properties>
+                  <help>IP address of the tertiary DNS server</help>
+                  <constraint>
+                    <validator name="ipv6-address"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+          <node name="client-ipv6-pool">
+            <properties>
+              <help>Pool of client IPv6 addresses</help>
+            </properties>
+            <children>
+              <leafNode name="prefix">
+                <properties>
+                  <help>Format: ipv6prefix/mask,prefix_len (e.g.: fc00:0:1::/48,64 - divides prefix into /64 subnets for clients)</help>
+                  <multi />
+                </properties>
+              </leafNode>
+              <leafNode name="delegate-prefix">
+                <properties>
+                  <help>Format: ipv6prefix/mask,prefix_len (delegates prefix  to clients via DHCPv6 prefix delegation</help>
+                  <multi />
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+          <node name="authentication">
+            <properties>
+              <help>Client authentication methods</help>
+            </properties>
+            <children>
+              <leafNode name="mode">
+                <properties>
+                  <help>Authetication mode</help>
+                  <completionHelp>
+                    <list>local radius noauth</list>
+                  </completionHelp>
+                  <constraint>
+                    <regex>^(local|radius|noauth)</regex>
+                  </constraint>
+                  <valueHelp>
+                    <format>local</format>
+                    <description>Authentication based on local definition</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>radius</format>
+                    <description>Authentication based on a RADIUS server</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>noauth</format>
+                    <description>Authentication disabled</description>
+                  </valueHelp>
+                </properties>
+                </leafNode>
+                <tagNode name="interface">
+                  <properties>
+                    <help>Network interface the client mac will appear on</help>
+                    <completionHelp>
+                      <script>${vyos_completion_dir}/list_interfaces.py</script>
+                    </completionHelp>
+                  </properties>
+                  <children>
+                    <tagNode name="mac-address">
+                      <properties>
+                        <help>Client mac address allowed to receive an IP address</help>
+                        <valueHelp>
+                          <format>h:h:h:h:h:h</format>
+                          <description>Hardware (MAC) address</description>
+                        </valueHelp>
+                        <constraint>
+                          <validator name="mac-address"/>
+                        </constraint>
+                      </properties>
+                      <children>
+                        <node name="rate-limit">
+                          <properties>
+                            <help>Upload/Download speed limits</help>
+                          </properties>
+                          <children>
+                            <leafNode name="upload">
+                              <properties>
+                                <help>Upload bandwidth limit in kbits/sec</help>
+                                <constraint>
+                                  <validator name="numeric" argument="--range 1-65535"/>
+                                </constraint>
+                              </properties>
+                            </leafNode>
+                            <leafNode name="download">
+                              <properties>
+                                <help>Download bandwidth limit in kbits/sec</help>
+                                <constraint>
+                                  <validator name="numeric" argument="--range 1-65535"/>
+                                </constraint>
+                              </properties>
+                            </leafNode>
+                          </children>
+                        </node>
+                      </children>
+                    </tagNode>
+                  </children>
+                </tagNode> 
+                <tagNode name="radius-server">
+                  <properties>
+                    <help>IP address of RADIUS server</help>
+                    <valueHelp>
+                      <format>ipv4</format>
+                        <description>IP address of RADIUS server</description>
+                    </valueHelp>
+                  </properties>
+                  <children>
+                    <leafNode name="secret">
+                      <properties>
+                        <help>Key for accessing the specified server</help>
+                      </properties>
+                    </leafNode>
+                   <leafNode name="req-limit">
+                      <properties>
+                        <help>Maximum number of simultaneous requests to server (default: unlimited)</help>
+                      </properties>
+                    </leafNode>
+                    <leafNode name="fail-time">
+                      <properties>
+                        <help>If server doesn't responds mark it as unavailable for this amount of time in seconds</help>
+                      </properties>
+                    </leafNode>
+                  </children>
+                </tagNode>
+                <node name="radius-settings">
+                  <properties>
+                    <help>RADIUS settings</help>
+                  </properties>
+                  <children>
+                    <leafNode name="timeout">
+                      <properties>
+                        <help>Timeout to wait response from server (seconds)</help>
+                      </properties>
+                    </leafNode>
+                    <leafNode name="acct-timeout">
+                      <properties>
+                        <help>Timeout to wait reply for Interim-Update packets. (default 3 seconds)</help>
+                      </properties>
+                    </leafNode>
+                    <leafNode name="max-try">
+                      <properties>
+                        <help>Maximum number of tries to send Access-Request/Accounting-Request queries</help>
+                      </properties>
+                    </leafNode>
+                    <leafNode name="nas-identifier">
+                      <properties>
+                        <help>Value to send to RADIUS server in NAS-Identifier attribute and to be matched in DM/CoA requests.</help>
+                      </properties>
+                    </leafNode>
+                    <leafNode name="nas-ip-address">
+                      <properties>
+                        <help>Value to send to RADIUS server in NAS-IP-Address attribute and to be matched in DM/CoA requests. Also DM/CoA server will bind to that address.</help>
+                        <valueHelp>
+                          <format>ipv4</format>
+                          <description>IPv4 address of the DAE Server</description>
+                        </valueHelp>
+                        <constraint>
+                          <validator name="ipv4-address"/>
+                        </constraint>
+                      </properties>
+                    </leafNode>
+                    <node name="dae-server">
+                      <properties>
+                        <help>IPv4 address and port to bind Dynamic Authorization Extension server (DM/CoA)</help>
+                      </properties>
+                      <children>
+                        <leafNode name="ip-address">
+                          <properties>
+                            <help>IP address for Dynamic Authorization Extension server (DM/CoA)</help>
+                            <valueHelp>
+                              <format>ipv4</format>
+                              <description>IPv4 address of the DAE Server</description>
+                            </valueHelp>
+                            <constraint>
+                              <validator name="ipv4-address"/>
+                            </constraint>
+                          </properties>
+                        </leafNode>
+                        <leafNode name="port">
+                          <properties>
+                            <help>Port for Dynamic Authorization Extension server (DM/CoA)</help>
+                            <valueHelp>
+                              <format>number</format>
+                                <description>port number</description>
+                            </valueHelp>
+                            <constraint>
+                              <validator name="numeric" argument="--range 1-65535"/>
+                            </constraint>
+                          </properties>
+                        </leafNode>
+                        <leafNode name="secret">
+                          <properties>
+                            <help>Secret for Dynamic Authorization Extension server (DM/CoA)</help>
+                          </properties>
+                        </leafNode>
+                      </children>
+                    </node>
+                  </children>
+                </node>
+            </children>
+          </node>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/pppoe-server.xml b/interface-definitions/pppoe-server.xml
index 1190cd9ff..aab830f1e 100644
--- a/interface-definitions/pppoe-server.xml
+++ b/interface-definitions/pppoe-server.xml
@@ -194,6 +194,11 @@
                           <help>Specifies which radius attribute contains rate information. (default is Filter-Id)</help>
                         </properties>
                       </leafNode>
+                      <leafNode name="vendor">
+                        <properties>
+                          <help>Specifies the vendor dictionary. (dictionary needs to be in /usr/share/accel-ppp/radius)</help>
+                        </properties>
+                      </leafNode>
                       <leafNode name="enable">
                         <properties>
                           <help>Enables Bandwidth shaping via RADIUS</help>
@@ -332,15 +337,36 @@
               </leafNode>
             </children>
           </node>
-          <leafNode name="interface">
+
+          <tagNode name="interface">
             <properties>
               <help>interface(s) to listen on</help>
               <completionHelp>
                 <script>${vyos_completion_dir}/list_interfaces.py</script>
               </completionHelp>
-              <multi/>
             </properties>
-          </leafNode>
+            <children>
+              <leafNode name="vlan-id">
+                <properties>
+                  <help>VLAN monitor for the automatic creation of vlans (user per vlan)</help>
+                  <constraint>
+                        <validator name="numeric" argument="--range 1-4096"/>
+                      </constraint>
+                      <constraintErrorMessage>VLAN ID needs to be between 1 and 4096</constraintErrorMessage>
+                      <multi />
+                </properties>
+              </leafNode>
+              <leafNode name="vlan-range">
+                <properties>
+                  <help>VLAN monitor for the automatic creation of vlans (user per vlan)</help>
+                  <constraint>
+                    <regex>(409[0-6]|40[0-8][0-9]|[1-3][0-9]{3}|[1-9][0-9]{0,2})-(409[0-6]|40[0-8][0-9]|[1-3][0-9]{3}|[1-9][0-9]{0,2})</regex>
+                  </constraint>
+                  <multi />
+                </properties>
+              </leafNode>
+            </children>
+          </tagNode>
           <leafNode name="local-ip">
             <properties>
               <help>local gateway address</help>
diff --git a/interface-definitions/protocols-bfd.xml b/interface-definitions/protocols-bfd.xml
new file mode 100644
index 000000000..47d5bf97d
--- /dev/null
+++ b/interface-definitions/protocols-bfd.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0"?>
+<!-- Bidirectional Forwarding Detection (BFD) configuration -->
+<interfaceDefinition>
+  <node name="protocols">
+    <children>
+      <node name="bfd" owner="${vyos_conf_scripts_dir}/protocols_bfd.py">
+        <properties>
+          <help>Bidirectional Forwarding Detection (BFD)</help>
+          <priority>820</priority>
+        </properties>
+        <children>
+          <tagNode name="peer">
+            <properties>
+              <help>Configures a new BFD peer to listen and talk to</help>
+              <valueHelp>
+                <format>ipv4</format>
+                <description>BFD peer IPv4 address</description>
+              </valueHelp>
+              <valueHelp>
+                <format>ipv6</format>
+                <description>BFD peer IPv6 address</description>
+              </valueHelp>
+            </properties>
+            <children>
+              <node name="source">
+                <properties>
+                  <help>Bind listener to specifid interface/address, mandatory for IPv6</help>
+                </properties>
+                <children>
+                  <leafNode name="interface">
+                    <properties>
+                      <help>Local interface to bind our peer listener to</help>
+                      <completionHelp>
+                        <script>${vyos_completion_dir}/list_interfaces.py</script>
+                      </completionHelp>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="address">
+                    <properties>
+                      <help>Local address to bind our peer listener to</help>
+                      <valueHelp>
+                        <format>ipv4</format>
+                        <description>Local IPv4 address used to connect to the peer</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>ipv6</format>
+                        <description>Local IPv6 address used to connect to the peer</description>
+                      </valueHelp>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+              <node name="interval">
+                <properties>
+                  <help>Configure timer intervals</help>
+                </properties>
+                <children>
+                  <leafNode name="receive">
+                    <properties>
+                      <help>Minimum interval of receiving control packets</help>
+                      <valueHelp>
+                        <format>10-60000</format>
+                        <description>Interval in milliseconds</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 10-60000"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="transmit">
+                    <properties>
+                      <help>Minimum interval of transmitting control packets</help>
+                      <valueHelp>
+                        <format>10-60000</format>
+                        <description>Interval in milliseconds</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 10-60000"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="multiplier">
+                    <properties>
+                      <help>Multiplier to determine packet loss</help>
+                      <valueHelp>
+                        <format>2-255</format>
+                        <description>Remote transmission interval will be multiplied by this value</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 2-255"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+              <leafNode name="shutdown">
+                <properties>
+                  <help>Disable this peer</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+              <leafNode name="multihop">
+                <properties>
+                  <help>Allow this BFD peer to not be directly connected</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+            </children>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/snmp.xml b/interface-definitions/snmp.xml
index 103aa39d7..8b2fa8a93 100644
--- a/interface-definitions/snmp.xml
+++ b/interface-definitions/snmp.xml
@@ -599,6 +599,28 @@
               </tagNode>
             </children>
           </node>
+          <node name="script-extensions">
+            <properties>
+              <help>SNMP script extensions</help>
+            </properties>
+            <children>
+              <tagNode name="extension-name">
+                <properties>
+                  <help>Extension name</help>
+                </properties>
+                <children>
+                  <leafNode name="script">
+                  <properties>
+                    <help>Script location and name</help>
+                    <completionHelp>
+                      <script>ls /config/user-data</script>
+                    </completionHelp>
+                  </properties>
+                </leafNode>
+                </children>
+              </tagNode>
+            </children>
+          </node>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/wireguard.xml b/interface-definitions/wireguard.xml
index cc86855a5..e752a2f1d 100644
--- a/interface-definitions/wireguard.xml
+++ b/interface-definitions/wireguard.xml
@@ -20,7 +20,7 @@
             <properties>
               <help>IP address</help> 
               <constraint>
-                <validator name="ip-host"/>
+                <validator name="cidr"/>
               </constraint>
               <valueHelp>
                 <format>ipv4-address</format>