[Xen-changelog] [xen-unstable] Fix XendAPI VM_migrate parameters

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1211786797 -3600
# Node ID 51274688c00088f2f6f194a9c7c50c54339aa1eb
# Parent  9a7a6f729d2c0352a772aa274454dee1c96faa5a
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@xxxxxxxxxx>
---
 tools/python/xen/xend/XendAPI.py     |    7 +++----
 tools/python/xen/xend/XendOptions.py |    2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff -r 9a7a6f729d2c -r 51274688c000 tools/python/xen/xend/XendAPI.py
--- a/tools/python/xen/xend/XendAPI.py  Mon May 26 08:25:36 2008 +0100
+++ b/tools/python/xen/xend/XendAPI.py  Mon May 26 08:26:37 2008 +0100
@@ -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 -r 9a7a6f729d2c -r 51274688c000 tools/python/xen/xend/XendOptions.py
--- a/tools/python/xen/xend/XendOptions.py      Mon May 26 08:25:36 2008 +0100
+++ b/tools/python/xen/xend/XendOptions.py      Mon May 26 08:26:37 2008 +0100
@@ -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',

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog