From 1dc6c806b32044420bf17d3076dd712185b7ac07 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 5 Dec 2012 23:13:37 +0000 Subject: Fix handling of unimplemented host actions Fixes bug #1060884 Host actions like enable/disable, maintenance mode and power management are not implemented in most virt drivers. In the case of set_host_enabled() in the libvirt driver, we have a no-op implementation. In other cases we have an implementation which raises NotImplementedError. Since the default implementation is to do this, we should just remove the redundant methods from the drivers which don't actually implement these actions. This ensures NotImplementedError is consistently raised. On the API side, rather than looking at the return value of these methods to determine whether they're implemented, we should just catch NotImplementedError and return a sensible error message. In order to do this, we need to ensure the NotImplementedError is properly deserialized from the RemoteError which will encapsualte it. The fix for bug #1086798 ensures this happens. Finally, add some tests to make sure we properly respond with 501 when the virt driver doesn't implement these actions. Change-Id: I2d4fc51a4b16d5230e61bde75915142ea450557d --- .../api/openstack/compute/contrib/test_hosts.py | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/compute/contrib/test_hosts.py b/nova/tests/api/openstack/compute/contrib/test_hosts.py index b91715190..8469c7eba 100644 --- a/nova/tests/api/openstack/compute/contrib/test_hosts.py +++ b/nova/tests/api/openstack/compute/contrib/test_hosts.py @@ -46,6 +46,8 @@ def stub_service_get_all(self, req): def stub_set_host_enabled(context, host, enabled): + if host == "notimplemented": + raise NotImplementedError() # We'll simulate success and failure by assuming # that 'host_c1' always succeeds, and 'host_c2' # always fails @@ -55,6 +57,8 @@ def stub_set_host_enabled(context, host, enabled): def stub_set_host_maintenance(context, host, mode): + if host == "notimplemented": + raise NotImplementedError() # We'll simulate success and failure by assuming # that 'host_c1' always succeeds, and 'host_c2' # always fails @@ -64,6 +68,8 @@ def stub_set_host_maintenance(context, host, mode): def stub_host_power_action(context, host, action): + if host == "notimplemented": + raise NotImplementedError() return action @@ -153,6 +159,23 @@ class HostTestCase(test.TestCase): self._test_host_update('host_c1', 'maintenance_mode', 'disable', 'off_maintenance') + def _test_host_update_notimpl(self, key, val): + def stub_service_get_all_notimpl(self, req): + return [{'host': 'notimplemented', 'topic': None, + 'availability_zone': None}] + self.stubs.Set(db, 'service_get_all', + stub_service_get_all_notimpl) + body = {key: val} + self.assertRaises(webob.exc.HTTPNotImplemented, + self.controller.update, + self.req, 'notimplemented', body=body) + + def test_disable_host_notimpl(self): + self._test_host_update_notimpl('status', 'disable') + + def test_enable_maintenance_notimpl(self): + self._test_host_update_notimpl('maintenance_mode', 'enable') + def test_host_startup(self): result = self.controller.startup(self.req, "host_c1") self.assertEqual(result["power_action"], "startup") @@ -165,6 +188,19 @@ class HostTestCase(test.TestCase): result = self.controller.reboot(self.req, "host_c1") self.assertEqual(result["power_action"], "reboot") + def _test_host_power_action_notimpl(self, method): + self.assertRaises(webob.exc.HTTPNotImplemented, + method, self.req, "notimplemented") + + def test_host_startup_notimpl(self): + self._test_host_power_action_notimpl(self.controller.startup) + + def test_host_shutdown_notimpl(self): + self._test_host_power_action_notimpl(self.controller.shutdown) + + def test_host_reboot_notimpl(self): + self._test_host_power_action_notimpl(self.controller.reboot) + def test_bad_status_value(self): bad_body = {"status": "bad"} self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update, -- cgit