[Libvirt-cim] [PATCH] [TEST] Fix LXC connection uri

Kaitlin Rupert kaitlin at linux.vnet.ibm.com
Tue Aug 18 18:21:10 UTC 2009


# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1250619664 25200
# Node ID 5d129fff36960c419dda641692c9f5b8682c5a3c
# Parent  5c08aeea7fa147dea06d6b1f0c75c2de70b4b0ae
[TEST] Fix LXC connection uri...

And be sure not to pass a graphics device when creating a Containers guest.
These changes are dependent on libvirt-cim patch "Fix LXC connection uri,
remove default graphics device"

diff -r 5c08aeea7fa1 -r 5d129fff3696 suites/libvirt-cim/lib/XenKvmLib/vxml.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Mon Aug 17 04:16:50 2009 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py	Tue Aug 18 11:21:04 2009 -0700
@@ -151,7 +151,8 @@
         elif vir_type == 'kvm':
             self.vuri = 'qemu:///system'
         elif vir_type == 'lxc':
-            self.vuri = 'lxc:///system'
+            #self.vuri = 'lxc:///system'
+            self.vuri = 'lxc:///'
 
     def run(self, ip, vcmd, param):
         file_arg_cmds = ['define', 'create', 'net-create', 'pool-create']
@@ -572,17 +573,18 @@
             self.pasd = vsms.get_pasd_class(virt)(name=dom_name)
             self.dasd = vsms.get_dasd_class(virt)(disk_dev, disk_source,
                                                   dom_name)
+            self.gasd = None 
         else:
             self.pasd = vsms.get_pasd_class(virt)(vcpu=vcpus, name=dom_name)
             self.dasd = vsms.get_dasd_class(virt)(disk_dev, disk_source,
                                                   dom_name, emu_type)
+            self.gasd = vsms.get_gasd_class(virt)(name=dom_name, 
+                                                  res_sub_type=grstype, ip=ip,
+                                                  lport=port_num, keymap=kmap, 
+                                                  vnc_passwd=vnc_passwd)
         self.masd = vsms.get_masd_class(virt)(megabytes=mem, 
                                               mallocunits=mem_allocunits,
                                               name=dom_name)
-        self.gasd = vsms.get_gasd_class(virt)(name=dom_name, 
-                                              res_sub_type=grstype, ip=ip,
-                                              lport=port_num, keymap=kmap, 
-                                              vnc_passwd=vnc_passwd)
         self.iasd = vsms.get_iasd_class(virt)(name=dom_name, 
                                               res_sub_type=irstype, 
                                               bus_type=btype)
diff -r 5c08aeea7fa1 -r 5d129fff3696 suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py
--- a/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py	Mon Aug 17 04:16:50 2009 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py	Tue Aug 18 11:21:04 2009 -0700
@@ -313,7 +313,8 @@
     if virt == "KVM":
         return "qemu:///system"
     if virt == "LXC":
-        return "lxc:///system"
+        #return "lxc:///system"
+        return "lxc:///"
     return ""
 
 def run_remote_guest(ip, domain, command):




More information about the Libvirt-cim mailing list