WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH 2/2]Add -s --ssl option to xm migrate

To: xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-devel] [PATCH 2/2]Add -s --ssl option to xm migrate
From: Zhigang Wang <zhigang.x.wang@xxxxxxxxxx>
Date: Fri, 23 May 2008 17:23:52 +0800
Delivery-date: Fri, 23 May 2008 02:25:47 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Thunderbird 2.0.0.14 (X11/20080421)
hi

This patch adds -s --ssl option to xm migrate. It will override
xend-relocation-ssl setting in /etc/xen/xend-config.sxp.

When mix deploy xen 3.2 and xen 3.3 servers, it's convenient to have a command
line option rather than modify /etc/xen/xend-config.sxp every time.

Signed-off-by: Zhigang Wang <zhigang.x.wang@xxxxxxxxxx>

thanks,

zhigang


Add -s --ssl option to xm migrate

This patch adds -s --ssl option to xm migrate. It will override
xend-relocation-ssl setting in /etc/xen/xend-config.sxp.

When mix deploy xen 3.2 and xen 3.3 servers, it's convenient to have a command
line option rather than modify /etc/xen/xend-config.sxp every time.

Signed-off-by: Zhigang Wang <zhigang.x.wang@xxxxxxxxxx>

diff -Nura xen-unstable.bak/tools/python/xen/xend/server/SrvDomain.py 
xen-unstable/tools/python/xen/xend/server/SrvDomain.py
--- xen-unstable.bak/tools/python/xen/xend/server/SrvDomain.py  2008-05-22 
17:28:51.000000000 +0800
+++ xen-unstable/tools/python/xen/xend/server/SrvDomain.py      2008-05-23 
15:12:09.000000000 +0800
@@ -115,7 +115,8 @@
                     [['dom',         'int'],
                      ['destination', 'str'],
                      ['live',        'int'],
-                     ['port',        'int']])
+                     ['port',        'int'],
+                     ['ssl',         'int']])
         return fn(req.args, {'dom': self.dom.domid})
 
     def op_pincpu(self, _, req):
diff -Nura xen-unstable.bak/tools/python/xen/xend/XendAPI.py 
xen-unstable/tools/python/xen/xend/XendAPI.py
--- xen-unstable.bak/tools/python/xen/xend/XendAPI.py   2008-05-22 
17:28:51.000000000 +0800
+++ xen-unstable/tools/python/xen/xend/XendAPI.py       2008-05-23 
15:07:56.000000000 +0800
@@ -1762,9 +1762,10 @@
         resource = other_config.get("resource", 0)
         port = other_config.get("port", 0)
         node = other_config.get("node", 0)
+        ssl = other_config.get("ssl", 0)
         
         xendom.domain_migrate(xeninfo.getDomid(), destination_url,
-                              bool(live), resource, port, node)
+                              bool(live), resource, port, node, ssl)
         return xen_api_success_void()
 
     def VM_save(self, _, vm_ref, dest, checkpoint):
diff -Nura xen-unstable.bak/tools/python/xen/xend/XendDomain.py 
xen-unstable/tools/python/xen/xend/XendDomain.py
--- xen-unstable.bak/tools/python/xen/xend/XendDomain.py        2008-05-23 
12:51:10.000000000 +0800
+++ xen-unstable/tools/python/xen/xend/XendDomain.py    2008-05-23 
15:20:06.000000000 +0800
@@ -1258,7 +1258,7 @@
 
         return val       
 
-    def domain_migrate(self, domid, dst, live=False, port=0, node=-1):
+    def domain_migrate(self, domid, dst, live=False, port=0, node=-1, 
ssl=None):
         """Start domain migration.
         
         @param domid: Domain ID or Name
@@ -1269,6 +1269,8 @@
         @type port: int        
         @keyword live: Live migration
         @type live: bool
+        @keyword ssl: use ssl connection
+        @type ssl: bool
         @rtype: None
         @keyword node: use node number for target
         @rtype: int 
@@ -1294,7 +1296,9 @@
             """ Make sure there's memory free for enabling shadow mode """
             dominfo.checkLiveMigrateMemory()
 
-        ssl = xoptions.get_xend_relocation_ssl()
+        if ssl is None:
+            ssl = xoptions.get_xend_relocation_ssl()
+
         if ssl:
             from OpenSSL import SSL
             from xen.web import connection
diff -Nura xen-unstable.bak/tools/python/xen/xm/migrate.py 
xen-unstable/tools/python/xen/xm/migrate.py
--- xen-unstable.bak/tools/python/xen/xm/migrate.py     2008-05-22 
17:28:51.000000000 +0800
+++ xen-unstable/tools/python/xen/xm/migrate.py 2008-05-23 14:59:42.000000000 
+0800
@@ -47,6 +47,10 @@
           fn=set_int, default=-1,
           use="Use specified NUMA node on target.")
 
+gopts.opt('ssl', short='s',
+          fn=set_true, default=None,
+          use="Use ssl connection for migration.")
+
 def help():
     return str(gopts)
     
@@ -65,11 +69,13 @@
         vm_ref = get_single_vm(dom)
         other_config = {
             "port":     opts.vals.port,
-            "node":     opts.vals.node
+            "node":     opts.vals.node,
+            "ssl":      opts.vals.ssl
             }
         server.xenapi.VM.migrate(vm_ref, dst, bool(opts.vals.live),
                                  other_config)
     else:
         server.xend.domain.migrate(dom, dst, opts.vals.live,
                                    opts.vals.port,
-                                   opts.vals.node)
+                                   opts.vals.node,
+                                   opts.vals.ssl)
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
<Prev in Thread] Current Thread [Next in Thread>