From c2b847f7afc3f45524973662f78f2cc76a2bc507 Mon Sep 17 00:00:00 2001 From: Julien Fortin Date: Tue, 6 Jul 2021 12:46:02 +0200 Subject: [PATCH] addons: introduces old_ifaceobjs to get_dependent_ifacenames Other addon modules need to access the list of old ifaceobjs Signed-off-by: Julien Fortin --- ifupdown2/addons/batman_adv.py | 2 +- ifupdown2/addons/openvswitch.py | 2 +- ifupdown2/addons/openvswitch_port.py | 2 +- ifupdown2/addons/ppp.py | 2 +- ifupdown2/addons/xfrm.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ifupdown2/addons/batman_adv.py b/ifupdown2/addons/batman_adv.py index fc8b74f..5cf6279 100644 --- a/ifupdown2/addons/batman_adv.py +++ b/ifupdown2/addons/batman_adv.py @@ -188,7 +188,7 @@ class batman_adv(Addon, moduleBase): return sorted(members) - def get_dependent_ifacenames(self, ifaceobj, ifaceobjs_all=None): + def get_dependent_ifacenames(self, ifaceobj, ifacenames_all=None, old_ifaceobjs=False): if not self._is_batman_device(ifaceobj): return None diff --git a/ifupdown2/addons/openvswitch.py b/ifupdown2/addons/openvswitch.py index 8ba2806..2c9a76f 100644 --- a/ifupdown2/addons/openvswitch.py +++ b/ifupdown2/addons/openvswitch.py @@ -200,7 +200,7 @@ class openvswitch(Addon, moduleBase): cmd = "del-br %s"%(ifaceobj.name) self._ovs_vsctl(ifaceobj, [cmd]) - def get_dependent_ifacenames (self, ifaceobj, ifaceobjs_all=None): + def get_dependent_ifacenames(self, ifaceobj, ifacenames_all=None, old_ifaceobjs=False): if not self._is_ovs_bridge(ifaceobj): return None ifaceobj.link_privflags |= ifaceLinkPrivFlags.OPENVSWITCH diff --git a/ifupdown2/addons/openvswitch_port.py b/ifupdown2/addons/openvswitch_port.py index 856a023..ae8549a 100644 --- a/ifupdown2/addons/openvswitch_port.py +++ b/ifupdown2/addons/openvswitch_port.py @@ -212,7 +212,7 @@ class openvswitch_port(Addon, moduleBase): self._ovs_vsctl(ifaceobj, [cmd]) - def get_dependent_ifacenames (self, ifaceobj, ifaceobjs_all=None): + def get_dependent_ifacenames(self, ifaceobj, ifacenames_all=None, old_ifaceobjs=False): if not self._is_ovs_port (ifaceobj): return None diff --git a/ifupdown2/addons/ppp.py b/ifupdown2/addons/ppp.py index 9985459..f24b8fc 100644 --- a/ifupdown2/addons/ppp.py +++ b/ifupdown2/addons/ppp.py @@ -112,7 +112,7 @@ class ppp(Addon, moduleBase): except Exception as e: self.log_warn(str(e)) - def get_dependent_ifacenames(self, ifaceobj, ifacenames_all=None): + def get_dependent_ifacenames(self, ifaceobj, ifacenames_all=None, old_ifaceobjs=False): if not self._is_my_interface(ifaceobj): return None diff --git a/ifupdown2/addons/xfrm.py b/ifupdown2/addons/xfrm.py index 28833d5..e94a380 100644 --- a/ifupdown2/addons/xfrm.py +++ b/ifupdown2/addons/xfrm.py @@ -61,7 +61,7 @@ class xfrm(Addon, moduleBase): Addon.__init__(self) moduleBase.__init__(self, *args, **kargs) - def get_dependent_ifacenames(self, ifaceobj, ifacenames_all=None): + def get_dependent_ifacenames(self, ifaceobj, ifacenames_all=None, old_ifaceobjs=False): parent_int = self._get_parent_ifacename(ifaceobj) if parent_int: