diff options
Diffstat (limited to 'ironic_python_agent')
| -rw-r--r-- | ironic_python_agent/hardware.py | 21 | ||||
| -rw-r--r-- | ironic_python_agent/tests/unit/test_hardware.py | 4 |
2 files changed, 18 insertions, 7 deletions
diff --git a/ironic_python_agent/hardware.py b/ironic_python_agent/hardware.py index 568d5bf4..30549dbc 100644 --- a/ironic_python_agent/hardware.py +++ b/ironic_python_agent/hardware.py @@ -21,6 +21,7 @@ import time from ironic_lib import disk_utils from ironic_lib import utils as il_utils +import netaddr from oslo_concurrency import processutils from oslo_config import cfg from oslo_log import log @@ -944,14 +945,20 @@ class GenericHardwareManager(HardwareManager): out, e = utils.execute( "ipmitool lan print {} | awk '/IP Address[[:space:]]*:/" " {{print $4}}'".format(channel), shell=True) - # Invalid channel cannot be followed by a valid one, so we can - # safely break here if e.startswith("Invalid channel"): - break - # In case we get empty IP or 0.0.0.0 on a valid channel, - # we need to keep querying - if out.strip() not in ('', '0.0.0.0'): - return out.strip() + continue + out = out.strip() + + try: + netaddr.IPAddress(out) + except netaddr.AddrFormatError: + LOG.warning('Invalid IP address: %s', out) + continue + + # In case we get 0.0.0.0 on a valid channel, we need to keep + # querying + if out != '0.0.0.0': + return out except (processutils.ProcessExecutionError, OSError) as e: # Not error, because it's normal in virtual environment diff --git a/ironic_python_agent/tests/unit/test_hardware.py b/ironic_python_agent/tests/unit/test_hardware.py index 216f9776..901bae2d 100644 --- a/ironic_python_agent/tests/unit/test_hardware.py +++ b/ironic_python_agent/tests/unit/test_hardware.py @@ -1564,7 +1564,11 @@ class TestGenericHardwareManager(base.IronicAgentTest): # and for any other we return a correct IP address def side_effect(*args, **kwargs): if args[0].startswith("ipmitool lan print 1"): + return '', 'Invalid channel 1\n' + elif args[0].startswith("ipmitool lan print 2"): return '0.0.0.0\n', '' + elif args[0].startswith("ipmitool lan print 3"): + return 'meow', '' else: return '192.1.2.3\n', '' mocked_execute.side_effect = side_effect |