Merge branch 'pppoe-rewrite' of https://github.com/c-po/vyos-1x into current

* 'pppoe-rewrite' of https://github.com/c-po/vyos-1x: (23 commits)
  pppoe: T2055: do not try to start a deleted dialer interface
  pppoe: T1318: declutter name-server CLI nodes
  pppoe: T2055: remove router-advert node in client interface
  pppoe: T1318: migrate user-id and password nodes under an authentication node
  pppoe: T1318: rename link to source-interface
  pppoe: T1318: use include files for disable and descriptionx
  pppoe: T1318: rephrase help text on default-route
  interface-definitions: include: disable: rephrase help text
  pppoe: T1318: extend migrator for firewall, qos and ip routing nodes
  pppoe: T1318: proper delete old interfaces in migrator
  pppoe: T1318: increase priority so PPPoE is run after bond interfaces
  pppoe: T1318: fix migrator and add missing link statement
  pppoe: T1318: use lists rather then strings on Config()
  pppoe: T1318: support interface description
  pppoe: T1318: remove obsolete ipv6-up.d script
  pppoe: T1318: add op-mode commands for link information
  pppoe: T1318: use systemd to manage connection
  pppoe: T1318: remove process startup debug output
  pppoe: T1318: move process startup to apply()
  pppoe: T1318: "link" option is mandatory
  ...

2 files changed, 175 insertions, 1 deletions

diff --git a/interface-definitions/include/interface-disable.xml.i b/interface-definitions/include/interface-disable.xml.i
index c6c24f867..a4778859c 100644
--- a/interface-definitions/include/interface-disable.xml.i
+++ b/interface-definitions/include/interface-disable.xml.i
@@ -1,6 +1,6 @@
 <leafNode name="disable">

   <properties>

-    <help>Set interface to Administratively down</help>

+    <help>Administratively disable interface</help>

     <valueless/>

   </properties>

 </leafNode>

diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in
new file mode 100644
index 000000000..b6b54c915
--- /dev/null
+++ b/interface-definitions/interfaces-pppoe.xml.in
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="interfaces">
+    <children>
+      <tagNode name="pppoe" owner="${vyos_conf_scripts_dir}/interfaces-pppoe.py">
+        <properties>
+          <help>Point-to-Point Protocol over Ethernet (PPPoE)</help>
+          <priority>321</priority>
+          <constraint>
+            <regex>pppoe[0-9]+$</regex>
+            <validator name="numeric" argument="--range 1-99"/>
+          </constraint>
+          <constraintErrorMessage>PPPoE interface must be named pppoeN</constraintErrorMessage>
+          <valueHelp>
+            <format>pppoeN</format>
+            <description>PPPoE interface name (1-15)</description>
+          </valueHelp>
+        </properties>
+        <children>
+          <leafNode name="access-concentrator">
+            <properties>
+              <help>Access concentrator name (only connect to this concentrator)</help>
+              <constraint>
+                <regex>[a-zA-Z0-9]+$</regex>
+              </constraint>
+              <constraintErrorMessage>Access concentrator name must be composed of uppper and lower case letters or numbers only</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <node name="authentication">
+            <properties>
+              <help>Authentication settings</help>
+            </properties>
+            <children>
+              <leafNode name="user">
+                <properties>
+                  <help>User name</help>
+                </properties>
+              </leafNode>
+              <leafNode name="password">
+                <properties>
+                  <help>Password</help>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+          <leafNode name="connect-on-demand">
+            <properties>
+              <help>Automatic establishment of PPPOE connection when traffic is sent</help>
+              <valueless/>
+            </properties>
+          </leafNode>
+          <leafNode name="default-route">
+            <properties>
+              <help>Default route insertion behaviour (default: auto)</help>
+              <completionHelp>
+                <list>auto none force</list>
+              </completionHelp>
+              <constraint>
+                <regex>(auto|none|force)</regex>
+              </constraint>
+              <constraintErrorMessage>PPPoE default-route option must be 'auto', 'none', or 'force'</constraintErrorMessage>
+              <valueHelp>
+                <format>auto</format>
+                <description>Automatically install a default route</description>
+              </valueHelp>
+              <valueHelp>
+                <format>none</format>
+                <description>Do not install a default route</description>
+              </valueHelp>
+              <valueHelp>
+                <format>force</format>
+                <description>Replace existing default route</description>
+              </valueHelp>
+            </properties>
+          </leafNode>
+          #include <include/interface-description.xml.i>
+          #include <include/interface-disable.xml.i>
+          <leafNode name="idle-timeout">
+            <properties>
+              <help>Delay before disconnecting idle session (in seconds)</help>
+              <valueHelp>
+                <format>n</format>
+                <description>Idle timeout in seconds</description>
+              </valueHelp>
+            </properties>
+          </leafNode>
+          <node name="ipv6">
+            <children>
+              <node name="address">
+                <properties>
+                  <help>IPv6 address configuration modes</help>
+                </properties>
+                <children>
+                  <leafNode name="autoconf">
+                    <properties>
+                      <help>Enable Stateless Address Autoconfiguration (SLAAC)</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+              <leafNode name="enable">
+                <properties>
+                  <help>Activate IPv6 support on this connection</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+          <leafNode name="source-interface">
+            <properties>
+              <help>Physical Interface used for this PPPoE session</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script>
+              </completionHelp>
+            </properties>
+          </leafNode>
+          <leafNode name="local-address">
+            <properties>
+              <help>IPv4 address of local end of the PPPoE link</help>
+              <valueHelp>
+                <format>ipv4</format>
+                <description>Address of local end of the PPPoE link</description>
+              </valueHelp>
+              <constraint>
+                <validator name="ipv4-address"/>
+              </constraint>
+            </properties>
+          </leafNode>
+          <leafNode name="mtu">
+            <properties>
+              <help>Maximum Transmission Unit (MTU)</help>
+              <valueHelp>
+                <format>68-1500</format>
+                <description>Maximum Transmission Unit (default 1492)</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 68-1500"/>
+              </constraint>
+              <constraintErrorMessage>MTU must be between 68 and 1500</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <leafNode name="no-peer-dns">
+            <properties>
+              <help>Do not use DNS servers provided by the peer</help>
+              <valueless/>
+            </properties>
+          </leafNode>
+          <leafNode name="remote-address">
+            <properties>
+              <help>IPv4 address of remote end of the PPPoE link</help>
+              <valueHelp>
+                <format>ipv4</format>
+                <description>Address of remote end of the PPPoE link</description>
+              </valueHelp>
+              <constraint>
+                <validator name="ipv4-address"/>
+              </constraint>
+            </properties>
+          </leafNode>
+          <leafNode name="service-name">
+            <properties>
+              <help>Service name, only connect to access concentrators advertising this</help>
+              <constraint>
+                <regex>[a-zA-Z0-9]+$</regex>
+              </constraint>
+              <constraintErrorMessage>Service name must be composed of uppper and lower case letters or numbers only</constraintErrorMessage>
+            </properties>
+          </leafNode>
+        </children>
+      </tagNode>
+    </children>
+  </node>
+</interfaceDefinition>