Browse Source

Merge "Accept IPv6 link local address during interface validation" into stable/ussuri

changes/13/739813/1
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
decfdb031a
3 changed files with 6 additions and 21 deletions
  1. +1
    -2
      ironic_inspector/plugins/standard.py
  2. +0
    -19
      ironic_inspector/test/unit/test_plugins_standard.py
  3. +5
    -0
      releasenotes/notes/accept-link-local-address-1fbb9cbdc3f980bb.yaml

+ 1
- 2
ironic_inspector/plugins/standard.py View File

@@ -220,8 +220,7 @@ class ValidateInterfacesHook(base.ProcessingHook):
LOG.debug('Skipping interface %s as it was not PXE booting',
name, data=data)
continue
elif CONF.processing.add_ports != 'all' and (
not ip or netaddr.IPAddress(ip).is_link_local()):
elif CONF.processing.add_ports != 'all' and not ip:
LOG.debug('Skipping interface %s as it did not have '
'an IP address assigned during the ramdisk run',
name, data=data)


+ 0
- 19
ironic_inspector/test/unit/test_plugins_standard.py View File

@@ -222,25 +222,6 @@ class TestValidateInterfacesHookBeforeProcessing(test_base.NodeTest):
self.assertRaisesRegex(utils.Error, 'No suitable interfaces found',
self.hook.before_processing, self.data)

def test_skipped_interfaces_with_local_address(self):
CONF.set_override('add_ports', 'active', 'processing')
self.inventory['interfaces'] = [
# local interface (by IPv4 address)
{'name': 'em1', 'mac_address': '22:22:22:22:22:22',
'ipv4_address': '127.0.0.1'},
# local interface (by IPv6 address)
{'name': 'em2', 'mac_address': '33:33:33:33:33:33',
'ipv6_address': '::1'},
# interface only with local-link address
{'name': 'em3', 'mac_address': '44:44:44:44:44:44',
'ipv6_address': 'fe80::4644:44ff:fe44:4444'},
# interface only with local-link address with suffix
{'name': 'em4', 'mac_address': '55:55:55:55:55:55',
'ipv6_address': 'fe80::5755:55ff:fe55:5555%em4'},
]
self.assertRaisesRegex(utils.Error, 'No suitable interfaces found',
self.hook.before_processing, self.data)

def test_interfaces_with_ipv6_addresses_only(self):
CONF.set_override('add_ports', 'all', 'processing')
self.inventory['interfaces'] = [


+ 5
- 0
releasenotes/notes/accept-link-local-address-1fbb9cbdc3f980bb.yaml View File

@@ -0,0 +1,5 @@
---
fixes:
- |
Fixes the issue that IPv6 link local addresses are ignored during
interface validation which fails introspection.

Loading…
Cancel
Save