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".

3 files changed, 42 insertions, 2 deletions

diff --git a/python/vyos/ifconfig/__init__.py b/python/vyos/ifconfig/__init__.py
index 9d797d7f1..f5dfa8e05 100644
--- a/python/vyos/ifconfig/__init__.py
+++ b/python/vyos/ifconfig/__init__.py
@@ -30,6 +30,7 @@ from vyos.ifconfig.vxlan import VXLANIf
 from vyos.ifconfig.wireguard import WireGuardIf
 from vyos.ifconfig.vtun import VTunIf
 from vyos.ifconfig.vti import VTIIf
+from vyos.ifconfig.pppoe import PPPoEIf
 from vyos.ifconfig.tunnel import TunnelIf
 from vyos.ifconfig.erspan import ERSpanIf
 from vyos.ifconfig.erspan import ER6SpanIf
diff --git a/python/vyos/ifconfig/pppoe.py b/python/vyos/ifconfig/pppoe.py
new file mode 100644
index 000000000..65575cf99
--- /dev/null
+++ b/python/vyos/ifconfig/pppoe.py
@@ -0,0 +1,39 @@
+# Copyright 2020 VyOS maintainers and contributors <maintainers@vyos.io>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+from vyos.ifconfig.interface import Interface
+
+@Interface.register
+class PPPoEIf(Interface):
+    default = {
+        'type': 'pppoe',
+    }
+    definition = {
+        **Interface.definition,
+        **{
+            'section': 'pppoe',
+            'prefixes': ['pppoe', ],
+        },
+    }
+
+    # stub this interface is created in the configure script
+
+    def _create(self):
+        # we can not create this interface as it is managed outside
+        pass
+
+    def _delete(self):
+        # we can not create this interface as it is managed outside
+        pass
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)