Merge "pxe_filter: fix get blacklist error"
This commit is contained in:
commit
1cd7659b52
|
@ -232,9 +232,9 @@ def _ib_mac_to_rmac_mapping(ports):
|
|||
|
||||
|
||||
def _get_blacklist(ironic):
|
||||
ports = [port.address for port in
|
||||
ports = [port for port in
|
||||
ir_utils.call_with_retries(ironic.port.list, limit=0,
|
||||
fields=['address', 'extra'])
|
||||
if port.address not in node_cache.active_macs()]
|
||||
_ib_mac_to_rmac_mapping(ports)
|
||||
return ports
|
||||
return [port.address for port in ports]
|
||||
|
|
|
@ -386,10 +386,11 @@ class TestGetBlacklist(test_base.BaseTest):
|
|||
self.mock_ironic = mock.Mock()
|
||||
|
||||
def test_active_port(self):
|
||||
self.mock_ironic.port.list.return_value = [
|
||||
mock_ports_list = [
|
||||
mock.Mock(address='foo'),
|
||||
mock.Mock(address='bar'),
|
||||
]
|
||||
self.mock_ironic.port.list.return_value = mock_ports_list
|
||||
self.mock_active_macs.return_value = {'foo'}
|
||||
|
||||
ports = iptables._get_blacklist(self.mock_ironic)
|
||||
|
@ -397,16 +398,18 @@ class TestGetBlacklist(test_base.BaseTest):
|
|||
self.assertEqual(['bar'], ports)
|
||||
self.mock_ironic.port.list.assert_called_once_with(
|
||||
limit=0, fields=['address', 'extra'])
|
||||
self.mock__ib_mac_to_rmac_mapping.assert_called_once_with(ports)
|
||||
self.mock__ib_mac_to_rmac_mapping.assert_called_once_with(
|
||||
[mock_ports_list[1]])
|
||||
|
||||
@mock.patch('time.sleep', lambda _x: None)
|
||||
def test_retry_on_port_list_failure(self):
|
||||
mock_ports_list = [
|
||||
mock.Mock(address='foo'),
|
||||
mock.Mock(address='bar'),
|
||||
]
|
||||
self.mock_ironic.port.list.side_effect = [
|
||||
ironic_exc.ConnectionRefused('boom'),
|
||||
[
|
||||
mock.Mock(address='foo'),
|
||||
mock.Mock(address='bar'),
|
||||
]
|
||||
mock_ports_list
|
||||
]
|
||||
self.mock_active_macs.return_value = {'foo'}
|
||||
|
||||
|
@ -415,4 +418,5 @@ class TestGetBlacklist(test_base.BaseTest):
|
|||
self.assertEqual(['bar'], ports)
|
||||
self.mock_ironic.port.list.assert_called_with(
|
||||
limit=0, fields=['address', 'extra'])
|
||||
self.mock__ib_mac_to_rmac_mapping.assert_called_once_with(ports)
|
||||
self.mock__ib_mac_to_rmac_mapping.assert_called_once_with(
|
||||
[mock_ports_list[1]])
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
fixes:
|
||||
- |
|
||||
Fixes an issue while mapping port InfiniBand MAC
|
||||
address to EthernetOverInfiniBand MAC. Prior to this fix,
|
||||
it will fail to map and raise an exception.
|
Loading…
Reference in New Issue