Skip to content

DLPX-69865 IP configuration is lost if a MAC address changes #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prakashsurya merged 1 commit into from
Sep 1, 2020
Merged

DLPX-69865 IP configuration is lost if a MAC address changes #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions cloudinit/net/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,12 +455,13 @@ def generate_fallback_config(blacklist_drivers=None, config_driver=None):
# can't read any interfaces addresses (or there are none); give up
return None

# netfail cannot use mac for matching, they have duplicate macs
if is_netfail_master(target_name):
match = {'name': target_name}
else:
match = {
'macaddress': read_sys_net_safe(target_name, 'address').lower()}
#
# Always match on the name, rather than the MAC address. This way,
# if the MAC address changes (which is possible VM environments),
# the network configuration will still apply.
#
match = {'name': target_name}

cfg = {'dhcp4': True, 'set-name': target_name, 'match': match}
if config_driver:
driver = device_driver(target_name)
Expand Down
6 changes: 3 additions & 3 deletions cloudinit/net/tests/test_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ def test_generate_fallback_finds_connected_eth_with_mac(self):
mac = 'aa:bb:cc:aa:bb:cc'
write_file(os.path.join(self.sysdir, 'eth1', 'address'), mac)
expected = {
'ethernets': {'eth1': {'match': {'macaddress': mac},
'ethernets': {'eth1': {'match': {'name': 'eth1'},
'dhcp4': True, 'set-name': 'eth1'}},
'version': 2}
self.assertEqual(expected, net.generate_fallback_config())
Expand All @@ -265,7 +265,7 @@ def test_generate_fallback_finds_dormant_eth_with_mac(self):
mac = 'aa:bb:cc:aa:bb:cc'
write_file(os.path.join(self.sysdir, 'eth0', 'address'), mac)
expected = {
'ethernets': {'eth0': {'match': {'macaddress': mac}, 'dhcp4': True,
'ethernets': {'eth0': {'match': {'name': 'eth0'}, 'dhcp4': True,
'set-name': 'eth0'}},
'version': 2}
self.assertEqual(expected, net.generate_fallback_config())
Expand All @@ -276,7 +276,7 @@ def test_generate_fallback_finds_eth_by_operstate(self):
write_file(os.path.join(self.sysdir, 'eth0', 'address'), mac)
expected = {
'ethernets': {
'eth0': {'dhcp4': True, 'match': {'macaddress': mac},
'eth0': {'dhcp4': True, 'match': {'name': 'eth0'},
'set-name': 'eth0'}},
'version': 2}
valid_operstates = ['dormant', 'down', 'lowerlayerdown', 'unknown']
Expand Down
24 changes: 4 additions & 20 deletions tests/unittests/test_net.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2606,7 +2606,7 @@ def test_device_driver_v2(self, mock_get_devicelist, mock_read_sys_net,
network_cfg = net.generate_fallback_config(config_driver=True)
expected = {
'ethernets': {'eth0': {'dhcp4': True, 'set-name': 'eth0',
'match': {'macaddress': '00:11:22:33:44:55',
'match': {'name': 'eth0',
'driver': 'hv_netsvc'}}},
'version': 2}
self.assertEqual(expected, network_cfg)
Expand Down Expand Up @@ -2665,14 +2665,7 @@ def test_device_driver(self, mock_get_devicelist, mock_read_sys_net,
with open(os.path.join(render_dir, 'netrules')) as fh:
contents = fh.read()
print(contents)
expected_rule = [
'SUBSYSTEM=="net"',
'ACTION=="add"',
'DRIVERS=="hv_netsvc"',
'ATTR{address}=="00:11:22:33:44:55"',
'NAME="eth0"',
]
self.assertEqual(", ".join(expected_rule) + '\n', contents.lstrip())
self.assertEqual('', contents.lstrip())

@mock.patch("cloudinit.net.sys_dev_path")
@mock.patch("cloudinit.net.read_sys_net")
Expand Down Expand Up @@ -2729,14 +2722,7 @@ def test_device_driver_blacklist(self, mock_get_devicelist,
with open(os.path.join(render_dir, 'netrules')) as fh:
contents = fh.read()
print(contents)
expected_rule = [
'SUBSYSTEM=="net"',
'ACTION=="add"',
'DRIVERS=="hv_netsvc"',
'ATTR{address}=="00:11:22:33:44:55"',
'NAME="eth1"',
]
self.assertEqual(", ".join(expected_rule) + '\n', contents.lstrip())
self.assertEqual('', contents.lstrip())

@mock.patch("cloudinit.util.get_cmdline")
@mock.patch("cloudinit.util.udevadm_settle")
Expand Down Expand Up @@ -2893,7 +2879,6 @@ def test_default_generation(self, mock_get_devicelist,
#
BOOTPROTO=dhcp
DEVICE=eth1000
HWADDR=07-1c-c6-75-a4-be
NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
Expand Down Expand Up @@ -3498,7 +3483,6 @@ def test_default_generation(self, mock_get_devicelist,
# Created by cloud-init on instance boot automatically, do not edit.
#
BOOTPROTO=dhcp4
LLADDR=07-1c-c6-75-a4-be
STARTMODE=auto
""".lstrip()
self.assertEqual(expected_content, content)
Expand Down Expand Up @@ -3854,7 +3838,7 @@ def test_default_generation(self, mock_get_devicelist,
eth1000:
dhcp4: true
match:
macaddress: 07-1c-c6-75-a4-be
name: eth1000
set-name: eth1000
version: 2
"""
Expand Down