diff --git a/ironic/drivers/modules/redfish/management.py b/ironic/drivers/modules/redfish/management.py index 56f35ba601..97ffc2156f 100644 --- a/ironic/drivers/modules/redfish/management.py +++ b/ironic/drivers/modules/redfish/management.py @@ -239,7 +239,7 @@ class RedfishManagement(base.ManagementInterface): """ sensors = {} - for fan in chassis.thermal.fans.get_members(): + for fan in chassis.thermal.fans: sensor = cls._sensor2dict( fan, 'identity', 'max_reading_range', 'min_reading_range', 'reading', 'reading_units', @@ -259,7 +259,7 @@ class RedfishManagement(base.ManagementInterface): """ sensors = {} - for temps in chassis.thermal.temperatures.get_members(): + for temps in chassis.thermal.temperatures: sensor = cls._sensor2dict( temps, 'identity', 'max_reading_range_temp', 'min_reading_range_temp', 'reading_celsius', @@ -290,7 +290,7 @@ class RedfishManagement(base.ManagementInterface): 'maximum_voltage', 'minimum_frequency_hz', 'maximum_frequency_hz', 'output_wattage')) unique_name = '%s:%s@%s' % ( - power.member_id, chassis.power.identity, + power.identity, chassis.power.identity, chassis.identity) sensors[unique_name] = sensor diff --git a/ironic/tests/unit/drivers/modules/redfish/test_management.py b/ironic/tests/unit/drivers/modules/redfish/test_management.py index 0807afa57f..1a057ec286 100644 --- a/ironic/tests/unit/drivers/modules/redfish/test_management.py +++ b/ironic/tests/unit/drivers/modules/redfish/test_management.py @@ -234,11 +234,10 @@ class RedfishManagementTestCase(db_base.DbTestCase): mock_chassis = mock.MagicMock(identity='ZZZ-YYY-XXX') - mock_fans = mock_chassis.thermal.fans mock_fan = mock.MagicMock(**attributes) mock_fan.name = attributes['name'] mock_fan.status = mock.MagicMock(**attributes['status']) - mock_fans.get_members.return_value = [mock_fan] + mock_chassis.thermal.fans = [mock_fan] with task_manager.acquire(self.context, self.node.uuid, shared=True) as task: @@ -279,11 +278,11 @@ class RedfishManagementTestCase(db_base.DbTestCase): } mock_chassis = mock.MagicMock(identity='ZZZ-YYY-XXX') - mock_temperatures = mock_chassis.thermal.temperatures + mock_temperature = mock.MagicMock(**attributes) mock_temperature.name = attributes['name'] mock_temperature.status = mock.MagicMock(**attributes['status']) - mock_temperatures.get_members.return_value = [mock_temperature] + mock_chassis.thermal.temperatures = [mock_temperature] with task_manager.acquire(self.context, self.node.uuid, shared=True) as task: @@ -307,7 +306,7 @@ class RedfishManagementTestCase(db_base.DbTestCase): def test__get_sensors_power(self): attributes = { - 'member_id': 0, + 'identity': 0, 'name': 'Power Supply 0', 'power_capacity_watts': 1450, 'last_power_output_watts': 650,