diff options
3 files changed, 15 insertions, 101 deletions
diff --git a/ironic/drivers/modules/oneview/management.py b/ironic/drivers/modules/oneview/management.py index 5984b906a..b7b18c8ca 100644 --- a/ironic/drivers/modules/oneview/management.py +++ b/ironic/drivers/modules/oneview/management.py @@ -49,10 +49,6 @@ BOOT_DEVICE_MAP_ILO = { BOOT_DEVICE_MAP_ILO_REV = { v: k for k, v in BOOT_DEVICE_MAP_ILO.items()} -ILO_SYSTEM_PATH = "/rest/v1/Systems/1" - -ILO_REQUEST_HEADERS = {"Content-Type": "application/json"} - def set_onetime_boot(task): """Set onetime boot to server hardware. @@ -73,35 +69,15 @@ def set_onetime_boot(task): server_hardware = task.node.driver_info.get('server_hardware_uri') ilo_client = common.get_ilorest_client(client, server_hardware) boot_device = BOOT_DEVICE_MAP_ILO.get(boot_device) + path = '/rest/v1/Systems/1' body = { "Boot": { "BootSourceOverrideTarget": boot_device, "BootSourceOverrideEnabled": "Once" } } - ilo_client.patch(path=ILO_SYSTEM_PATH, body=body, - headers=ILO_REQUEST_HEADERS) - - -def _is_onetime_boot(task): - """Check onetime boot from server hardware. - - Check if the onetime boot option of an OneView server hardware - is set to 'Once' in iLO. - - :param task: a task from TaskManager. - :returns: Boolean value. True if onetime boot is 'Once' - False otherwise. - - """ - client = common.get_hponeview_client() - server_hardware = task.node.driver_info.get('server_hardware_uri') - ilo_client = common.get_ilorest_client(client, server_hardware) - response = ilo_client.get(path=ILO_SYSTEM_PATH, - headers=ILO_REQUEST_HEADERS) - boot = response.dict.get('Boot') - onetime_boot = boot.get('BootSourceOverrideEnabled') - return onetime_boot == 'Once' + headers = {"Content-Type": "application/json"} + ilo_client.patch(path=path, body=body, headers=headers) def set_boot_device(task): @@ -293,7 +269,7 @@ class OneViewManagement(base.ManagementInterface): boot_device = { 'boot_device': BOOT_DEVICE_MAP_ONEVIEW_REV.get(primary_device), - 'persistent': not _is_onetime_boot(task) + 'persistent': True, } return boot_device diff --git a/ironic/tests/unit/drivers/modules/oneview/test_management.py b/ironic/tests/unit/drivers/modules/oneview/test_management.py index 9b0054fae..a8be001ed 100644 --- a/ironic/tests/unit/drivers/modules/oneview/test_management.py +++ b/ironic/tests/unit/drivers/modules/oneview/test_management.py @@ -82,12 +82,14 @@ class OneViewManagementDriverFunctionsTestCase(db_base.DbTestCase): client.server_profiles.get.return_value = server_profile boot_device_map_ilo = management.BOOT_DEVICE_MAP_ILO boot_device = boot_device_map_ilo.get(boot_devices.PXE) + path = '/rest/v1/Systems/1' body = { "Boot": { "BootSourceOverrideTarget": boot_device, "BootSourceOverrideEnabled": "Once" } } + headers = {"Content-Type": "application/json"} with task_manager.acquire(self.context, self.node.uuid) as task: driver_info = task.node.driver_info profile_uri = driver_info.get('applied_server_profile_uri') @@ -101,10 +103,7 @@ class OneViewManagementDriverFunctionsTestCase(db_base.DbTestCase): update.assert_called_once_with(server_profile, profile_uri) patch = ilo_client.patch patch.assert_called_once_with( - path=management.ILO_SYSTEM_PATH, - body=body, - headers=management.ILO_REQUEST_HEADERS - ) + path=path, body=body, headers=headers) driver_internal_info = task.node.driver_internal_info self.assertNotIn('next_boot_device', driver_internal_info) @@ -159,12 +158,14 @@ class OneViewManagementDriverFunctionsTestCase(db_base.DbTestCase): self, mock_iloclient, mock_get_ov_client): ilo_client = mock_iloclient() boot_device = management.BOOT_DEVICE_MAP_ILO.get(boot_devices.DISK) + path = '/rest/v1/Systems/1' body = { "Boot": { "BootSourceOverrideTarget": boot_device, "BootSourceOverrideEnabled": "Once" } } + headers = {"Content-Type": "application/json"} with task_manager.acquire(self.context, self.node.uuid) as task: driver_internal_info = task.node.driver_internal_info next_boot_device = {'boot_device': 'disk', 'persistent': False} @@ -173,48 +174,7 @@ class OneViewManagementDriverFunctionsTestCase(db_base.DbTestCase): management.set_onetime_boot(task) self.assertTrue(mock_iloclient.called) ilo_client.patch.assert_called_with( - path=management.ILO_SYSTEM_PATH, - body=body, - headers=management.ILO_REQUEST_HEADERS - ) - - @mock.patch.object(common, 'get_ilorest_client') - def test__is_onetime_boot_true( - self, mock_iloclient, mock_get_ov_client): - - class RestResponse(object): - @property - def dict(self): - return {'Boot': {'BootSourceOverrideEnabled': "Once"}} - - ilo_client = mock_iloclient() - ilo_client.get.return_value = RestResponse() - with task_manager.acquire(self.context, self.node.uuid) as task: - self.assertTrue(management._is_onetime_boot(task)) - self.assertTrue(mock_iloclient.called) - ilo_client.get.assert_called_with( - path=management.ILO_SYSTEM_PATH, - headers=management.ILO_REQUEST_HEADERS - ) - - @mock.patch.object(common, 'get_ilorest_client') - def test__is_onetime_boot_false( - self, mock_iloclient, mock_get_ov_client): - - class RestResponse(object): - @property - def dict(self): - return {'Boot': {'BootSourceOverrideEnabled': "Disabled"}} - - ilo_client = mock_iloclient() - ilo_client.get.return_value = RestResponse() - with task_manager.acquire(self.context, self.node.uuid) as task: - self.assertFalse(management._is_onetime_boot(task)) - self.assertTrue(mock_iloclient.called) - ilo_client.get.assert_called_with( - path=management.ILO_SYSTEM_PATH, - headers=management.ILO_REQUEST_HEADERS - ) + path=path, body=body, headers=headers) @mock.patch.object(common, 'get_hponeview_client') @@ -315,11 +275,8 @@ class OneViewManagementDriverTestCase(db_base.DbTestCase): task.driver.management.get_supported_boot_devices(task), ) - @mock.patch.object(common, 'get_ilorest_client') - def test_get_boot_device( - self, mock_ilo_client, mock_get_ov_client): + def test_get_boot_device(self, mock_get_ov_client): client = mock_get_ov_client() - ilo_client = mock_ilo_client() self.driver.management.client = client device_mapping = management.BOOT_DEVICE_MAP_ONEVIEW.items() with task_manager.acquire(self.context, self.node.uuid) as task: @@ -332,14 +289,10 @@ class OneViewManagementDriverTestCase(db_base.DbTestCase): response = self.driver.management.get_boot_device(task) self.assertEqual(expected, response) self.assertTrue(client.server_profiles.get.called) - self.assertTrue(client.server_profiles.get.called) - self.assertTrue(ilo_client.get.called) - @mock.patch.object(common, 'get_ilorest_client') def test_get_boot_device_from_next_boot_device( - self, mock_ilo_client, mock_get_ov_client): + self, mock_get_ov_client): client = mock_get_ov_client() - ilo_client = mock_ilo_client() self.driver.management.client = client with task_manager.acquire(self.context, self.node.uuid) as task: @@ -354,14 +307,10 @@ class OneViewManagementDriverTestCase(db_base.DbTestCase): } response = self.driver.management.get_boot_device(task) self.assertEqual(expected_response, response) - self.assertFalse(client.get_boot_order.called) - self.assertFalse(ilo_client.get.called) + self.assertFalse(client.get_boot_order.called) - @mock.patch.object(common, 'get_ilorest_client') - def test_get_boot_device_fail( - self, mock_ilo_client, mock_get_ov_client): + def test_get_boot_device_fail(self, mock_get_ov_client): client = mock_get_ov_client() - ilo_client = mock_ilo_client() self.driver.management.client = client exc = client_exception.HPOneViewException() client.server_profiles.get.side_effect = exc @@ -372,13 +321,9 @@ class OneViewManagementDriverTestCase(db_base.DbTestCase): task ) self.assertTrue(client.server_profiles.get.called) - self.assertFalse(ilo_client.get.called) - @mock.patch.object(common, 'get_ilorest_client') - def test_get_boot_device_unknown_device( - self, mock_ilo_client, mock_get_ov_client): + def test_get_boot_device_unknown_device(self, mock_get_ov_client): client = mock_get_ov_client() - ilo_client = mock_ilo_client() order = ['Eggs', 'Bacon'] profile = {'boot': {'order': order}} client.server_profiles.get.return_value = profile @@ -389,7 +334,6 @@ class OneViewManagementDriverTestCase(db_base.DbTestCase): task.driver.management.get_boot_device, task ) - self.assertFalse(ilo_client.get.called) def test_get_sensors_data_not_implemented(self, mock_get_ov_client): with task_manager.acquire(self.context, self.node.uuid) as task: diff --git a/releasenotes/notes/fix-get-boot-device-not-persistent-5d6acffac3b287f7.yaml b/releasenotes/notes/fix-get-boot-device-not-persistent-5d6acffac3b287f7.yaml deleted file mode 100644 index a5971afde..000000000 --- a/releasenotes/notes/fix-get-boot-device-not-persistent-5d6acffac3b287f7.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -fixes: - - | - The ``oneview`` management interface now correctly detects whether the - current boot device setting is persistent. Previously it always - returned ``True``. |