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.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/etc/ppp/ip-up.d/99-vyos-pppoe-callback b/src/etc/ppp/ip-up.d/99-vyos-pppoe-callback
index bb918a468..78ca09010 100755
--- a/src/etc/ppp/ip-up.d/99-vyos-pppoe-callback
+++ b/src/etc/ppp/ip-up.d/99-vyos-pppoe-callback
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2021 VyOS maintainers and contributors
+# Copyright (C) 2021-2022 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -28,7 +28,8 @@ from syslog import openlog
 from syslog import LOG_PID
 from syslog import LOG_INFO
 
-from vyos.configquery import ConfigTreeQuery
+from vyos.configquery import Config
+from vyos.configdict import get_interface_dict
 from vyos.ifconfig import PPPoEIf
 from vyos.util import read_file
 
@@ -50,10 +51,9 @@ dialer_pid = read_file(f'/var/run/{interface}.pid')
 openlog(ident=f'pppd[{dialer_pid}]', facility=LOG_INFO)
 syslog('executing ' + argv[0])
 
-conf = ConfigTreeQuery()
-pppoe = conf.get_config_dict(['interfaces', 'pppoe', argv[6]],
-                             get_first_key=True, key_mangling=('-', '_'))
-pppoe['ifname'] = argv[6]
+conf = Config()
+pppoe = get_interface_dict(conf, ['interfaces', 'pppoe'], argv[6])
 
+# Update the config
 p = PPPoEIf(pppoe['ifname'])
 p.update(pppoe)