]> git.proxmox.com Git - mirror_ifupdown2.git/commitdiff
addons: vrf: fix link-down yes on vrf slaves
authorJulien Fortin <julien@cumulusnetworks.com>
Thu, 6 Dec 2018 18:40:48 +0000 (10:40 -0800)
committerJulien Fortin <julien@cumulusnetworks.com>
Thu, 13 Dec 2018 23:18:00 +0000 (15:18 -0800)
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 <julien@cumulusnetworks.com>
ifupdown2/addons/vrf.py

index 509b52d2f2eb0d0bff7f85f5898f8ac2ddebffb6..3fbec5b6a29c016930d75fd076f42d65d484d7e9 100644 (file)
@@ -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):