diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-06-25 09:11:44 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-06-25 09:13:07 +0200 |
| commit | b2fc5f6362a6febddfd5c7735fb3a3781cebf995 (patch) | |
| tree | f8321f8df4ca1ff8b7dbcfccbc620626a6bd3f62 /python | |
| parent | 12aeb087c34fe4d5887a11301c2e32e4e1503436 (diff) | |
| download | vyos-1x-b2fc5f6362a6febddfd5c7735fb3a3781cebf995.tar.gz vyos-1x-b2fc5f6362a6febddfd5c7735fb3a3781cebf995.zip | |
dhcp: pppoe: T4384: bugfix not honoring no-default-route CLI option
Commit a2ab95ff68b ("pppoe: T4384: replace default-route CLI option with common
CLI nodes already present for DHCP") had an issue as the PPPoE interface options
and also DHCP interface options did not honor the no-default-route option.
This has been fixed.
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/configdict.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py index 04ddc10e9..7bbf2eae1 100644 --- a/python/vyos/configdict.py +++ b/python/vyos/configdict.py @@ -358,13 +358,14 @@ def get_pppoe_interfaces(conf, vrf=None): """ Common helper functions to retrieve all interfaces from current CLI sessions that have DHCP configured. """ pppoe_interfaces = {} + conf.set_level([]) for ifname in conf.list_nodes(['interfaces', 'pppoe']): # always reset config level, as get_interface_dict() will alter it conf.set_level([]) # we already have a dict representation of the config from get_config_dict(), # but with the extended information from get_interface_dict() we also # get the DHCP client default-route-distance default option if not specified. - ifconfig = get_interface_dict(conf, ['interfaces', 'pppoe'], ifname) + _, ifconfig = get_interface_dict(conf, ['interfaces', 'pppoe'], ifname) options = {} if 'default_route_distance' in ifconfig: |