From a2ab95ff68b709f7ca31006bdef6607ef4ce961d Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 21 Apr 2022 22:03:36 +0200
Subject: pppoe: T4384: replace default-route CLI option with common CLI nodes
 already present for DHCP

VyOS 1.4 still leverages PPPd internals on the CLI.

pppd supports three options for a default route, none, auto, force.
* none: No default route is installed on interface up
* auto: Default route is only installed if there is yet no default route
* force: overwrite any default route

There are several drawbacks in this design for VyOS and the users. If auto is
specified, this only counted for static default routes - but what about dynamic
ones? Same for force, only a static default route got replaced but dynamic ones
did not got taken into account.

The CLI is changed and we now re-use already existing nodes from the DHCP
interface configuration:
* no-default-route:
  On link up no default route is installed, same as the previous
  default-route none

* default-route-distance:
  We can now specify the distance of this route for the routing table on the
  system. This defaults to 210 as we have for DHCP interfaces. All this will be
  migrated using a CLI migration script.
---
 .../include/version/interfaces-version.xml.i       |  2 +-
 interface-definitions/interfaces-pppoe.xml.in      | 27 ++--------------------
 2 files changed, 3 insertions(+), 26 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/version/interfaces-version.xml.i b/interface-definitions/include/version/interfaces-version.xml.i
index b97971531..0a209bc3a 100644
--- a/interface-definitions/include/version/interfaces-version.xml.i
+++ b/interface-definitions/include/version/interfaces-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/interfaces-version.xml.i -->
-<syntaxVersion component='interfaces' version='25'></syntaxVersion>
+<syntaxVersion component='interfaces' version='26'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in
index 3a0b7a40c..8cd8f8c86 100644
--- a/interface-definitions/interfaces-pppoe.xml.in
+++ b/interface-definitions/interfaces-pppoe.xml.in
@@ -21,31 +21,8 @@
           #include <include/interface/dial-on-demand.xml.i>
           #include <include/interface/interface-firewall.xml.i>
           #include <include/interface/interface-policy.xml.i>
-          <leafNode name="default-route">
-            <properties>
-              <help>Default route insertion behaviour</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>
-            <defaultValue>auto</defaultValue>
-          </leafNode>
+          #include <include/interface/no-default-route.xml.i>
+          #include <include/interface/default-route-distance.xml.i>
           #include <include/interface/dhcpv6-options.xml.i>
           #include <include/interface/description.xml.i>
           #include <include/interface/disable.xml.i>
-- 
cgit v1.2.3