[PATCH 0 of 2] Use libvirt's default image path instead of /tmp

Ideally, this should be a configuration option the user can set in the .cimtestrc file. However, as a default, we should use something more standard than /tmp.

# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1255985310 25200 # Node ID 32e63009d0906fb9cf79799205e6d4ea84e18117 # Parent a159cb05bdc7d78861d4b13d3d3f0d42fbb41026 [TEST] Change default image creation location from /tmp... To /var/lib/libvirt/images. Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r a159cb05bdc7 -r 32e63009d090 suites/libvirt-cim/images/Makefile --- a/suites/libvirt-cim/images/Makefile Tue Oct 13 11:08:06 2009 -0700 +++ b/suites/libvirt-cim/images/Makefile Mon Oct 19 13:48:30 2009 -0700 @@ -19,13 +19,15 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -DEFAULT_KERNEL = /tmp/default-xen-kernel -DEFAULT_INITRD = /tmp/default-xen-initrd -DEFAULT_DIMAGE = /tmp/default-xen-dimage -DEFAULT_KVMIMG = /tmp/default-kvm-dimage +DEFAULT_IMG_LOC = /var/lib/libvirt/images -DEFAULT_LXCINIT = /tmp/cimtest_lxc_init -DEFAULT_LXC_MNT_DIR = /tmp/lxc_files +DEFAULT_KERNEL = $(DEFAULT_IMG_LOC)/default-xen-kernel +DEFAULT_INITRD = $(DEFAULT_IMG_LOC)/default-xen-initrd +DEFAULT_DIMAGE = $(DEFAULT_IMG_LOC)/default-xen-dimage +DEFAULT_KVMIMG = $(DEFAULT_IMG_LOC)/default-kvm-dimage + +DEFAULT_LXCINIT = $(DEFAULT_IMG_LOC)/cimtest_lxc_init +DEFAULT_LXC_MNT_DIR = $(DEFAULT_IMG_LOC)/lxc_files SECONDARY_DIMAGE = $(DEFAULT_DIMAGE).2ND SECONDARY_KVMIMG = $(DEFAULT_KVMIMG).2ND @@ -72,7 +74,7 @@ chmod 755 $(DEFAULT_LXCINIT) $(DEFAULT_LXC_MNT_DIR): - mkdir /tmp/lxc_files + mkdir $(DEFAULT_IMG_LOC)/lxc_files clean: rm -f $(DEFAULT_KERNEL) $(DEFAULT_INITRD) $(DEFAULT_DIMAGE) $(SECONDARY_DIMAGE)

Kaitlin Rupert wrote:
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1255985310 25200 # Node ID 32e63009d0906fb9cf79799205e6d4ea84e18117 # Parent a159cb05bdc7d78861d4b13d3d3f0d42fbb41026 [TEST] Change default image creation location from /tmp...
To /var/lib/libvirt/images.
Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com>
diff -r a159cb05bdc7 -r 32e63009d090 suites/libvirt-cim/images/Makefile --- a/suites/libvirt-cim/images/Makefile Tue Oct 13 11:08:06 2009 -0700 +++ b/suites/libvirt-cim/images/Makefile Mon Oct 19 13:48:30 2009 -0700 @@ -19,13 +19,15 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -DEFAULT_KERNEL = /tmp/default-xen-kernel -DEFAULT_INITRD = /tmp/default-xen-initrd -DEFAULT_DIMAGE = /tmp/default-xen-dimage -DEFAULT_KVMIMG = /tmp/default-kvm-dimage +DEFAULT_IMG_LOC = /var/lib/libvirt/images
-DEFAULT_LXCINIT = /tmp/cimtest_lxc_init -DEFAULT_LXC_MNT_DIR = /tmp/lxc_files +DEFAULT_KERNEL = $(DEFAULT_IMG_LOC)/default-xen-kernel +DEFAULT_INITRD = $(DEFAULT_IMG_LOC)/default-xen-initrd +DEFAULT_DIMAGE = $(DEFAULT_IMG_LOC)/default-xen-dimage +DEFAULT_KVMIMG = $(DEFAULT_IMG_LOC)/default-kvm-dimage + +DEFAULT_LXCINIT = $(DEFAULT_IMG_LOC)/cimtest_lxc_init +DEFAULT_LXC_MNT_DIR = $(DEFAULT_IMG_LOC)/lxc_files
SECONDARY_DIMAGE = $(DEFAULT_DIMAGE).2ND SECONDARY_KVMIMG = $(DEFAULT_KVMIMG).2ND @@ -72,7 +74,7 @@ chmod 755 $(DEFAULT_LXCINIT)
$(DEFAULT_LXC_MNT_DIR): - mkdir /tmp/lxc_files + mkdir $(DEFAULT_IMG_LOC)/lxc_files
clean: rm -f $(DEFAULT_KERNEL) $(DEFAULT_INITRD) $(DEFAULT_DIMAGE) $(SECONDARY_DIMAGE)
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim
-- Thanks and Regards, Deepti B. Kalakeri IBM Linux Technology Center deeptik@linux.vnet.ibm.com

# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1255985311 25200 # Node ID 4047a548c85f56c139dc32cbf6953337a0789482 # Parent 32e63009d0906fb9cf79799205e6d4ea84e18117 [TEST] Update tests to expect images to be in /var/lib/libvirt/images Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 32e63009d090 -r 4047a548c85f suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Mon Oct 19 13:48:30 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Mon Oct 19 13:48:31 2009 -0700 @@ -72,7 +72,7 @@ default_mallocunits="MegaBytes" -_image_dir = '/tmp' +_image_dir = '/var/lib/libvirt/images' # vxml.XenXML Xen_kernel_path = os.path.join(_image_dir, 'default-xen-kernel') diff -r 32e63009d090 -r 4047a548c85f suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Mon Oct 19 13:48:30 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Mon Oct 19 13:48:31 2009 -0700 @@ -316,7 +316,7 @@ pool = self.add_sub_node(self.xdoc, 'pool', type='dir') self.add_sub_node(pool, 'name', self.pool_name) target = self.add_sub_node(pool, 'target') - self.add_sub_node(target, 'path', '/tmp') + self.add_sub_node(target, 'path', const._image_dir) def create_vpool(self): return self.run(self.server, 'pool-create', self.xml_string)

+1 Kaitlin Rupert wrote:
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1255985311 25200 # Node ID 4047a548c85f56c139dc32cbf6953337a0789482 # Parent 32e63009d0906fb9cf79799205e6d4ea84e18117 [TEST] Update tests to expect images to be in /var/lib/libvirt/images
Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com>
diff -r 32e63009d090 -r 4047a548c85f suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Mon Oct 19 13:48:30 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Mon Oct 19 13:48:31 2009 -0700 @@ -72,7 +72,7 @@ default_mallocunits="MegaBytes"
-_image_dir = '/tmp' +_image_dir = '/var/lib/libvirt/images'
# vxml.XenXML Xen_kernel_path = os.path.join(_image_dir, 'default-xen-kernel') diff -r 32e63009d090 -r 4047a548c85f suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Mon Oct 19 13:48:30 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Mon Oct 19 13:48:31 2009 -0700 @@ -316,7 +316,7 @@ pool = self.add_sub_node(self.xdoc, 'pool', type='dir') self.add_sub_node(pool, 'name', self.pool_name) target = self.add_sub_node(pool, 'target') - self.add_sub_node(target, 'path', '/tmp') + self.add_sub_node(target, 'path', const._image_dir)
def create_vpool(self): return self.run(self.server, 'pool-create', self.xml_string)
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim
-- Thanks and Regards, Deepti B. Kalakeri IBM Linux Technology Center deeptik@linux.vnet.ibm.com
participants (2)
-
Deepti B Kalakeri
-
Kaitlin Rupert