summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-03-07 09:57:59 +0100
committerChristian Poessinger <christian@poessinger.com>2021-03-07 09:57:59 +0100
commit8e13cbd8439e91b91197dfe37b5e38203e2cb135 (patch)
tree5e126a6422ab831293d245f05fd366c93aef9576 /src
parent0ee409be2e6d11fa704964f83602f88708cdb9c2 (diff)
downloadvyos-1x-8e13cbd8439e91b91197dfe37b5e38203e2cb135.tar.gz
vyos-1x-8e13cbd8439e91b91197dfe37b5e38203e2cb135.zip
T3388: "show interfaces" op-mode command lacks PPPoE interfaces
Commit e5b335830ef ("vyos.ifconfig: T1579: remove calls to vyos.ifconfig.Interface.get_config()") removed the PPPoEIf class as it seemed to be unused. It turns out it is required by the op-mode commands for e.g. "show interfaces".
Diffstat (limited to 'src')
-rwxr-xr-xsrc/op_mode/show_interfaces.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/op_mode/show_interfaces.py b/src/op_mode/show_interfaces.py
index 5375a8406..ebeca3fc8 100755
--- a/src/op_mode/show_interfaces.py
+++ b/src/op_mode/show_interfaces.py
@@ -30,7 +30,7 @@ from vyos.util import cmd
# interfaces = Sections.reserved()
-interfaces = ['eno', 'ens', 'enp', 'enx', 'eth', 'vmnet', 'lo', 'tun', 'wan', 'pppoe', 'pppoa', 'adsl']
+interfaces = ['eno', 'ens', 'enp', 'enx', 'eth', 'vmnet', 'lo', 'tun', 'wan', 'pppoe']
glob_ifnames = '/sys/class/net/({})*'.format('|'.join(interfaces))
@@ -174,7 +174,7 @@ def run_show_intf(ifnames, iftypes, vif, vrrp):
out = cmd(f'ip addr show {interface.ifname}')
out = re.sub(f'^\d+:\s+','',out)
- if re.search("link/tunnel6", out):
+ if re.search('link/tunnel6', out):
tunnel = cmd(f'ip -6 tun show {interface.ifname}')
# tun0: ip/ipv6 remote ::2 local ::1 encaplimit 4 hoplimit 64 tclass inherit flowlabel inherit (flowinfo 0x00000000)
tunnel = re.sub('.*encap', 'encap', tunnel)