xenserver disable/enable host report error

[Guangya Liu (Jay Lau)]

When XenServer disable/enable host, the api set_host_enabled() need to get service info for the target host, but the rpc call of set_host_enabled() did not transfer host as parameter, this will cause the api call failed.

def set_host_enabled(self, host, enabled):
        """Sets the specified host's ability to accept new instances."""
        # Since capabilities are gone, use service table to disable a node
        # in scheduler
        status = {'disabled': not enabled,
                'disabled_reason': 'set by xenapi host_state'
                }
        cntxt = context.get_admin_context()
        service = self._conductor_api.service_get_by_args(
                cntxt,
                host, <<<<<<<<<
                'nova-compute')
        self._conductor_api.service_update(
                cntxt,
                service,
                status)

        args = {"enabled": jsonutils.dumps(enabled)}
        response = call_xenhost(self._session, "set_host_enabled", args)
        return response.get("status", response)

======================================
    def set_host_enabled(self, ctxt, enabled, host):
        cctxt = self.client.prepare(server=host)
        return cctxt.call(ctxt, 'set_host_enabled', enabled=enabled) <<<<<<<<<< No host

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/56812

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/56895

[John Garbutt (johngarbutt)]

This is not in progress

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/56812
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=f4646b74532d3e75a105290e8333bff92eb838ad
Submitter: Jenkins
Branch: master

commit f4646b74532d3e75a105290e8333bff92eb838ad
Author: Jay Lau <email address hidden>
Date: Wed Jun 18 09:03:27 2014 -0400

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

    When disable/enable host with XenServer, the api of set_host_enabled()
    in XenServer driver needs to get service info for the target host, but
    the rpc call of set_host_enabled() did not transfer target host as
    parameter, this will cause the api call failed.

    This patch was let the API of set_host_enabled() use CONF.host.

    Closes-Bug: #1251943

    Change-Id: I2b6427df80ee3188d6f7c4eeb4d2e7be300f0126