vyos.ifconfig: T1579: remove calls to vyos.ifconfig.Interface.get_config()

Interface.get_config() was always a pure helper which exposed a "per interface
type" dictionary which was then fed by the caller to create interfaces by
iproute2 which required additional options during creation time.

Such interfaces had been:
 * tunnel
 * vxlan
 * geneve
 * macsec
 * wifi
 * macvlan / pseudo-ethernet

The code was always duplicated to convert from the VyOS CLI based get_config_dict()
to a dict which can be used to feed iproute2.

This path has been removed and we now always feed in the entire dictionary
retrieved by get_config_dict() or in the interfaces case, it's high-level wrapper
get_interface_dict() to the interface we wan't to create.

This also adds the - personally long awaited - possibility to get rid of the
derived tunnel classes for e.g. GRE, IPIP, IPIP6 and so on.

1 files changed, 4 insertions, 23 deletions

diff --git a/python/vyos/ifconfig/wireless.py b/python/vyos/ifconfig/wireless.py
index 37703d242..6c0eeec44 100644
--- a/python/vyos/ifconfig/wireless.py
+++ b/python/vyos/ifconfig/wireless.py
@@ -1,4 +1,4 @@
-# Copyright 2020 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright 2020-2021 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
@@ -20,11 +20,7 @@ class WiFiIf(Interface):
     """
     Handle WIFI/WLAN interfaces.
     """
-
-    default = {
-        'type': 'wifi',
-        'phy': 'phy0'
-    }
+    iftype = 'wifi'
     definition = {
         **Interface.definition,
         **{
@@ -33,14 +29,10 @@ class WiFiIf(Interface):
             'bridgeable': True,
         }
     }
-    options = Interface.options + \
-        ['phy', 'op_mode']
-
     def _create(self):
         # all interfaces will be added in monitor mode
-        cmd = 'iw phy {phy} interface add {ifname} type monitor' \
-            .format(**self.config)
-        self._cmd(cmd)
+        cmd = 'iw phy {physical_device} interface add {ifname} type monitor'
+        self._cmd(cmd.format(**self.config))
 
         # wireless interface is administratively down by default
         self.set_admin_state('down')
@@ -81,14 +73,3 @@ class WiFiIf(Interface):
         # reconfiguration.
         state = 'down' if 'disable' in config else 'up'
         self.set_admin_state(state)
-
-
-@Interface.register
-class WiFiModemIf(WiFiIf):
-    definition = {
-        **WiFiIf.definition,
-        **{
-            'section': 'wirelessmodem',
-            'prefixes': ['wlm', ],
-        }
-    }