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>

diff --git a/tools/python/xen/xend/XendAPI.py b/tools/python/xen/xend/XendAPI.py
index ec527ef104a286c76950f07aa6d23eb289b14ea2..b357b07d095191e952295c0e8b092b87944749cd 100644 (file)
--- 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 da8504b4a530632b467465d52fe25a3f2e2ce19a..95d375164432d1d31adfaf02639f2902824bd661 100644 (file)
--- 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',