add patch 0008-openvswitch-ovs-ports-condone-regex-exclude-tap-veth.patch

[ifupdown2.git] / debian / patches / extra / 0003-ovs-multiple-ovsport.patch

From 6cdb2b3d220fdf60ea8d0a2982a90c583dec467e Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com>
Date: Thu, 28 May 2020 11:21:55 +0200
Subject: [PATCH] addons: openvswitch: allow multiple ovs-ports + glob/regex

---
 ifupdown2/addons/openvswitch.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/ifupdown2/addons/openvswitch.py b/ifupdown2/addons/openvswitch.py
index 468d7df..936c871 100644
--- a/ifupdown2/addons/openvswitch.py
+++ b/ifupdown2/addons/openvswitch.py
@@ -37,6 +37,12 @@ class openvswitch(Addon, moduleBase):
                 'help': 'Interfaces to be part of this ovs bridge.',
                 'validvals': ['<interface-list>'],
                 'required': False,
+                "multivalue": True,
+                "example": [
+                    "ovs-ports swp1.100 swp2.100 swp3.100",
+                    "ovs-ports glob swp1-3.100",
+                    "ovs-ports regex (swp[1|2|3].100)"
+                ]
             },
             'ovs-type': {
                 'help': 'ovs interface type',
@@ -87,10 +93,15 @@ def _is_ovs_bridge (self, ifaceobj):
         return False
 
     def _get_ovs_ports (self, ifaceobj):
-        ovs_ports = ifaceobj.get_attr_value_first('ovs-ports')
+        ovs_ports = []
+
+        for port in ifaceobj.get_attr_value('ovs-ports') or []:
+            ovs_ports.extend(port.split())
+
         if ovs_ports:
-            return sorted (ovs_ports.split ())
-        return None
+            return self.parse_port_list(ifaceobj.name, ' '.join(ovs_ports))
+        else:
+            return None
 
     def _get_running_ovs_ports (self, iface):
         output = utils.exec_command("/usr/bin/ovs-vsctl list-ports %s" %iface)
@@ -152,6 +163,7 @@ def _addbridge (self, ifaceobj):
             ovs_ports = self._get_ovs_ports(ifaceobj)
             running_ovs_ports = self._get_running_ovs_ports(iface)
 
+            missingports = []
             if running_ovs_ports is not None and ovs_ports is not None:
                 missingports = list(set(running_ovs_ports) - set(ovs_ports))