From: Julien Fortin <julien@cumulusnetworks.com>
Date: Tue, 5 Mar 2019 17:44:57 +0000 (+0100)
Subject: addons: addressvirtual: vrrp: fix macvlan name to include vrrp id
X-Git-Tag: 1.2.8-1~30
X-Git-Url: https://git.proxmox.com/?p=mirror_ifupdown2.git;a=commitdiff_plain;h=3e112a1c03bccbb4549ad70d94172ee1e714be5c

addons: addressvirtual: vrrp: fix macvlan name to include vrrp id

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
---

diff --git a/ifupdown2/addons/addressvirtual.py b/ifupdown2/addons/addressvirtual.py
index b031f2a..8d0ffd0 100644
--- a/ifupdown2/addons/addressvirtual.py
+++ b/ifupdown2/addons/addressvirtual.py
@@ -94,7 +94,7 @@ class addressvirtual(moduleBase):
 
     @staticmethod
     def get_vrrp_prefix(ifname, family):
-        return "vrrp%s-if%s-v" % (family, netlink.get_iface_index(ifname))
+        return "vrrp%s-%s-" % (family, netlink.get_iface_index(ifname))
 
     def _add_addresses_to_bridge(self, ifaceobj, hwaddress):
         # XXX: batch the addresses
@@ -570,8 +570,8 @@ class addressvirtual(moduleBase):
                 else:
                     ip4.append(ip_addr)
 
-            macvlan_ip4_ifname = "%s%s" % (self.get_vrrp_prefix(ifname, "4"), index)
-            macvlan_ip6_ifname = "%s%s" % (self.get_vrrp_prefix(ifname, "6"), index)
+            macvlan_ip4_ifname = "%s%s" % (self.get_vrrp_prefix(ifname, "4"), vrrp_id)
+            macvlan_ip6_ifname = "%s%s" % (self.get_vrrp_prefix(ifname, "6"), vrrp_id)
 
             merged_with_existing_obj = False
             # if the vrr config is defined in different lines for the same ID