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, 9 insertions, 12 deletions

diff --git a/python/vyos/ifconfig/bridge.py b/python/vyos/ifconfig/bridge.py
index 1bd617a05..69f652547 100644
--- a/python/vyos/ifconfig/bridge.py
+++ b/python/vyos/ifconfig/bridge.py
@@ -1,4 +1,4 @@
-# Copyright 2019 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright 2019-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
@@ -34,10 +34,7 @@ class BridgeIf(Interface):
 
     The Linux bridge code implements a subset of the ANSI/IEEE 802.1d standard.
     """
-
-    default = {
-        'type': 'bridge',
-    }
+    iftype = 'bridge'
     definition = {
         **Interface.definition,
         **{
@@ -283,21 +280,21 @@ class BridgeIf(Interface):
         if int(vlan_filter):
             add_vlan = []
             cur_vlan_ids = get_vlan_ids(ifname)
-            
+
             tmp = dict_search('vif', config)
             if tmp:
                 for vif, vif_config in tmp.items():
                     add_vlan.append(vif)
-            
+
             # Remove redundant VLANs from the system
             for vlan in list_diff(cur_vlan_ids, add_vlan):
                 cmd = f'bridge vlan del dev {ifname} vid {vlan} self'
                 self._cmd(cmd)
-            
+
             for vlan in add_vlan:
                 cmd = f'bridge vlan add dev {ifname} vid {vlan} self'
                 self._cmd(cmd)
-            
+
             # VLAN of bridge parent interface is always 1
             # VLAN 1 is the default VLAN for all unlabeled packets
             cmd = f'bridge vlan add dev {ifname} vid 1 pvid untagged self'
@@ -337,7 +334,7 @@ class BridgeIf(Interface):
                     native_vlan_id = None
                     allowed_vlan_ids= []
                     cur_vlan_ids = get_vlan_ids(interface)
-                    
+
                     if 'native_vlan' in interface_config:
                         vlan_id = interface_config['native_vlan']
                         add_vlan.append(vlan_id)
@@ -353,12 +350,12 @@ class BridgeIf(Interface):
                             else:
                                 add_vlan.append(vlan)
                                 allowed_vlan_ids.append(vlan)
-                    
+
                     # Remove redundant VLANs from the system
                     for vlan in list_diff(cur_vlan_ids, add_vlan):
                         cmd = f'bridge vlan del dev {interface} vid {vlan} master'
                         self._cmd(cmd)
-                    
+
                     for vlan in allowed_vlan_ids:
                         cmd = f'bridge vlan add dev {interface} vid {vlan} master'
                         self._cmd(cmd)