Merge branch 'current' into equuleus

5 files changed, 1275 insertions, 9 deletions

diff --git a/interface-definitions/interfaces-bridge.xml b/interface-definitions/interfaces-bridge.xml
new file mode 100644
index 000000000..d20582849
--- /dev/null
+++ b/interface-definitions/interfaces-bridge.xml
@@ -0,0 +1,269 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="interfaces">
+    <children>
+      <tagNode name="bridge" owner="${vyos_conf_scripts_dir}/interface-bridge.py">
+        <properties>
+          <help>Bridge interface name</help>
+          <priority>310</priority>
+          <constraint>
+            <regex>^br[0-9]+$</regex>
+          </constraint>
+          <constraintErrorMessage>Bridge interface must be named brN</constraintErrorMessage>
+          <valueHelp>
+            <format>brN</format>
+            <description>Bridge interface name</description>
+          </valueHelp>
+        </properties>
+        <children>
+          <leafNode name="address">
+            <properties>
+              <help>IP address</help>
+              <completionHelp>
+                <list>dhcp dhcpv6</list>
+              </completionHelp>
+              <valueHelp>
+                <format>ipv4net</format>
+                <description>IPv4 address and prefix length</description>
+              </valueHelp>
+              <valueHelp>
+                <format>ipv6net</format>
+                <description>IPv6 address and prefix length</description>
+              </valueHelp>
+              <valueHelp>
+                <format>dhcp</format>
+                <description>Dynamic Host Configuration Protocol</description>
+              </valueHelp>
+              <valueHelp>
+                <format>dhcpv6</format>
+                <description>Dynamic Host Configuration Protocol for IPv6</description>
+              </valueHelp>
+              <constraint>
+                <validator name="ip-cidr"/>
+                <regex>(dhcp|dhcpv6)</regex>
+              </constraint>
+              <multi/>
+            </properties>
+          </leafNode>
+          <leafNode name="aging">
+            <properties>
+              <help>Interval addresses are retained</help>
+              <valueHelp>
+                <format>0</format>
+                <description>Disable retaining address in bridge (always flood)</description>
+              </valueHelp>
+              <valueHelp>
+                <format>10-1000000</format>
+                <description>Address aging time for bridge seconds (default 300)</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 0-0"/>
+                <validator name="numeric" argument="--range 10-1000000"/>
+              </constraint>
+            </properties>
+          </leafNode>
+          <leafNode name="description">
+            <properties>
+              <help>Interface description</help>
+              <constraint>
+                <regex>^.{1,256}$</regex>
+              </constraint>
+              <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <node name="dhcp-options">
+            <properties>
+              <help>DHCP options</help>
+            </properties>
+            <children>
+              <leafNode name="client-id">
+                <properties>
+                  <help>DHCP client identifier</help>
+                </properties>
+              </leafNode>
+              <leafNode name="host-name">
+                <properties>
+                  <help>DHCP client host name (overrides the system host name)</help>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+          <node name="dhcpv6-options">
+            <properties>
+              <help>DHCPv6 options</help>
+              <priority>319</priority>
+            </properties>
+            <children>
+              <leafNode name="parameters-only">
+                <properties>
+                  <help>Acquire only config parameters, no address</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+              <leafNode name="temporary">
+                <properties>
+                  <help>IPv6 "temporary" address</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+          <leafNode name="disable-link-detect">
+            <properties>
+              <help>Ignore link state changes</help>
+              <valueless/>
+            </properties>
+          </leafNode>
+          <leafNode name="disable">
+            <properties>
+              <help>Disable this bridge interface</help>
+            </properties>
+          </leafNode>
+          <leafNode name="forwarding-delay">
+            <properties>
+              <help>Forwarding delay</help>
+              <valueHelp>
+                <format>0-200</format>
+                <description>Spanning Tree Protocol forwarding delay in seconds (default 15)</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 0-200"/>
+              </constraint>
+              <constraintErrorMessage>Forwarding delay must be between 0 and 200 seconds</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <leafNode name="hello-time">
+            <properties>
+              <help>Hello packet advertisment interval</help>
+              <valueHelp>
+                <format>1-10</format>
+                <description>Spanning Tree Protocol hello advertisement interval in seconds (default 2)</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 1-10"/>
+              </constraint>
+              <constraintErrorMessage>Bridge Hello interval must be between 1 and 10 seconds</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <node name="igmp">
+            <properties>
+              <help>Internet Group Management Protocol (IGMP) settings</help>
+            </properties>
+            <children>
+              <leafNode name="querier">
+                <properties>
+                  <help>Enable IGMP querier</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+          <node name="ip">
+            <children>
+              <leafNode name="arp-cache-timeout">
+                <properties>
+                  <help>ARP cache entry timeout in seconds</help>
+                  <valueHelp>
+                    <format>1-86400</format>
+                    <description>ARP cache entry timout in seconds (default 30)</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-86400"/>
+                  </constraint>
+                  <constraintErrorMessage>Bridge max aging value must be between 6 and 86400 seconds</constraintErrorMessage>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+          <leafNode name="mac">
+            <properties>
+              <help>Media Access Control (MAC) address</help>
+              <valueHelp>
+                <format>h:h:h:h:h:h</format>
+                <description>Hardware (MAC) address</description>
+              </valueHelp>
+              <constraint>
+                <validator name="mac-address"/>
+              </constraint>
+            </properties>
+          </leafNode>
+          <leafNode name="max-age">
+            <properties>
+              <help>Interval at which neighbor bridges are removed</help>
+              <valueHelp>
+                <format>1-40</format>
+                <description>Bridge maximum aging time in seconds (default 20)</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 1-40"/>
+              </constraint>
+              <constraintErrorMessage>Bridge max aging value must be between 1 and 40 seconds</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <node name="member">
+            <properties>
+              <help>Bridge member interfaces</help>
+            </properties>
+            <children>
+              <tagNode name="interface">
+                <properties>
+                  <help>Member interface name</help>
+                  <completionHelp>
+                    <script>${vyos_completion_dir}/list_interfaces.py --bridgeable</script>
+                  </completionHelp>
+                </properties>
+                <children>
+                  <leafNode name="cost">
+                    <properties>
+                      <help>Bridge port cost</help>
+                      <valueHelp>
+                        <format>1-65535</format>
+                        <description>Path cost value for Spanning Tree Protocol</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 1-65535"/>
+                      </constraint>
+                      <constraintErrorMessage>Path cost value must be between 1 and 65535</constraintErrorMessage>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="priority">
+                    <properties>
+                      <help>Bridge port priority</help>
+                      <valueHelp>
+                        <format>0-63</format>
+                        <description>Bridge port priority</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 1-63"/>
+                      </constraint>
+                      <constraintErrorMessage>Port priority value must be between 0 and 63</constraintErrorMessage>
+                    </properties>
+                  </leafNode>
+                </children>
+              </tagNode>
+            </children>
+          </node>
+          <leafNode name="priority">
+            <properties>
+              <help>Priority for this bridge</help>
+              <valueHelp>
+                <format>0-65535</format>
+                <description>Bridge priority (default 32768)</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 0-65535"/>
+              </constraint>
+              <constraintErrorMessage>Bridge priority must be between 0 and 65535 (multiples of 4096)</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <leafNode name="stp">
+            <properties>
+              <help>Enable spanning tree protocol</help>
+              <valueless/>
+            </properties>
+          </leafNode>
+        </children>
+      </tagNode>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/wireguard.xml b/interface-definitions/interfaces-wireguard.xml
index 9cfcd32ee..6e2622018 100644
--- a/interface-definitions/wireguard.xml
+++ b/interface-definitions/interfaces-wireguard.xml
@@ -2,10 +2,11 @@
 <interfaceDefinition>
   <node name="interfaces">
     <children>
-      <tagNode name="wireguard" owner="${vyos_conf_scripts_dir}/wireguard.py">
+      <tagNode name="wireguard" owner="${vyos_conf_scripts_dir}/interface-wireguard.py">
         <properties>
           <help>WireGuard interface name</help>
-          <priority>459</priority> <!-- subsequent ones may be removed, just make sure ethernet ifs are present -->
+          <priority>459</priority>
+          <!-- subsequent ones may be removed, just make sure ethernet ifs are present -->
           <constraint>
             <regex>^wg[0-9]{1,4}</regex>
           </constraint>
@@ -18,9 +19,9 @@
         <children>
           <leafNode name="address">
             <properties>
-              <help>IP address</help> 
+              <help>IP address</help>
               <constraint>
-                <validator name="cidr"/>
+                <validator name="ip-cidr"/>
               </constraint>
               <valueHelp>
                 <format>ipv4net</format>
@@ -45,7 +46,7 @@
           <leafNode name="disable">
             <properties>
               <help>disables interface</help>
-              <valueless />
+              <valueless/>
             </properties>
           </leafNode>
           <leafNode name="port">
@@ -88,7 +89,7 @@
               <leafNode name="disable">
                 <properties>
                   <help>disables peer</help>
-                  <valueless />
+                  <valueless/>
                 </properties>
               </leafNode>
               <leafNode name="pubkey">
@@ -100,7 +101,7 @@
                   <constraintErrorMessage>Key is not valid 44-character (32-bytes) base64</constraintErrorMessage>
                 </properties>
               </leafNode>
-                <leafNode name="preshared-key">
+              <leafNode name="preshared-key">
                 <properties>
                   <help>base64 encoded preshared key</help>
                   <constraint>
@@ -115,7 +116,7 @@
                   <constraint>
                     <validator name="ip-prefix"/>
                   </constraint>
-                <multi/>
+                  <multi/>
                 </properties>
               </leafNode>
               <!--  eventually check format IP:port -->
@@ -128,7 +129,7 @@
                 <properties>
                   <help>how often send keep alives in seconds</help>
                   <constraint>
-                    <validator name="numeric" argument="--range 1-65535"/> 
+                    <validator name="numeric" argument="--range 1-65535"/>
                   </constraint>
                 </properties>
               </leafNode>
diff --git a/interface-definitions/l2tp-server.xml b/interface-definitions/l2tp-server.xml
new file mode 100644
index 000000000..721913dfe
--- /dev/null
+++ b/interface-definitions/l2tp-server.xml
@@ -0,0 +1,562 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="vpn">
+    <children>
+      <node name="l2tp" owner="${vyos_conf_scripts_dir}/accel_l2tp.py">
+        <properties>
+          <help>L2TP Virtual Private Network (VPN)</help>
+        </properties>
+        <children>
+          <node name="remote-access">
+            <properties>
+              <help>Remote access L2TP VPN</help>
+            </properties>
+            <children>
+              <leafNode name="mtu">
+                <properties>
+                  <help>Maximum Transmission Unit (MTU)</help>
+                  <constraint>
+                    <validator name="numeric" argument="--range 128-16384"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="outside-address">
+                <properties>
+                  <help>External IP address to which VPN clients will connect</help>
+                  <constraint>
+                    <validator name="ipv4-address"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="outside-nexthop">
+                <properties>
+                  <help>Nexthop IP address for reaching the VPN clients</help>
+                  <constraint>
+                    <validator name="ipv4-address"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <node name="dns-servers">
+                <properties>
+                  <help>IPv4 Domain Name Service (DNS) server</help>
+                </properties>
+                <children>
+                  <leafNode name="server-1">
+                    <properties>
+                      <help>Primary DNS server</help>
+                      <valueHelp>
+                        <format>ipv4</format>
+                        <description>IPv4 address</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="ipv4-address"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="server-2">
+                    <properties>
+                      <help>Secondary DNS server</help>
+                      <valueHelp>
+                        <format>ipv4</format>
+                        <description>IPv4 address</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="ipv4-address"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+              <leafNode name="dnsv6-servers">
+                <properties>
+                  <help>IPv6 Domain Name Service (DNS) server</help>
+                  <valueHelp>
+                  <format>ipv6</format>
+                    <description>IPv6 DNS address</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="ipv6-address"/>
+                  </constraint>
+                  <multi />
+                </properties>
+              </leafNode>
+              <node name="lns">
+                <properties>
+                  <help>L2TP Network Server (LNS)</help>
+                </properties>
+                <children>
+                  <leafNode name="shared-secret">
+                    <properties>
+                      <help>Tunnel password used to authenticate the client (LAC)</help>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+              <leafNode name="ccp-disable">
+                <properties>
+                  <help>Disable Compression Control Protocol (CCP)</help>
+                  <valueless />
+                </properties>
+              </leafNode>
+              <node name="ipsec-settings">
+                <properties>
+                  <help>Internet Protocol Security (IPsec) for remote access L2TP VPN</help>
+                </properties>
+                <children>
+                  <node name="authentication">
+                    <properties>
+                      <help>IPsec authentication settings</help>
+                    </properties>
+                    <children>
+                      <leafNode name="mode">
+                        <properties>
+                          <help>Authentication mode for IPsec</help>
+                          <valueHelp>
+                            <format>pre-shared-secret</format>
+                            <description>Use pre-shared secret for IPsec authentication</description>
+                          </valueHelp>
+                          <valueHelp>
+                            <format>x509</format>
+                            <description>Use X.509 certificate for IPsec authentication</description>
+                          </valueHelp>
+                          <constraint>
+                            <regex>^(pre-shared-secret|x509)</regex>
+                          </constraint>
+                          <completionHelp>
+                            <list>pre-shared-secret x509</list>
+                          </completionHelp>
+                        </properties>
+                      </leafNode>
+                      <leafNode name="pre-shared-secret">
+                        <properties>
+                          <help>Pre-shared secret for IPsec</help>
+                        </properties>
+                      </leafNode>
+                      <node name="x509">
+                        <properties>
+                          <help>X.509 certificate</help>
+                        </properties>
+                        <children>
+                          <leafNode name="ca-cert-file">
+                            <properties>
+                              <help>File containing the X.509 certificate for the Certificate Authority (CA)</help>
+                              <valueHelp>
+                                <format>&lt;text&gt;</format>
+                                <description>File in /config/auth</description>
+                              </valueHelp>
+                            </properties>
+                          </leafNode>
+                          <leafNode name="crl-file">
+                            <properties>
+                              <help>File containing the X.509 Certificate Revocation List (CRL)</help>
+                              <valueHelp>
+                                <format>&lt;text&gt;</format>
+                                <description>File in /config/auth</description>
+                              </valueHelp>
+                            </properties>
+                          </leafNode>
+                          <leafNode name="server-cert-file">
+                            <properties>
+                              <help>File containing the X.509 certificate for the remote access VPN server (this host)</help>
+                              <valueHelp>
+                                <format>&lt;text&gt;</format>
+                                <description>File in /config/auth</description>
+                              </valueHelp>
+                            </properties>
+                          </leafNode>
+                          <leafNode name="server-key-file">
+                            <properties>
+                              <help>File containing the private key for the X.509 certificate for the remote access VPN server (this host)</help>
+                              <valueHelp>
+                                <format>&lt;text&gt;</format>
+                                <description>File in /config/auth</description>
+                              </valueHelp>
+                            </properties>
+                          </leafNode>
+                          <leafNode name="server-key-password">
+                            <properties>
+                              <help>Password that protects the private key</help>
+                            </properties>
+                          </leafNode>
+                        </children>
+                      </node>
+                    </children>
+                  </node>
+                  <leafNode name="ike-lifetime">
+                    <properties>
+                      <help>IKE lifetime</help>
+                      <valueHelp>
+                        <format>&lt;30-86400&gt;</format>
+                        <description>IKE lifetime in seconds (default 3600)</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 30-86400"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                   <leafNode name="lifetime">
+                    <properties>
+                      <help>ESP lifetime</help>
+                      <valueHelp>
+                        <format>&lt;30-86400&gt;</format>
+                        <description>IKE lifetime in seconds (default 3600)</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 30-86400"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+              <node name="wins-servers">
+                <properties>
+                  <help>Windows Internet Name Service (WINS) server settings</help>
+                </properties>
+                <children>
+                  <leafNode name="server-1">
+                    <properties>
+                      <help>Primary WINS server</help>
+                      <constraint>
+                        <validator name="ipv4-address"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="server-2">
+                    <properties>
+                      <help>Secondary WINS server</help>
+                    <constraint>
+                      <validator name="ipv4-address"/>
+                    </constraint>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+              <node name="client-ip-pool">
+                <properties>
+                  <help>Pool of client IP addresses (must be within a /24)</help>
+                </properties>
+                <children>
+                  <leafNode name="start">
+                    <properties>
+                      <help>First IP address in the pool (will be used as gateway address)</help>
+                      <constraint>
+                        <validator name="ipv4-address"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="stop">
+                    <properties>
+                      <help>Last IP address in the pool</help>
+                      <constraint>
+                        <validator name="ipv4-address"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="subnet">
+                    <properties>
+                      <help>Client IP subnet (CIDR notation)</help>
+                      <constraint>
+                        <validator name="ipv4-prefix"/>
+                      </constraint>
+                      <constraintErrorMessage>Not a valid CIDR formatted prefix</constraintErrorMessage>
+                      <valueHelp>
+                        <format>ipv4net</format>
+                        <description>IPv4 subnet address</description>
+                      </valueHelp>
+                      <multi />
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+              <node name="client-ipv6-pool">
+                <properties>
+                  <help>Pool of client IPv6 addresses</help>
+                </properties>
+                <children>
+                  <leafNode name="prefix">
+                    <properties>
+                      <help>IPV6 prefix delegation</help>
+                      <valueHelp>
+                        <format>ipv6prefix/mask,prefix_len</format>
+                        <description>e.g.: fc00:0:1::/48,64 - divides prefix into /64 subnets for clients</description>
+                      </valueHelp>
+                      <multi />
+                    </properties>
+                  </leafNode>
+                  <leafNode name="delegate-prefix">
+                    <properties>
+                      <help>DHCPv6 prefix delegation - rfc3633</help>
+                      <valueHelp>
+                        <format>ipv6prefix/mask,prefix_len</format>
+                        <description>Delegate to clients through DHCPv6 prefix delegation - rfc3633</description>
+                      </valueHelp>
+                      <multi />
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+              <leafNode name="description">
+                <properties>
+                  <help>Description for L2TP remote-access settings</help>
+                </properties>
+              </leafNode>
+              <leafNode name="dhcp-interface">
+                <properties>
+                  <help>DHCP interface to listen on</help>
+                </properties>
+              </leafNode>
+              <leafNode name="idle">
+                <properties>
+                  <help>PPP idle timeout</help>
+                  <valueHelp>
+                    <format>&lt;30-86400&gt;</format>
+                    <description>PPP idle timeout in seconds (default 1800)</description>
+                  </valueHelp>
+                    <constraint>
+                      <validator name="numeric" argument="--range 30-86400"/>
+                    </constraint>
+                </properties>
+              </leafNode>
+              <node name="authentication">
+                <properties>
+                  <help>Authentication for remote access L2TP VPN</help>
+                </properties>
+                <children>
+                  <leafNode name="require">
+                    <properties>
+                      <help>Authentication protocol for remote access peer L2TP VPN</help>
+                      <valueHelp>
+                        <format>pap</format>
+                        <description>Require the peer to authenticate itself using PAP [Password Authentication Protocol].</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>chap</format>
+                        <description>Require the peer to authenticate itself using CHAP [Challenge Handshake Authentication Protocol].</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>mschap</format>
+                        <description>Require the peer to authenticate itself using CHAP [Challenge Handshake Authentication Protocol].</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>mschap-v2</format>
+                        <description>Require the peer to authenticate itself using MS-CHAPv2 [Microsoft Challenge Handshake Authentication Protocol, Version 2].</description>
+                      </valueHelp>
+                      <constraint>
+                        <regex>^(pap|chap|mschap|mschap-v2)</regex>
+                      </constraint>
+                      <completionHelp>
+                        <list>pap chap mschap mschap-v2</list>
+                      </completionHelp>
+                      <multi />
+                    </properties>
+                  </leafNode>
+                  <leafNode name="mppe">
+                    <properties>
+                      <help>Specifies mppe negotioation preference. (default require mppe 128-bit stateless</help>
+                      <valueHelp>
+                        <format>deny</format>
+                        <description>deny mppe</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>prefer</format>
+                        <description>ask client for mppe, if it rejects don't fail</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>require</format>
+                        <description>ask client for mppe, if it rejects drop connection</description>
+                      </valueHelp>
+                      <constraint>
+                        <regex>^(deny|prefer|require)</regex>
+                      </constraint>
+                      <completionHelp>
+                        <list>deny prefer require</list>
+                      </completionHelp>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="mode">
+                    <properties>
+                      <help>Authentication mode for remote access L2TP VPN</help>
+                      <valueHelp>
+                        <format>local</format>
+                        <description>Use local username/password configuration</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>radius</format>
+                        <description>Use a RADIUS server to autenticate users</description>
+                      </valueHelp>
+                      <constraint>
+                        <regex>^(local|radius)</regex>
+                      </constraint>
+                      <completionHelp>
+                        <list>local radius</list>
+                      </completionHelp>
+                    </properties>
+                  </leafNode>
+                  <node name="local-users">
+                    <properties>
+                      <help>Local user authentication for remote access L2TP VPN</help>
+                    </properties>
+                    <children>
+                      <tagNode name="username">
+                        <properties>
+                          <help>User name for authentication</help>
+                        </properties>
+                        <children>
+                          <leafNode name="disable">
+                            <properties>
+                              <help>Option to disable a L2TP Server user</help>
+                            </properties>
+                          </leafNode>
+                          <leafNode name="password">
+                            <properties>
+                              <help>Password for authentication</help>
+                            </properties>
+                          </leafNode>
+                          <leafNode name="static-ip">
+                            <properties>
+                              <help>Static client IP address</help>
+                            </properties>
+                          </leafNode>
+                          <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>
+                  </node>
+                  <node name="radius">
+                    <properties>
+                      <help>RADIUS specific configuration</help>
+                    </properties>
+                    <children>
+                      <tagNode name="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="key">
+                            <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>
+                      <leafNode name="source-address">
+                        <properties>
+                          <help>Local RADIUS client address from which packets are sent.</help>
+                          <valueHelp>
+                            <format>&lt;x.x.x.x&gt;</format>
+                            <description>Local RADIUS client address from which packets are sent</description>
+                          </valueHelp>
+                        </properties>
+                      </leafNode>
+                      <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>
+                      <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>
+                            </properties>
+                          </leafNode>
+                          <leafNode name="port">
+                            <properties>
+                              <help>Port for Dynamic Authorization Extension server (DM/CoA)</help>
+                            </properties>
+                          </leafNode>
+                          <leafNode name="secret">
+                            <properties>
+                              <help>Secret for Dynamic Authorization Extension server (DM/CoA)</help>
+                            </properties>
+                          </leafNode>
+                        </children>
+                      </node>
+                      <node name="rate-limit">
+                        <properties>
+                          <help>Upload/Download speed limits</help>
+                        </properties>
+                        <children>
+                          <leafNode name="attribute">
+                            <properties>
+                              <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>
+                              <valueless />
+                            </properties>
+                          </leafNode>
+                        </children>
+                      </node>
+                    </children>
+                  </node>
+                </children>
+              </node>
+            </children>
+          </node>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/protocols-bfd.xml b/interface-definitions/protocols-bfd.xml
index 47d5bf97d..f2d7d7d2f 100644
--- a/interface-definitions/protocols-bfd.xml
+++ b/interface-definitions/protocols-bfd.xml
@@ -91,6 +91,18 @@
                       </constraint>
                     </properties>
                   </leafNode>
+                  <leafNode name="echo-interval">
+                    <properties>
+                      <help>Echo receive transmission interval</help>
+                      <valueHelp>
+                        <format>10-60000</format>
+                        <description>The minimal echo receive transmission interval that this system is capable of handling</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 10-60000"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
                 </children>
               </node>
               <leafNode name="shutdown">
@@ -105,6 +117,12 @@
                   <valueless/>
                 </properties>
               </leafNode>
+              <leafNode name="echo-mode">
+                <properties>
+                  <help>Enables the echo transmission mode</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
             </children>
           </tagNode>
         </children>
diff --git a/interface-definitions/sstp.xml b/interface-definitions/sstp.xml
new file mode 100644
index 000000000..d944baaad
--- /dev/null
+++ b/interface-definitions/sstp.xml
@@ -0,0 +1,416 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="service">
+    <children>
+      <node name="sstp-server" owner="${vyos_conf_scripts_dir}/accel_sstp.py">
+        <properties>
+          <help>Secure Socket Tunneling Protocol (SSTP) Server</help>
+          <priority>900</priority>
+        </properties>
+        <children>
+          <node name="authentication">
+            <properties>
+              <help>Authentication for remote access SSTP Server</help>
+            </properties>
+            <children>
+              <node name="local-users">
+                <properties>
+                  <help>Local user authentication for SSTP server</help>
+                </properties>
+                <children>
+                  <tagNode name="username">
+                    <properties>
+                      <help>User name for authentication</help>
+                    </properties>
+                    <children>
+                      <leafNode name="disable">
+                        <properties>
+                          <help>Option to disable a SSTP Server user</help>
+                          <valueless />
+                        </properties>
+                      </leafNode>
+                      <leafNode name="password">
+                        <properties>
+                          <help>Password for authentication</help>
+                        </properties>
+                      </leafNode>
+                      <leafNode name="static-ip">
+                        <properties>
+                          <help>Static client IP address</help>
+                        </properties>
+                      </leafNode>
+                      <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>
+              </node>
+              <leafNode name="mode">
+                <properties>
+                  <help>Authentication mode for SSTP Server</help>
+                  <valueHelp>
+                    <format>local</format>
+                    <description>Use local username/password configuration</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>radius</format>
+                    <description>Use a RADIUS server to autenticate users</description>
+                  </valueHelp>
+                  <constraint>
+                    <regex>^(local|radius)</regex>
+                  </constraint>
+                  <completionHelp>
+                    <list>local radius</list>
+                  </completionHelp>
+                </properties>
+              </leafNode>
+              <leafNode name="protocols">
+                <properties>
+                  <help>Authentication protocol for remote access peer SSTP VPN</help>
+                  <valueHelp>
+                    <format>pap</format>
+                    <description>Require the peer to authenticate itself using PAP [Password Authentication Protocol].</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>chap</format>
+                    <description>Require the peer to authenticate itself using CHAP [Challenge Handshake Authentication Protocol].</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>mschap</format>
+                    <description>Require the peer to authenticate itself using CHAP [Challenge Handshake Authentication Protocol].</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>mschap-v2</format>
+                    <description>Require the peer to authenticate itself using MS-CHAPv2 [Microsoft Challenge Handshake Authentication Protocol, Version 2].</description>
+                  </valueHelp>
+                  <constraint>
+                    <regex>^(pap|chap|mschap|mschap-v2)</regex>
+                  </constraint>
+                  <completionHelp>
+                    <list>pap chap mschap mschap-v2</list>
+                  </completionHelp>
+                    <multi />
+                </properties>
+              </leafNode>
+              <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>
+                       <constraint>
+                        <validator name="ipv4-address"/>
+                      </constraint>
+                      <constraintErrorMessage>invalid IPv4 address</constraintErrorMessage>
+                      <valueHelp>
+                        <format>ipv4</format>
+                        <description>NAS-IP-Address Attribute Value</description>
+                      </valueHelp>
+                    </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>
+                          <constraint>
+                            <validator name="ipv4-address"/>
+                          </constraint>
+                          <constraintErrorMessage>invalid IPv4 address</constraintErrorMessage>
+                          <valueHelp>
+                            <format>ipv4</format>
+                            <description>Specifies IP address for Dynamic Authorization Extension server (DM/CoA)</description>
+                          </valueHelp>
+                        </properties>
+                      </leafNode>
+                      <leafNode name="port">
+                        <properties>
+                          <help>Port for Dynamic Authorization Extension server (DM/CoA)</help>
+                          <valueHelp>
+                            <format>number</format>
+                            <description>TCP port</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>
+                  <node name="rate-limit">
+                    <properties>
+                      <help>Upload/Download speed limits</help>
+                    </properties>
+                    <children>
+                      <leafNode name="attribute">
+                        <properties>
+                          <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>
+                          <valueless />
+                        </properties>
+                      </leafNode>
+                    </children>
+                  </node>
+                </children>
+              </node>
+            </children>
+          </node>
+          <node name="sstp-settings">
+            <properties>
+              <help>SSTP settings</help>
+            </properties>
+            <children>
+              <node name="ssl-certs">
+                <properties>
+                  <help>SSL Certificate, SSL Key and CA (/config/user-data/sstp)</help>
+                </properties>
+                <children>
+                  <leafNode name="ca">
+                    <properties>
+                      <help>Certificate Authority certificate</help>
+                      <completionHelp>
+                        <script>if [ -e /config/user-data/sstp ]; then ls /config/user-data/sstp; fi</script>
+                      </completionHelp>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="server-cert">
+                    <properties>
+                      <help>Server Certificate</help>
+                      <completionHelp>
+                        <script>if [ -e /config/user-data/sstp ]; then ls /config/user-data/sstp; fi</script>
+                      </completionHelp>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="server-key">
+                    <properties>
+                      <help>Privat Key of the Server Certificate</help>
+                      <completionHelp>
+                        <script>if [ -e /config/user-data/sstp ]; then ls /config/user-data/sstp; fi</script>
+                      </completionHelp>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+            </children>
+          </node>
+          <node name="network-settings">
+            <properties>
+              <help>Network settings</help>
+            </properties>
+            <children>
+              <node name="client-ip-settings">
+                <properties>
+                  <help>Client IP pools and gateway setting</help>
+                </properties>
+                <children>
+                  <leafNode name="subnet">
+                    <properties>
+                      <help>Client IP subnet (CIDR notation)</help>
+                      <constraint>
+                        <validator name="ipv4-prefix"/>
+                      </constraint>
+                      <constraintErrorMessage>Not a valid CIDR formatted prefix</constraintErrorMessage>
+                      <multi />
+                    </properties>
+                  </leafNode>
+                  <leafNode name="gateway-address">
+                    <properties>
+                      <help>Gateway IP address</help>
+                      <constraint>
+                        <validator name="ipv4-address"/>
+                      </constraint>
+                      <constraintErrorMessage>invalid IPv4 address</constraintErrorMessage>
+                      <valueHelp>
+                        <format>ipv4</format>
+                        <description>Default Gateway send to the client</description>
+                      </valueHelp>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+              <node name="dns-server">
+                <properties>
+                  <help>DNS servers propagated to clients</help>
+                </properties>
+                <children>
+                  <leafNode name="primary-dns">
+                    <properties>
+                      <help>Primary DNS Server</help>
+                      <valueHelp>
+                        <format>ipv4</format>
+                        <description>IPv4 address</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="ipv4-address"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="secondary-dns">
+                    <properties>
+                      <help>Secondary DNS Server</help>
+                      <valueHelp>
+                        <format>ipv4</format>
+                        <description>IPv4 address</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="ipv4-address"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+              <leafNode name="mtu">
+                <properties>
+                  <help>Maximum Transmission Unit (MTU)</help>
+                  <constraint>
+                    <validator name="numeric" argument="--range 128-16384"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+          <node name="ppp-settings">
+            <properties>
+              <help>PPP (Point-to-Point Protocol) settings</help>
+            </properties>
+            <children>
+              <leafNode name="mppe">
+                <properties>
+                  <help>Specifies mppe negotiation preferences</help>
+                  <completionHelp>
+                    <list>require prefer deny</list>
+                  </completionHelp>
+                  <constraint>
+                    <regex>(^require|prefer|deny)</regex>
+                  </constraint>
+                  <valueHelp>
+                    <format>require</format>
+                    <description>send mppe request, if client rejects, drop the connection</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>prefer</format>
+                    <description>send mppe request, if client rejects continue</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>deny</format>
+                    <description>drop all mppe</description>
+                  </valueHelp>
+                </properties>
+              </leafNode>
+              <leafNode name="lcp-echo-interval">
+                <properties>
+                  <help>LCP echo-requests/sec</help>
+                  <constraint>
+                    <validator name="numeric" argument="--positive"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="lcp-echo-failure">
+                <properties>
+                  <help>Maximum number of Echo-Requests may be sent without valid reply</help>
+                  <constraint>
+                    <validator name="numeric" argument="--positive"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+              <leafNode name="lcp-echo-timeout">
+                <properties>
+                  <help>Timeout in seconds to wait for any peer activity. If this option specified it turns on adaptive lcp echo functionality and "lcp-echo-failure" is not used.</help>
+                  <constraint>
+                    <validator name="numeric" argument="--positive"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+      </children>
+    </node>
+  </children>
+</node>
+</interfaceDefinition>