Updated with code changes on LP

2 files changed, 8 insertions, 8 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 308454d99..d5d66fa57 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -999,10 +999,10 @@ class API(base.Base):
         return self._call_compute_message("set_host_enabled", context,
                 instance_id=None, host=host, params={"enabled": enabled})
 
-    def set_host_powerstate(self, context, host, state):
-        """Reboots or shuts down the host."""
-        return self._call_compute_message("set_host_powerstate", context,
-                instance_id=None, host=host, params={"state": state})
+    def host_power_action(self, context, host, action):
+        """Reboots, shuts down or powers up the host."""
+        return self._call_compute_message("host_power_action", context,
+                instance_id=None, host=host, params={"action": action})
 
     @scheduler_api.reroute_compute("diagnostics")
     def get_diagnostics(self, context, instance_id):
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 8c0fa6232..4908cba97 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -958,10 +958,10 @@ class ComputeManager(manager.SchedulerDependentManager):
                                                        result))
 
     @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
-    def set_host_powerstate(self, context, instance_id=None, host=None,
-            state=None):
-        """Reboots or shuts down the host."""
-        return self.driver.set_host_powerstate(host, state)
+    def host_power_action(self, context, instance_id=None, host=None,
+            action=None):
+        """Reboots, shuts down or powers up the host."""
+        return self.driver.host_power_action(host, action)
 
     @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
     def set_host_enabled(self, context, instance_id=None, host=None,