diff options
| -rw-r--r-- | cloudinit/sources/helpers/openstack.py | 14 | ||||
| -rw-r--r-- | tests/unittests/test_datasource/test_configdrive.py | 22 |
2 files changed, 26 insertions, 10 deletions
diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py index a5a2a1d6..61b0b08c 100644 --- a/cloudinit/sources/helpers/openstack.py +++ b/cloudinit/sources/helpers/openstack.py @@ -555,11 +555,12 @@ def convert_net_json(network_json=None, known_macs=None): if 'name' in link: cfg['name'] = link['name'] + link_mac_addr = None if link.get('ethernet_mac_address'): - link_id_info[link['id']] = link.get('ethernet_mac_address') + link_mac_addr = link.get('ethernet_mac_address').lower() + link_id_info[link['id']] = link_mac_addr - curinfo = {'name': cfg.get('name'), - 'mac': link.get('ethernet_mac_address'), + curinfo = {'name': cfg.get('name'), 'mac': link_mac_addr, 'id': link['id'], 'type': link['type']} for network in [n for n in networks @@ -582,10 +583,9 @@ def convert_net_json(network_json=None, known_macs=None): subnet['ipv6'] = True subnets.append(subnet) cfg.update({'subnets': subnets}) - if link['type'] in ['ethernet', 'vif', 'ovs', 'phy', 'bridge', 'tap']: - cfg.update({ - 'type': 'physical', - 'mac_address': link['ethernet_mac_address']}) + if link['type'] in [None, 'ethernet', 'vif', 'ovs', 'phy', + 'bridge', 'tap']: + cfg.update({'type': 'physical', 'mac_address': link_mac_addr}) elif link['type'] in ['bond']: params = {} for k, v in link.items(): diff --git a/tests/unittests/test_datasource/test_configdrive.py b/tests/unittests/test_datasource/test_configdrive.py index 98ff97a7..6e00abf4 100644 --- a/tests/unittests/test_datasource/test_configdrive.py +++ b/tests/unittests/test_datasource/test_configdrive.py @@ -1,4 +1,4 @@ -from copy import copy +from copy import copy, deepcopy import json import os import shutil @@ -101,7 +101,7 @@ NETWORK_DATA_2 = { "type": "vif", "id": "eth1", "vif_id": "vif-foo2"}] } -# This network data ha 'tap' type for a link. +# This network data ha 'tap' or null type for a link. NETWORK_DATA_3 = { "services": [{"type": "dns", "address": "172.16.36.11"}, {"type": "dns", "address": "172.16.36.12"}], @@ -132,7 +132,7 @@ NETWORK_DATA_3 = { "type": "tap", "id": "tap77a0dc5b-72", "vif_id": "77a0dc5b-720e-41b7-bfa7-1b2ff62e0d48"}, {"ethernet_mac_address": "fa:16:3e:a8:14:69", "mtu": None, - "type": "tap", "id": "tap7d6b7bec-93", + "type": None, "id": "tap7d6b7bec-93", "vif_id": "7d6b7bec-93e6-4c03-869a-ddc5014892d5"} ] } @@ -704,6 +704,22 @@ class TestConvertNetworkData(TestCase): self.assertIn("address 10.0.1.5", eni_rendering) self.assertIn("auto enp0s1.602", eni_rendering) + def test_mac_addrs_can_be_upper_case(self): + # input mac addresses on rackspace may be upper case + my_netdata = deepcopy(NETWORK_DATA) + for link in my_netdata['links']: + link['ethernet_mac_address'] = link['ethernet_mac_address'].upper() + + ncfg = openstack.convert_net_json(my_netdata, known_macs=KNOWN_MACS) + config_name2mac = {} + for n in ncfg['config']: + if n['type'] == 'physical': + config_name2mac[n['name']] = n['mac_address'] + + expected = {'nic0': 'fa:16:3e:05:30:fe', 'enp0s1': 'fa:16:3e:69:b0:58', + 'enp0s2': 'fa:16:3e:d4:57:ad'} + self.assertEqual(expected, config_name2mac) + def cfg_ds_from_dir(seed_d): cfg_ds = ds.DataSourceConfigDrive(settings.CFG_BUILTIN, None, |