ia64/xen-unstable

changeset 17731:51274688c000

Fix XendAPI VM_migrate parameters

This patch removes unused resource parameter and fixes the default
value for domain_migrate. Also removes tab indent in XendOptions.py.

Signed-off-by: Zhigang Wang <zhigang.x.wang@oracle.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon May 26 08:26:37 2008 +0100 (2008-05-26)
parents 9a7a6f729d2c
children 3544f12d22b2
files tools/python/xen/xend/XendAPI.py tools/python/xen/xend/XendOptions.py
line diff
     1.1 --- a/tools/python/xen/xend/XendAPI.py	Mon May 26 08:25:36 2008 +0100
     1.2 +++ b/tools/python/xen/xend/XendAPI.py	Mon May 26 08:26:37 2008 +0100
     1.3 @@ -1759,13 +1759,12 @@ class XendAPI(object):
     1.4          xendom = XendDomain.instance()
     1.5          xeninfo = xendom.get_vm_by_uuid(vm_ref)
     1.6  
     1.7 -        resource = other_config.get("resource", 0)
     1.8          port = other_config.get("port", 0)
     1.9 -        node = other_config.get("node", 0)
    1.10 -        ssl = other_config.get("ssl", 0)
    1.11 +        node = other_config.get("node", -1)
    1.12 +        ssl = other_config.get("ssl", None)
    1.13          
    1.14          xendom.domain_migrate(xeninfo.getDomid(), destination_url,
    1.15 -                              bool(live), resource, port, node, ssl)
    1.16 +                              bool(live), port, node, ssl)
    1.17          return xen_api_success_void()
    1.18  
    1.19      def VM_save(self, _, vm_ref, dest, checkpoint):
     2.1 --- a/tools/python/xen/xend/XendOptions.py	Mon May 26 08:25:36 2008 +0100
     2.2 +++ b/tools/python/xen/xend/XendOptions.py	Mon May 26 08:26:37 2008 +0100
     2.3 @@ -222,7 +222,7 @@ class XendOptions:
     2.4                                     self.xend_relocation_port_default)
     2.5  
     2.6      def get_xend_relocation_ssl_port(self):
     2.7 -	"""Get the port xend listens at for ssl connection to its relocation
     2.8 +        """Get the port xend listens at for ssl connection to its relocation
     2.9          server.
    2.10          """
    2.11          return self.get_config_int('xend-relocation-ssl-port',