Merge ~smoser/cloud-init:bug/1705147-rename-support-mixed-case-macs into cloud-init:master

[Scott Moser]

net: fix renaming of nics to support mac addresses written in upper case.

The network device renaming code previously required the case of
the mac address input to match that of the data read from the system.
For example, if user provided network config with mac address
in upper case, then cloud-init would not rename the device correctly
as /sys/class/net/address stores lower case values.

The fix here is to always compare lower case mac addresses.

LP: #1705147

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:c0060fe4892197179a5cfbfd3239cf3b6c3e5029
https://jenkins.ubuntu.com/server/job/cloud-init-ci/55/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: CentOS 6 & 7: Build & Test
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/55/rebuild

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

LGTM

review: Approve

diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
index cba991a..d1740e5 100644
--- a/cloudinit/net/__init__.py
+++ b/cloudinit/net/__init__.py
@@ -302,7 +302,7 @@ def _get_current_rename_info(check_downable=True):
                       device has only automatically assigned ip addrs.
           'device_id': Device id value (if it has one)
           'driver': Device driver (if it has one)
-          'mac': mac address
+          'mac': mac address (in lower case)
           'name': name
           'up': boolean: is_up(name)
          }}
@@ -313,7 +313,7 @@ def _get_current_rename_info(check_downable=True):
             'downable': None,
             'device_id': device_id,
             'driver': driver,
-            'mac': mac,
+            'mac': mac.lower(),
             'name': name,
             'up': is_up(name),
         }
@@ -348,6 +348,8 @@ def _rename_interfaces(renames, strict_present=True, strict_busy=True,
     cur_info = {}
     for name, data in current_info.items():
         cur = data.copy()
+        if cur.get('mac'):
+            cur['mac'] = cur['mac'].lower()
         cur['name'] = name
         cur_info[name] = cur
 
@@ -399,6 +401,8 @@ def _rename_interfaces(renames, strict_present=True, strict_busy=True,
         return None
 
     for mac, new_name, driver, device_id in renames:
+        if mac:
+            mac = mac.lower()
         cur_ops = []
         cur = find_entry(mac, driver, device_id)
         if not cur:
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index 71c9c45..76721ba 100644
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -2176,5 +2176,32 @@ class TestRenameInterfaces(CiTestCase):
                       capture=True),
         ])
 
+    @mock.patch('cloudinit.util.subp')
+    def test_rename_macs_case_insensitive(self, mock_subp):
+        """_rename_interfaces must support upper or lower case macs."""
+        renames = [
+            ('aa:aa:aa:aa:aa:aa', 'en0', None, None),
+            ('BB:BB:BB:BB:BB:BB', 'en1', None, None),
+            ('cc:cc:cc:cc:cc:cc', 'en2', None, None),
+            ('DD:DD:DD:DD:DD:DD', 'en3', None, None),
+        ]
+        current_info = {
+            'eth0': {'downable': True, 'mac': 'AA:AA:AA:AA:AA:AA',
+                     'name': 'eth0', 'up': False},
+            'eth1': {'downable': True, 'mac': 'bb:bb:bb:bb:bb:bb',
+                     'name': 'eth1', 'up': False},
+            'eth2': {'downable': True, 'mac': 'cc:cc:cc:cc:cc:cc',
+                     'name': 'eth2', 'up': False},
+            'eth3': {'downable': True, 'mac': 'DD:DD:DD:DD:DD:DD',
+                     'name': 'eth3', 'up': False},
+        }
+        net._rename_interfaces(renames, current_info=current_info)
+
+        expected = [
+            mock.call(['ip', 'link', 'set', 'eth%d' % i, 'name', 'en%d' % i],
+                      capture=True)
+            for i in range(len(renames))]
+        mock_subp.assert_has_calls(expected)
+
 
 # vi: ts=4 expandtab