addons: ovs: translate altnames in config items to primary interface names

Enables using the `openvswitch` addon with altnames.

Signed-off-by: Christoph Heiss <[email protected]>

Author: christoph-heiss

ifupdown2/addons/openvswitch.py

@@ -103,6 +103,7 @@ def _get_ovs_ports (self, ifaceobj):
             ovs_ports.extend(port.split())
 
         if ovs_ports:
+            ovs_ports = self.cache.link_translate_altnames(ovs_ports)
             return self.parse_port_list(ifaceobj.name, ' '.join(ovs_ports))
         else:
             return None

ifupdown2/addons/openvswitch_port.py

@@ -94,15 +94,28 @@ def __init__ (self, *args, **kargs):
 
     def _is_ovs_port (self, ifaceobj):
         ovstype = ifaceobj.get_attr_value_first ('ovs-type')
-        ovsbridge = ifaceobj.get_attr_value_first ('ovs-bridge')
+        ovsbridge = self._get_ovs_bridge(ifaceobj)
         if ovstype and ovsbridge:
             return True
         return False
 
+    def _get_ovs_bridge(self, ifaceobj):
+        """
+        Returns the ifname of the `ovs-bridge` property. Translates altnames
+        to the primary ifname if needed.
+        :param ifaceobj: interface config object
+        :return: `ovs-bridge` ifname
+        """
+        ifname = ifaceobj.get_attr_value_first('ovs-bridge')
+        if ifname:
+            return self.cache.link_translate_altname(ifname)
+        return None
+
     def _get_bond_ifaces (self, ifaceobj):
         ovs_bonds = ifaceobj.get_attr_value_first ('ovs-bonds')
         if ovs_bonds:
-            return sorted (ovs_bonds.split ())
+            ovs_bonds = self.cache.link_translate_altnames(ovs_bonds.split())
+            return sorted(ovs_bonds)
         return None
 
     def _ovs_vsctl(self, ifaceobj, cmdlist):
@@ -129,10 +142,13 @@ def _ovs_vsctl(self, ifaceobj, cmdlist):
 
     def _addport (self, ifaceobj):
         iface = ifaceobj.name
-        ovsbridge = ifaceobj.get_attr_value_first ('ovs-bridge')
+        ovsbridge = self._get_ovs_bridge(ifaceobj)
         ovsoptions = ifaceobj.get_attr_value_first ('ovs-options')
         ovstype = ifaceobj.get_attr_value_first ('ovs-type')
-        ovsbonds = ifaceobj.get_attr_value_first ('ovs-bonds')
+
+        ovsbonds_list = self._get_bond_ifaces(ifaceobj)
+        ovsbonds = ' '.join(ovsbonds_list) if ovsbonds_list else None
+
         ovsextra = ifaceobj.get_attr_value('ovs-extra')
 
         cmd_list = []
@@ -183,11 +199,10 @@ def _addport (self, ifaceobj):
 
         #mtu
         ovsmtu = ifaceobj.get_attr_value_first ('ovs-mtu')
-        ovsbonds_list = self._get_bond_ifaces(ifaceobj)
         if ovsmtu is not None:
             #we can't set mtu on bond fake interface, we apply it on slaves interfaces
             if ovstype == 'OVSBond' and ovsbonds_list is not None:
-                for slave in ovsbonds_list: 
+                for slave in ovsbonds_list:
                     cmd = "set Interface %s mtu_request=%s"%(slave,ovsmtu)
                     cmd_list.append(cmd)
 
@@ -207,7 +222,7 @@ def _addport (self, ifaceobj):
 
     def _delport (self, ifaceobj):
         iface = ifaceobj.name
-        ovsbridge = ifaceobj.get_attr_value_first ('ovs-bridge')
+        ovsbridge = self._get_ovs_bridge(ifaceobj)
         cmd = "--if-exists del-port %s %s"%(ovsbridge, iface)
 
         self._ovs_vsctl(ifaceobj, [cmd])
@@ -219,7 +234,7 @@ def get_dependent_ifacenames(self, ifaceobj, ifacenames_all=None, old_ifaceobjs=
 
         ifaceobj.link_privflags |= ifaceLinkPrivFlags.OPENVSWITCH
 
-        ovsbridge = ifaceobj.get_attr_value_first ('ovs-bridge')
+        ovsbridge = self._get_ovs_bridge(ifaceobj)
         return [ovsbridge]
 
     def _up (self, ifaceobj):