openstack
/
nova
Code Issues Proposed changes

Merge "Not set instance to ERROR if set_admin_password failed" into stable/queens

This commit is contained in:
Zuul 2018-12-14 05:17:08 +00:00 committed by Gerrit Code Review
parent 2017515d98 4ac57b5aca
commit 72ccf9b838
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nova/compute/manager.py
View File

@ -3525,7 +3525,6 @@ class ComputeManager(manager.Manager):
except Exception:
# Catch all here because this could be anything.
LOG.exception('set_admin_password failed', instance=instance)
self._set_instance_obj_error_state(context, instance)
# We create a new exception here so that we won't
# potentially reveal password information to the
# API caller. The real exception is logged above

9
nova/tests/unit/compute/test_compute_mgr.py
View File

@ -3545,14 +3545,9 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
instance=instance,
new_pass=None)
if (expected_exception == exception.SetAdminPasswdNotSupported or
expected_exception == exception.InstanceAgentNotEnabled or
expected_exception == NotImplementedError):
if expected_exception != exception.InstancePasswordSetFailed:
instance_save_mock.assert_called_once_with(
expected_task_state=task_states.UPDATING_PASSWORD)
else:
# setting the instance to error state
instance_save_mock.assert_called_once_with()
self.assertEqual(expected_vm_state, instance.vm_state)
# check revert_task_state decorator
@ -3570,7 +3565,7 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
exc = exception.Forbidden('Internal error')
expected_exception = exception.InstancePasswordSetFailed
self._do_test_set_admin_password_driver_error(
exc, vm_states.ERROR, None, expected_exception)
exc, vm_states.ACTIVE, None, expected_exception)
def test_set_admin_password_driver_not_implemented(self):
# Ensure expected exception is raised if set_admin_password not