]> git.proxmox.com Git - mirror_ifupdown2.git/commitdiff
addons: address virtual: adding 0s to (if necessary) pad address-virtual
authorJulien Fortin <julien@cumulusnetworks.com>
Tue, 10 May 2016 15:23:28 +0000 (17:23 +0200)
committerJulien Fortin <julien@cumulusnetworks.com>
Tue, 10 May 2016 15:27:37 +0000 (17:27 +0200)
Ticket: CM-10853
Reviewed By: Roopa
Testing Done: Tested with the provided interface file and different
address-virtual value.

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
addons/addressvirtual.py

index 55f01af7ff46d049c0e818630f62473a35f6d7f0..54ab11a576ade72b088f47bf9149323d05c886da 100644 (file)
@@ -323,6 +323,14 @@ class addressvirtual(moduleBase):
                av_idx += 1
                continue
             raddrs = raddrs.keys()
+            try:
+                av_attrs[0] = ':'.join([i if len(i) == 2 else '0%s' % i
+                                        for i in av_attrs[0].split(':')])
+            except:
+                self.logger.info('%s: %s: invalid value for address-virtual (%s)'
+                                 % (ifaceobj.name,
+                                    macvlan_ifacename,
+                                    ' '.join(av_attrs)))
             if (rhwaddress == av_attrs[0] and raddrs == av_attrs[1:] and
                     self._check_addresses_in_bridge(ifaceobj, av_attrs[0])):
                ifaceobjcurr.update_config_with_status('address-virtual',