[Libvirt-cim] [PATCH] [TEST] #2 Fix LXC connection uri
# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1251145693 25200
# Node ID 57536e0647e4aa08a824e34aeddfb204c6d84f4b
# Parent c338efef06278a9a40a90f07a34750ec50c49939
[TEST] #2 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"
Updates:
-Remove commented out lines of old code
diff -r c338efef0627 -r 57536e0647e4 suites/libvirt-cim/lib/XenKvmLib/vxml.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Wed Aug 19 09:03:40 2009 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Mon Aug 24 13:28:13 2009 -0700
@@ -151,7 +151,7 @@
elif vir_type == 'kvm':
self.vuri = 'qemu:///system'
elif vir_type == 'lxc':
- self.vuri = 'lxc:///system'
+ self.vuri = 'lxc:///'
def run(self, ip, vcmd, param):
file_arg_cmds = ['define', 'create', 'net-create',
'pool-create']
@@ -572,17 +572,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 c338efef0627 -r 57536e0647e4 suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py
--- a/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Wed Aug 19 09:03:40 2009 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Mon Aug 24 13:28:13 2009 -0700
@@ -313,7 +313,7 @@
if virt == "KVM":
return "qemu:///system"
if virt == "LXC":
- return "lxc:///system"
+ return "lxc:///"
return ""
def run_remote_guest(ip, domain, command):