Merge pull request #265 from thomas-mangin/2057-dhcp-vlan

ifconfig: T2057: break down DHCP, add register, STP and VLAN as adapters

1 files changed, 21 insertions, 7 deletions

diff --git a/python/vyos/ifconfig/ethernet.py b/python/vyos/ifconfig/ethernet.py
index dbd618d32..b3e652409 100644
--- a/python/vyos/ifconfig/ethernet.py
+++ b/python/vyos/ifconfig/ethernet.py
@@ -16,17 +16,35 @@
 import os
 import re
 
-from vyos.ifconfig.vlan import VLANIf
+from vyos.ifconfig.interface import Interface
+from vyos.ifconfig.vlan import VLAN
 
 from vyos.validate import *
 
 
-class EthernetIf(VLANIf):
+@Interface.register
+@VLAN.enable
+class EthernetIf(Interface):
     """
     Abstraction of a Linux Ethernet Interface
     """
 
-    _command_set = {**VLANIf._command_set, **{
+    default = {
+        'type': 'ethernet',
+    }
+    definition = {
+        **Interface.definition,
+        **{
+            'section': 'ethernet',
+            'prefixes': ['lan', 'eth', 'eno', 'ens', 'enp', 'enx'],
+            'bondable': True,
+            'broadcast': True,
+            'bridgeable': True,
+        }
+    }
+
+
+    _command_set = {**Interface._command_set, **{
         'gro': {
             'validate': lambda v: assert_list(v, ['on', 'off']),
             'shellcmd': '/sbin/ethtool -K {ifname} gro {value}',
@@ -49,10 +67,6 @@ class EthernetIf(VLANIf):
         },
     }}
 
-    default = {
-        'type': 'ethernet',
-    }
-
     def _delete(self):
         # Ethernet interfaces can not be removed
         pass