From e7206159edd056ee15f9688a23be0e5a69f63132 Mon Sep 17 00:00:00 2001 From: Julien Fortin Date: Thu, 6 Dec 2018 10:40:48 -0800 Subject: [PATCH] addons: vrf: fix link-down yes on vrf slaves because of a typo (use of wrong object) we weren't looking at the correct ifaceobj for LINK_DOWN lookup. In some cases we didn't honor link-down yes on VRF slaves Signed-off-by: Julien Fortin --- ifupdown2/addons/vrf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ifupdown2/addons/vrf.py b/ifupdown2/addons/vrf.py index 509b52d..3fbec5b 100644 --- a/ifupdown2/addons/vrf.py +++ b/ifupdown2/addons/vrf.py @@ -675,11 +675,11 @@ class vrf(moduleBase): for s in config_slaves: try: for slave_ifaceobj in ifaceobj_getfunc(s) or []: - if ifaceobj.link_privflags & ifaceLinkPrivFlags.KEEP_LINK_DOWN: - raise Exception('%s: slave configured with link-down yes') + if slave_ifaceobj.link_privflags & ifaceLinkPrivFlags.KEEP_LINK_DOWN: + raise Exception("link-down yes: keeping VRF slave down") netlink.link_set_updown(s, "up") except Exception, e: - self.logger.debug('%s: %s' % (ifaceobj.name, str(e))) + self.logger.debug("%s: %s" % (s, str(e))) pass def _set_vrf_dev_processed_flag(self, ifaceobj):