[PATCH]Fix XendAPI VM_migrate parameters

[Zhigang Wang <zhigang.x.wang@oracle.com>]

[-- Attachment #1: Type: text/plain, Size: 217 bytes --]

Hi,

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>

regards,

zhigang

[-- Attachment #2: xen-fix-xendapi-vm-migrate-param.patch --]
[-- Type: text/x-patch, Size: 1929 bytes --]

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 -Nurap xen-unstable.orig/tools/python/xen/xend/XendAPI.py xen-unstable/tools/python/xen/xend/XendAPI.py
--- xen-unstable.orig/tools/python/xen/xend/XendAPI.py	2008-05-26 09:20:58.000000000 +0800
+++ xen-unstable/tools/python/xen/xend/XendAPI.py	2008-05-26 09:29:19.000000000 +0800
@@ -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 -Nurap xen-unstable.orig/tools/python/xen/xend/XendOptions.py xen-unstable/tools/python/xen/xend/XendOptions.py
--- xen-unstable.orig/tools/python/xen/xend/XendOptions.py	2008-05-26 09:20:59.000000000 +0800
+++ xen-unstable/tools/python/xen/xend/XendOptions.py	2008-05-26 09:28:31.000000000 +0800
@@ -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',

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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