From 75b110aa451382cce94f10a392597b40df97839c Mon Sep 17 00:00:00 2001
From: Ed Leafe <ed@leafe.com>
Date: Thu, 4 Aug 2011 20:49:21 +0000
Subject: Changed all references to 'power state' to 'power action' as
 requested by review.

---
 nova/tests/test_hosts.py | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_hosts.py b/nova/tests/test_hosts.py
index d8f90a109..cd22571e6 100644
--- a/nova/tests/test_hosts.py
+++ b/nova/tests/test_hosts.py
@@ -48,8 +48,8 @@ def stub_set_host_enabled(context, host, enabled):
     return status
 
 
-def stub_set_host_powerstate(context, host, state):
-    return state
+def stub_host_power_action(context, host, action):
+    return action
 
 
 class FakeRequest(object):
@@ -66,8 +66,8 @@ class HostTestCase(test.TestCase):
         self.stubs.Set(scheduler_api, 'get_host_list', stub_get_host_list)
         self.stubs.Set(self.controller.compute_api, 'set_host_enabled',
                 stub_set_host_enabled)
-        self.stubs.Set(self.controller.compute_api, 'set_host_powerstate',
-                stub_set_host_powerstate)
+        self.stubs.Set(self.controller.compute_api, 'host_power_action',
+                stub_host_power_action)
 
     def test_list_hosts(self):
         """Verify that the compute hosts are returned."""
@@ -93,19 +93,18 @@ class HostTestCase(test.TestCase):
         result_c2 = self.controller.update(self.req, "host_c2", body=en_body)
         self.assertEqual(result_c2["status"], "disabled")
 
-    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_c1", body=en_body)
+    def test_host_startup(self):
+        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.startup,
+            self.req, "host_c1")
 
-    def test_bad_power_state_value(self):
-        bad_body = {"power_state": "bad"}
-        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
-                self.req, "host_c1", body=bad_body)
+    def test_host_shutdown(self):
+        result = self.controller.shutdown(self.req, "host_c1")
+        print "RES", result
+        self.assertEqual(result["power_action"], "shutdown")
+
+    def test_host_reboot(self):
+        result = self.controller.reboot(self.req, "host_c1")
+        self.assertEqual(result["power_action"], "reboot")
 
     def test_bad_status_value(self):
         bad_body = {"status": "bad"}
-- 
cgit