macvlan: pseudo-ethernet: 2341: bugfix empty source-interface on system boot

2 files changed, 42 insertions, 49 deletions

diff --git a/python/vyos/ifconfig/macvlan.py b/python/vyos/ifconfig/macvlan.py
index 37228e57f..b5481f4a7 100644
--- a/python/vyos/ifconfig/macvlan.py
+++ b/python/vyos/ifconfig/macvlan.py
@@ -13,6 +13,7 @@
 # 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 copy import deepcopy
 
 from vyos.ifconfig.interface import Interface
 from vyos.ifconfig.vlan import VLAN
@@ -27,6 +28,9 @@ class MACVLANIf(Interface):
 
     default = {
         'type': 'macvlan',
+        'address': '',
+        'source_interface': '',
+        'mode': '',
     }
     definition = {
         **Interface.definition,
@@ -39,30 +43,28 @@ class MACVLANIf(Interface):
         ['source_interface', 'mode']
 
     def _create(self):
-        cmd = 'ip link add {ifname} link {source_interface} type macvlan mode {mode}'.format(
-            **self.config)
-        self._cmd(cmd)
+        # please do not change the order when assembling the command
+        cmd = 'ip link add {ifname}'
+        if self.config['source_interface']:
+            cmd += ' link {source_interface}'
+        cmd += ' type macvlan'
+        if self.config['mode']:
+            cmd += ' mode {mode}'
+        self._cmd(cmd.format(**self.config))
 
-    @staticmethod
-    def get_config():
+    def set_mode(self, mode):
+        ifname = self.config['ifname']
+        cmd = f'ip link set dev {ifname} type macvlan mode {mode}'
+        return self._cmd(cmd)
+
+    @classmethod
+    def get_config(cls):
         """
-        VXLAN interfaces require a configuration when they are added using
-        iproute2. This static method will provide the configuration dictionary
-        used by this class.
+        MACVLAN interfaces require a configuration when they are added using
+        iproute2. This method will provide the configuration dictionary used
+        by this class.
 
         Example:
         >> dict = MACVLANIf().get_config()
         """
-        config = {
-            'address': '',
-            'source_interface': '',
-            'mode': ''
-        }
-        return config
-
-    def set_mode(self, mode):
-        """
-        """
-        ifname = self.config['ifname']
-        cmd = f'ip link set dev {ifname} type macvlan mode {mode}'
-        return self._cmd(cmd)
+        return deepcopy(cls.default)
diff --git a/src/conf_mode/interfaces-pseudo-ethernet.py b/src/conf_mode/interfaces-pseudo-ethernet.py
index 8eba6ea63..d5f308ed3 100755
--- a/src/conf_mode/interfaces-pseudo-ethernet.py
+++ b/src/conf_mode/interfaces-pseudo-ethernet.py
@@ -246,38 +246,29 @@ def generate(peth):
     return None
 
 def apply(peth):
-
-    p = ''
     if peth['deleted']:
         # delete interface
-        p = MACVLANIf(peth['intf'])
-        p.remove()
+        MACVLANIf(peth['intf']).remove()
         return None
 
-    elif peth['source_interface_changed']:
-        # Check if MACVLAN interface already exists. Parameters like the
-        # underlaying source-interface device can not be changed  on the fly
-        # and the interface needs to be recreated from the bottom.
-        #
-        # source_interface_changed also means - the interface was not present in the
-        # beginning and is newly created
-        if peth['intf'] in interfaces():
-            p = MACVLANIf(peth['intf'])
-            p.remove()
-
-        # MACVLAN interface needs to be created on-block instead of passing a ton
-        # of arguments, I just use a dict that is managed by vyos.ifconfig
-        conf = deepcopy(MACVLANIf.get_config())
-
-        # Assign MACVLAN instance configuration parameters to config dict
-        conf['source_interface'] = peth['source_interface']
-        conf['mode'] = peth['mode']
-
-        # It is safe to "re-create" the interface always, there is a sanity check
-        # that the interface will only be create if its non existent
-        p = MACVLANIf(peth['intf'], **conf)
-    else:
-        p = MACVLANIf(peth['intf'])
+    # Check if MACVLAN interface already exists. Parameters like the underlaying
+    # source-interface device can not be changed on the fly and the interface
+    # needs to be recreated from the bottom.
+    if peth['intf'] in interfaces():
+        if peth['source_interface_changed']:
+            MACVLANIf(peth['intf']).remove()
+
+    # MACVLAN interface needs to be created on-block instead of passing a ton
+    # of arguments, I just use a dict that is managed by vyos.ifconfig
+    conf = deepcopy(MACVLANIf.get_config())
+
+    # Assign MACVLAN instance configuration parameters to config dict
+    conf['source_interface'] = peth['source_interface']
+    conf['mode'] = peth['mode']
+
+    # It is safe to "re-create" the interface always, there is a sanity check
+    # that the interface will only be create if its non existent
+    p = MACVLANIf(peth['intf'], **conf)
 
     # update interface description used e.g. within SNMP
     p.set_alias(peth['description'])