Merge "VMware: bug fix for host operations when using VMwareVCDriver"

nova/tests/virt/vmwareapi/test_driver_api.py

@@ -1855,6 +1855,18 @@ class VMwareAPIVCDriverTestCase(VMwareAPIVMTestCase):
         vcdriver._session.vim.client.service.Logout.assert_called_once()
         mock_logger.debug.assert_called_once()
 
+    def test_host_power_action(self):
+        self.assertRaises(NotImplementedError,
+                          self.conn.host_power_action, 'host', 'action')
+
+    def test_host_maintenance_mode(self):
+        self.assertRaises(NotImplementedError,
+                          self.conn.host_maintenance_mode, 'host', 'mode')
+
+    def test_set_host_enabled(self):
+        self.assertRaises(NotImplementedError,
+                          self.conn.set_host_enabled, 'host', 'state')
+
     def test_datastore_regex_configured(self):
         for node in self.conn._resources.keys():
             self.assertEqual(self.conn._datastore_regex,

nova/virt/vmwareapi/driver.py

@@ -706,6 +706,27 @@ class VMwareVCDriver(VMwareESXDriver):
         _vmops = self._get_vmops_for_compute_node(instance['node'])
         return _vmops.get_diagnostics(instance)
 
+    def host_power_action(self, host, action):
+        """Host operations not supported by VC driver.
+
+        This needs to override the ESX driver implementation.
+        """
+        raise NotImplementedError()
+
+    def host_maintenance_mode(self, host, mode):
+        """Host operations not supported by VC driver.
+
+        This needs to override the ESX driver implementation.
+        """
+        raise NotImplementedError()
+
+    def set_host_enabled(self, host, enabled):
+        """Host operations not supported by VC driver.
+
+        This needs to override the ESX driver implementation.
+        """
+        raise NotImplementedError()
+
     def inject_network_info(self, instance, network_info):
         """inject network info for specified instance."""
         _vmops = self._get_vmops_for_compute_node(instance['node'])