Minor test fixes

2 files changed, 7 insertions, 8 deletions

diff --git a/nova/api/openstack/contrib/hosts.py b/nova/api/openstack/contrib/hosts.py
index e9f82c75b..c90a889d5 100644
--- a/nova/api/openstack/contrib/hosts.py
+++ b/nova/api/openstack/contrib/hosts.py
@@ -78,7 +78,7 @@ class HostController(object):
                 else:
                     explanation = _("Invalid status: '%s'") % raw_val
                     raise webob.exc.HTTPBadRequest(explanation=explanation)
-            elif key == "powerstate":
+            elif key == "power_state":
                 if val == "startup":
                     # The only valid values for 'state' are 'reboot' or
                     # 'shutdown'. For completeness' sake there is the
@@ -113,7 +113,7 @@ class HostController(object):
         context = req.environ['nova.context']
         result = self.compute_api.set_host_powerstate(context, host=host,
                 state=state)
-        return {"host": host, "powerstate": result}
+        return {"host": host, "power_state": result}
 
 
 class Hosts(extensions.ExtensionDescriptor):
diff --git a/nova/tests/test_hosts.py b/nova/tests/test_hosts.py
index 1c7c21a1a..d8f90a109 100644
--- a/nova/tests/test_hosts.py
+++ b/nova/tests/test_hosts.py
@@ -49,10 +49,7 @@ def stub_set_host_enabled(context, host, enabled):
 
 
 def stub_set_host_powerstate(context, host, state):
-    # We'll simulate success and failure by assuming
-    # that 'host_c1' always succeeds, and 'host_c2'
-    # always fails
-    return state if host == "host_c1" else "running"
+    return state
 
 
 class FakeRequest(object):
@@ -96,12 +93,14 @@ class HostTestCase(test.TestCase):
         result_c2 = self.controller.update(self.req, "host_c2", body=en_body)
         self.assertEqual(result_c2["status"], "disabled")
 
-    def test_power_state(self):
+    def test_host_power_state(self):
         en_body = {"power_state": "reboot"}
         result_c1 = self.controller.update(self.req, "host_c1", body=en_body)
         self.assertEqual(result_c1["power_state"], "reboot")
+        # Test invalid power_state
+        en_body = {"power_state": "invalid"}
         self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
-                self.req, "host_c2", body=en_body)
+                self.req, "host_c1", body=en_body)
 
     def test_bad_power_state_value(self):
         bad_body = {"power_state": "bad"}