openstack/ironic
Code Issues Proposed changes

fix up redfish inspection mock ethernet interface data

Browse Source 
The mock data for redfish inspection was not correct after the change in
Ide947f410c3d0d0f67a735c18b30f8cb56caa6b3 which wasn't detected in the
existing tests but follow on code shows it.

Change-Id: I5eb876b35437e0adc7310814b64c48b103a52294
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
This commit is contained in:
Doug Goldstein
2025-07-21 15:32:49 -05:00
parent daf856cd2d
commit 382a9f5c80
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
ironic/tests/unit/drivers/modules/redfish/test_inspect.py
View File

@@ -91,23 +91,34 @@ class RedfishInspectTestCase(db_base.DbTestCase):
system_mock.storage.volumes_sizes_bytes = (
2 * units.Gi, units.Gi * 4, units.Gi * 6)
eth_interface_mock1 = mock.Mock()
eth_interface_mock1 = mock.Mock(
spec=sushy.resources.system.ethernet_interface.EthernetInterface)
eth_interface_mock1.identity = 'NIC.Integrated.1-1'
eth_interface_mock1.mac_address = '00:11:22:33:44:55'
eth_interface_mock1.status.state = sushy.STATE_ENABLED
eth_interface_mock1.status.health = sushy.HEALTH_OK
eth_interface_mock2 = mock.Mock()
eth_interface_mock2 = mock.Mock(
spec=sushy.resources.system.ethernet_interface.EthernetInterface)
eth_interface_mock2.identity = 'NIC.Integrated.2-1'
eth_interface_mock2.mac_address = '66:77:88:99:AA:BB'
eth_interface_mock2.status.state = sushy.STATE_DISABLED
eth_interface_mock2.status.health = sushy.HEALTH_OK
system_mock.ethernet_interfaces.summary = {
'00:11:22:33:44:55': sushy.STATE_ENABLED,
'66:77:88:99:AA:BB': sushy.STATE_DISABLED,
}
system_mock.ethernet_interfaces.get_members.return_value = [
eth_interface_mock1,
eth_interface_mock2
]
ethernet_mock = mock.Mock()
ethernet_mock.get_members.return_value = [eth_interface_mock1,
eth_interface_mock2]
system_mock.ethernet_interfaces = ethernet_mock
# make the summary follow the data above by making it
# a property like sushy and returning the same data
type(system_mock.ethernet_interfaces).summary = mock.PropertyMock(
side_effect=lambda: {
obj.mac_address: obj.status.state
for obj in
system_mock.ethernet_interfaces.get_members.return_value
}
)
system_mock.name = 'System1'
@@ -415,7 +426,7 @@ class RedfishInspectTestCase(db_base.DbTestCase):
def test_inspect_hardware_ignore_missing_nics(
self, mock_create_ports_if_not_exist, mock_get_system):
system_mock = self.init_system_mock(mock_get_system.return_value)
system_mock.ethernet_interfaces.summary = None
system_mock.ethernet_interfaces.get_members.return_value = []
with task_manager.acquire(self.context, self.node.uuid,
shared=True) as task:
@@ -556,12 +567,10 @@ class RedfishInspectTestCase(db_base.DbTestCase):
@mock.patch.object(redfish_utils, 'get_system', autospec=True)
def test_inspect_hardware_with_no_mac(self, mock_get_system):
self.init_system_mock(mock_get_system.return_value)
system = mock_get_system.return_value
system.ethernet_interfaces.summary = {
'00:11:22:33:44:55': sushy.STATE_ENABLED,
'': sushy.STATE_ENABLED,
}
system_mock = self.init_system_mock(mock_get_system.return_value)
mock_eths = system_mock.ethernet_interfaces.get_members.return_value
mock_eths[1].mac_address = ''
mock_eths[1].status.state = sushy.STATE_ENABLED
with task_manager.acquire(self.context, self.node.uuid,
shared=True) as task: