Removed duplicate methods created by previous merge.

8 files changed, 1 insertions, 42 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 37b920074..3c89042c8 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1,4 +1,4 @@
-#: tabstop=4 shiftwidth=4 softtabstop=4
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
@@ -940,12 +940,6 @@ class ComputeManager(manager.SchedulerDependentManager):
         return self.driver.set_host_enabled(host, enabled)
 
     @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
-    def set_power_state(self, context, instance_id=None, host=None,
-            power_state=None):
-        """Turns the specified host on/off, or reboots the host."""
-        return self.driver.set_power_state(host, power_state)
-
-    @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
     def get_diagnostics(self, context, instance_id):
         """Retrieve diagnostics for an instance on this host."""
         instance_ref = self.db.instance_get(context, instance_id)
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index b32ed7c54..bbb17480d 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -259,10 +259,6 @@ class ComputeDriver(object):
         """Sets the specified host's ability to accept new instances."""
         raise NotImplementedError()
 
-    def set_power_state(self, host, power_state):
-        """Reboots, shuts down or starts up the host."""
-        raise NotImplementedError()
-
     def plug_vifs(self, instance, network_info):
         """Plugs in VIFs to networks."""
         raise NotImplementedError()
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index 135b88ab8..888dca220 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -518,7 +518,3 @@ class FakeConnection(driver.ComputeDriver):
     def set_host_enabled(self, host, enabled):
         """Sets the specified host's ability to accept new instances."""
         pass
-
-    def set_power_state(self, host, power_state):
-        """Reboots, shuts down or starts up the host."""
-        pass
diff --git a/nova/virt/hyperv.py b/nova/virt/hyperv.py
index 553f85265..119def38b 100644
--- a/nova/virt/hyperv.py
+++ b/nova/virt/hyperv.py
@@ -505,7 +505,3 @@ class HyperVConnection(driver.ComputeDriver):
     def set_host_enabled(self, host, enabled):
         """Sets the specified host's ability to accept new instances."""
         pass
-
-    def set_power_state(self, host, power_state):
-        """Reboots, shuts down or starts up the host."""
-        pass
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 150478edf..46f3eef4b 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -1586,7 +1586,3 @@ class LibvirtConnection(driver.ComputeDriver):
     def set_host_enabled(self, host, enabled):
         """Sets the specified host's ability to accept new instances."""
         pass
-
-    def set_power_state(self, host, power_state):
-        """Reboots, shuts down or starts up the host."""
-        pass
diff --git a/nova/virt/vmwareapi_conn.py b/nova/virt/vmwareapi_conn.py
index 6f68fd726..af547821f 100644
--- a/nova/virt/vmwareapi_conn.py
+++ b/nova/virt/vmwareapi_conn.py
@@ -198,10 +198,6 @@ class VMWareESXConnection(driver.ComputeDriver):
         """Sets the specified host's ability to accept new instances."""

         pass

 

-    def set_power_state(self, host, power_state):

-        """Reboots, shuts down or starts up the host."""

-        pass

-

     def plug_vifs(self, instance, network_info):

         """Plugs in VIFs to networks."""

         self._vmops.plug_vifs(instance, network_info)

diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 194c33d54..a90ae0128 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -1042,17 +1042,6 @@ class VMOps(object):
             return xenapi_resp.details[-1]
         return resp["status"]
 
-    def set_power_state(self, host, power_state):
-        """Reboots, shuts down or starts up the host."""
-        args = {"power_state": power_state}
-        xenapi_resp = self._call_xenhost("set_power_state", args)
-        try:
-            resp = json.loads(xenapi_resp)
-        except TypeError  as e:
-            # Already logged; return the message
-            return xenapi_resp.details[-1]
-        return resp["power_state"]
-
     def _call_xenhost(self, method, arg_dict):
         """There will be several methods that will need this general
         handling for interacting with the xenhost plugin, so this abstracts
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 468e12696..5962b4ff8 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -339,10 +339,6 @@ class XenAPIConnection(driver.ComputeDriver):
         """Sets the specified host's ability to accept new instances."""
         return self._vmops.set_host_enabled(host, enabled)
 
-    def set_power_state(self, host, power_state):
-        """Reboots, shuts down or starts up the host."""
-        return self._vmops.set_power_state(host, power_state)
-
 
 class XenAPISession(object):
     """The session to invoke XenAPI SDK calls"""