aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-05-26 08:26:37 +0100
committerKeir Fraser <keir.fraser@citrix.com>2008-05-26 08:26:37 +0100
commit11b6a5dbe0eb69da943cb1709270d3bf71c2aa75 (patch)
tree6c34c5a49b11006794ba143530c76ac32e422ad0 /tools
parent101b0e44afad5d3d05390b7d2609005ba1ed4db2 (diff)
downloadxen-11b6a5dbe0eb69da943cb1709270d3bf71c2aa75.tar.gz
xen-11b6a5dbe0eb69da943cb1709270d3bf71c2aa75.tar.bz2
xen-11b6a5dbe0eb69da943cb1709270d3bf71c2aa75.zip
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>
Diffstat (limited to 'tools')
-rw-r--r--tools/python/xen/xend/XendAPI.py7
-rw-r--r--tools/python/xen/xend/XendOptions.py2
2 files changed, 4 insertions, 5 deletions
diff --git a/tools/python/xen/xend/XendAPI.py b/tools/python/xen/xend/XendAPI.py
index ec527ef104..b357b07d09 100644
--- a/tools/python/xen/xend/XendAPI.py
+++ b/tools/python/xen/xend/XendAPI.py
@@ -1759,13 +1759,12 @@ class XendAPI(object):
xendom = XendDomain.instance()
xeninfo = xendom.get_vm_by_uuid(vm_ref)
- resource = other_config.get("resource", 0)
port = other_config.get("port", 0)
- node = other_config.get("node", 0)
- ssl = other_config.get("ssl", 0)
+ node = other_config.get("node", -1)
+ ssl = other_config.get("ssl", None)
xendom.domain_migrate(xeninfo.getDomid(), destination_url,
- bool(live), resource, port, node, ssl)
+ bool(live), port, node, ssl)
return xen_api_success_void()
def VM_save(self, _, vm_ref, dest, checkpoint):
diff --git a/tools/python/xen/xend/XendOptions.py b/tools/python/xen/xend/XendOptions.py
index da8504b4a5..95d3751644 100644
--- a/tools/python/xen/xend/XendOptions.py
+++ b/tools/python/xen/xend/XendOptions.py
@@ -222,7 +222,7 @@ class XendOptions:
self.xend_relocation_port_default)
def get_xend_relocation_ssl_port(self):
- """Get the port xend listens at for ssl connection to its relocation
+ """Get the port xend listens at for ssl connection to its relocation
server.
"""
return self.get_config_int('xend-relocation-ssl-port',