Merge "Fix handling of unimplemented host actions"

3 files changed, 0 insertions, 30 deletions

diff --git a/nova/virt/hyperv/driver.py b/nova/virt/hyperv/driver.py
index 3b0539159..d1b9904c4 100644
--- a/nova/virt/hyperv/driver.py
+++ b/nova/virt/hyperv/driver.py
@@ -131,10 +131,6 @@ class HyperVDriver(driver.ComputeDriver):
     def host_power_action(self, host, action):
         return self._hostops.host_power_action(host, action)
 
-    def set_host_enabled(self, host, enabled):
-        """Sets the specified host's ability to accept new instances."""
-        pass
-
     def snapshot(self, context, instance, name):
         self._snapshotops.snapshot(context, instance, name)
 
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 0802c0e94..708d0598a 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -2812,19 +2812,6 @@ class LibvirtDriver(driver.ComputeDriver):
         If 'refresh' is True, run update the stats first."""
         return self.host_state.get_host_stats(refresh=refresh)
 
-    def host_power_action(self, host, action):
-        """Reboots, shuts down or powers up the host."""
-        raise NotImplementedError()
-
-    def host_maintenance_mode(self, host, mode):
-        """Start/Stop host maintenance window. On start, it triggers
-        guest VMs evacuation."""
-        raise NotImplementedError()
-
-    def set_host_enabled(self, host, enabled):
-        """Sets the specified host's ability to accept new instances."""
-        pass
-
     def get_host_uptime(self, host):
         """Returns the result of calling "uptime"."""
         #NOTE(dprince): host seems to be ignored for this call and in
diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py
index ee97416ec..f6aa91e85 100644
--- a/nova/virt/vmwareapi/driver.py
+++ b/nova/virt/vmwareapi/driver.py
@@ -199,19 +199,6 @@ class VMWareESXDriver(driver.ComputeDriver):
         """This method is supported only by libvirt."""
         return
 
-    def host_power_action(self, host, action):
-        """Reboots, shuts down or powers up the host."""
-        raise NotImplementedError()
-
-    def host_maintenance_mode(self, host, mode):
-        """Start/Stop host maintenance window. On start, it triggers
-        guest VMs evacuation."""
-        raise NotImplementedError()
-
-    def set_host_enabled(self, host, enabled):
-        """Sets the specified host's ability to accept new instances."""
-        raise NotImplementedError()
-
     def plug_vifs(self, instance, network_info):
         """Plug VIFs into networks."""
         self._vmops.plug_vifs(instance, network_info)