Merge "XenAPI: disable/enable host will be failed when using XenServer"

nova/tests/virt/xenapi/test_xenapi.py

@@ -2032,15 +2032,17 @@ class XenAPIHostTestCase(stubs.XenAPITestBase):
                                False, 'off_maintenance')
 
     def test_set_enable_host_enable(self):
-        _create_service_entries(self.context, values={'nova': ['host']})
+        _create_service_entries(self.context, values={'nova': ['fake-mini']})
         self._test_host_action(self.conn.set_host_enabled, True, 'enabled')
-        service = db.service_get_by_args(self.context, 'host', 'nova-compute')
+        service = db.service_get_by_args(self.context, 'fake-mini',
+                                         'nova-compute')
         self.assertEqual(service.disabled, False)
 
     def test_set_enable_host_disable(self):
-        _create_service_entries(self.context, values={'nova': ['host']})
+        _create_service_entries(self.context, values={'nova': ['fake-mini']})
         self._test_host_action(self.conn.set_host_enabled, False, 'disabled')
-        service = db.service_get_by_args(self.context, 'host', 'nova-compute')
+        service = db.service_get_by_args(self.context, 'fake-mini',
+                                         'nova-compute')
         self.assertEqual(service.disabled, True)
 
     def test_get_host_uptime(self):

nova/virt/xenapi/driver.py

@@ -633,8 +633,8 @@ class XenAPIDriver(driver.ComputeDriver):
             raise NotImplementedError(msg)
 
     def set_host_enabled(self, host, enabled):
-        """Sets the specified host's ability to accept new instances."""
-        return self._host.set_host_enabled(host, enabled)
+        """Sets the compute host's ability to accept new instances."""
+        return self._host.set_host_enabled(enabled)
 
     def get_host_uptime(self, host):
         """Returns the result of calling "uptime" on the target host."""

nova/virt/xenapi/host.py

@@ -19,6 +19,8 @@ Management class for host-related functions (start, reboot, etc).
 
 import re
 
+from oslo.config import cfg
+
 from nova.compute import task_states
 from nova.compute import vm_states
 from nova import context
@@ -33,6 +35,7 @@ from nova.pci import pci_whitelist
 from nova.virt.xenapi import pool_states
 from nova.virt.xenapi import vm_utils
 
+CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 
@@ -113,12 +116,13 @@ class Host(object):
             raise exception.NoValidHost(reason='Unable to find suitable '
                                                    'host for VMs evacuation')
 
-    def set_host_enabled(self, host, enabled):
-        """Sets the specified host's ability to accept new instances."""
+    def set_host_enabled(self, enabled):
+        """Sets the compute host's ability to accept new instances."""
         # Since capabilities are gone, use service table to disable a node
         # in scheduler
         cntxt = context.get_admin_context()
-        service = service_obj.Service.get_by_args(cntxt, host, 'nova-compute')
+        service = service_obj.Service.get_by_args(cntxt, CONF.host,
+                                                  'nova-compute')
         service.disabled = not enabled
         service.disabled_reason = 'set by xenapi host_state'
         service.save()