proxmox-mirrors/ifupdown2
1
0
Fork 0
mirror of https://git.proxmox.com/git/ifupdown2 synced 2025-05-09 18:33:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

openvswitch: don't remove tap|veth interfaces when adding an internal ovs port

Browse Source 
Currently, tap|veth interfaces are removed if user add a new ovs internal port and reload.

add ovs-ports-condone-regex option, like for bridge (to have the patch upstream).
default options to "tap|veth|fwpr"

to avoid to remove theses interfaces

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2020-05-16 14:07:05 +02:00 committed by Thomas Lamprecht
parent aa0f0a38bf
commit 1aa30813a8
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
debian/patches/pve/0008-add-openvswitch-addon.patch vendored
View File

@ -1,20 +1,21 @@
From 6d79fb897779792363f8b50a44bfd3b4dee11e15 Mon Sep 17 00:00:00 2001 From 4311f4deb9b95e67694c04ced13782a3608a176b Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com> From: Alexandre Derumier <aderumier@odiso.com>
Date: Mon, 17 Feb 2020 13:32:18 +0100 Date: Mon, 17 Feb 2020 13:32:18 +0100
Subject: [PATCH] add openvswitch addon Subject: [PATCH] add openvswitch addon
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
--- ---
etc/network/ifupdown2/addons.conf | 4 + etc/network/ifupdown2/addons.conf | 4 +
ifupdown2/addons/openvswitch.py | 226 ++++++++++++++++++++++ ifupdown2/addons/openvswitch.py | 248 ++++++++++++++++++++++++
ifupdown2/addons/openvswitch_port.py | 274 +++++++++++++++++++++++++++ ifupdown2/addons/openvswitch_port.py | 274 +++++++++++++++++++++++++++
ifupdown2/lib/iproute2.py | 3 + ifupdown2/lib/iproute2.py | 3 +
ifupdown2/nlmanager/nlpacket.py | 1 + ifupdown2/nlmanager/nlpacket.py | 1 +
5 files changed, 508 insertions(+) 5 files changed, 530 insertions(+)
create mode 100644 ifupdown2/addons/openvswitch.py create mode 100644 ifupdown2/addons/openvswitch.py
create mode 100644 ifupdown2/addons/openvswitch_port.py create mode 100644 ifupdown2/addons/openvswitch_port.py
diff --git a/etc/network/ifupdown2/addons.conf b/etc/network/ifupdown2/addons.conf diff --git a/etc/network/ifupdown2/addons.conf b/etc/network/ifupdown2/addons.conf
index e3639a7..99aca90 100644 index c43d377..8811cc2 100644
--- a/etc/network/ifupdown2/addons.conf --- a/etc/network/ifupdown2/addons.conf
+++ b/etc/network/ifupdown2/addons.conf +++ b/etc/network/ifupdown2/addons.conf
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
@ -23,7 +24,7 @@ index e3639a7..99aca90 100644
pre-up,xfrm pre-up,xfrm
pre-up,link pre-up,link
pre-up,ppp pre-up,ppp
@@ -45,3 +47,5 @@ post-down,usercmds @@ -43,3 +45,5 @@ post-down,usercmds
post-down,link post-down,link
post-down,tunnel post-down,tunnel
post-down,xfrm post-down,xfrm
@ -31,10 +32,10 @@ index e3639a7..99aca90 100644
+post-down,openvswitch +post-down,openvswitch
diff --git a/ifupdown2/addons/openvswitch.py b/ifupdown2/addons/openvswitch.py diff --git a/ifupdown2/addons/openvswitch.py b/ifupdown2/addons/openvswitch.py
new file mode 100644 new file mode 100644
index 0000000..6369c7e index 0000000..1d4c563
--- /dev/null --- /dev/null
+++ b/ifupdown2/addons/openvswitch.py +++ b/ifupdown2/addons/openvswitch.py
@@ -0,0 +1,226 @@ @@ -0,0 +1,248 @@
+#!/usr/bin/python +#!/usr/bin/python
+# +#
+# Copyright 2020 Alexandre Derumier <aderumier@odiso.com> +# Copyright 2020 Alexandre Derumier <aderumier@odiso.com>
@ -100,6 +101,12 @@ index 0000000..6369c7e
+ 'example': ['ovs_extra set bridge ${IFACE} other-config:hwaddr=00:59:cf:9c:84:3a -- br-set-external-id ${IFACE} bridge-id ${IFACE}'] + 'example': ['ovs_extra set bridge ${IFACE} other-config:hwaddr=00:59:cf:9c:84:3a -- br-set-external-id ${IFACE} bridge-id ${IFACE}']
+ +
+ }, + },
+ 'ovs-ports-condone-regex': {
+ "help": "bridge ports to ignore/condone when reloading config / removing interfaces",
+ "required": False,
+ "default": "^(tap|veth|fwln)",
+ "example": ["ovs-ports-condone-regex ^[a-zA-Z0-9]+_v[0-9]{1,4}$"]
+ },
+ } + }
+ } + }
+ +
@ -131,6 +138,17 @@ index 0000000..6369c7e
+ return ovs_ports + return ovs_ports
+ return None + return None
+ +
+ def _get_ovs_port_condone_regex(self, ifaceobj, get_string = False):
+ ovs_port_condone_regex = ifaceobj.get_attr_value_first('ovs-ports-condone-regex')
+ if not ovs_port_condone_regex:
+ ovs_port_condone_regex = self.get_attr_default_value('ovs-ports-condone-regex')
+
+ if ovs_port_condone_regex:
+ if get_string:
+ return ovs_port_condone_regex
+ return re.compile (r"%s" % ovs_port_condone_regex)
+ return None
+
+ def _ovs_vsctl(self, ifaceobj, cmdlist): + def _ovs_vsctl(self, ifaceobj, cmdlist):
+ +
+ if cmdlist: + if cmdlist:
@ -171,6 +189,8 @@ index 0000000..6369c7e
+ +
+ #update + #update
+ if self.cache.link_exists (iface): + if self.cache.link_exists (iface):
+
+ ovsportscondoneregex = self._get_ovs_port_condone_regex(ifaceobj)
+ # on update, delete active ports not in the new port list + # on update, delete active ports not in the new port list
+ ovs_ports = self._get_ovs_ports(ifaceobj) + ovs_ports = self._get_ovs_ports(ifaceobj)
+ running_ovs_ports = self._get_running_ovs_ports(iface) + running_ovs_ports = self._get_running_ovs_ports(iface)
@ -179,6 +199,9 @@ index 0000000..6369c7e
+ +
+ if missingports is not None: + if missingports is not None:
+ for port in missingports: + for port in missingports:
+ if ovsportscondoneregex and ovsportscondoneregex.match(port):
+ self.logger.info("%s: port %s will stay enslaved as it matches with ovs-ports-condone-regex" % (ifaceobj.name, port))
+ continue
+ cmd = "--if-exists del-port %s %s"%(iface, port) + cmd = "--if-exists del-port %s %s"%(iface, port)
+ cmd_list.append(cmd) + cmd_list.append(cmd)
+ +