- Devel - libvirt List Archives

[libvirt] [test-API][PATCH] Add logical volume download and upload cases
by Wayne Sun 15 Jan '13

15 Jan '13

This is for logical volume download and upload testing. * using download and upload API under class virStream. they are functions act as same with download/upload APIs under class virStorageVol, just different entrance. * using logical volume specified xml to create volume. no need to provide volume format. * check method is the same with dir vol download/upload cases. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/storage_logical_vol_upload_download.conf | 179 ++++++++++++++++++++++++ repos/storage/logical_vol_download.py | 125 +++++++++++++++++ repos/storage/logical_vol_upload.py | 152 ++++++++++++++++++++ 3 files changed, 456 insertions(+), 0 deletions(-) create mode 100644 cases/storage_logical_vol_upload_download.conf create mode 100644 repos/storage/logical_vol_download.py create mode 100644 repos/storage/logical_vol_upload.py diff --git a/cases/storage_logical_vol_upload_download.conf b/cases/storage_logical_vol_upload_download.conf new file mode 100644 index 0000000..51b640e --- /dev/null +++ b/cases/storage_logical_vol_upload_download.conf @@ -0,0 +1,179 @@ +storage:define_logical_pool + poolname + $defaultpoolname + sourcename + $defaultpoolname + sourcepath + $defaultpartition + +storage:build_logical_pool + poolname + $defaultpoolname + +storage:activate_pool + poolname + $defaultpoolname + +storage:logical_vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50 + offset + 0 + length + 0 +clean + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:logical_vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50 + offset + 0 + length + 1048576 +clean + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:logical_vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50 + offset + 1048576 + length + 0 +clean + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:logical_vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50 + offset + 1048576 + length + 1048576 +clean + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:logical_vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50 + offset + 0 + length + 0 +clean + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:logical_vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50 + offset + 0 + length + 1048576 +clean + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:logical_vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50 + offset + 1048576 + length + 0 +clean + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:logical_vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50 + offset + 1048576 + length + 1048576 +clean + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:destroy_pool + poolname + $defaultpoolname + +storage:delete_logical_pool + poolname + $defaultpoolname + +storage:undefine_pool + poolname + $defaultpoolname diff --git a/repos/storage/logical_vol_download.py b/repos/storage/logical_vol_download.py new file mode 100644 index 0000000..9797f36 --- /dev/null +++ b/repos/storage/logical_vol_download.py @@ -0,0 +1,125 @@ +#!/usr/bin/env python +# logical storage volume download testing + +import os +import string +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('poolname', 'volname', 'capacity', 'offset', 'length',) +optional_params = {'xml' : 'xmls/logical_volume.xml', + } + +def get_pool_path(poolobj): + """ get pool xml description + """ + poolxml = poolobj.XMLDesc(0) + + logger.debug("the xml description of pool is %s" % poolxml) + + doc = minidom.parseString(poolxml) + path_element = doc.getElementsByTagName('path')[0] + textnode = path_element.childNodes[0] + path_value = textnode.data + + return path_value + +def write_file(path, capacity): + """write test data to file + """ + logger.info("write %sM data into file %s" % (capacity, path)) + f = open(path, 'w') + datastr = ''.join(string.lowercase + string.uppercase + + string.digits + '.' + '\n') + repeat = capacity / 64 + data = ''.join(repeat * datastr) + f.write(data) + f.close() + +def handler(stream, data, file_): + return file_.write(data) + +def logical_vol_download(params): + """test volume download and check""" + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + offset = int(params['offset']) + length = int(params['length']) + capacity = int(params['capacity']) + xmlstr = params['xml'] + + logger.info("the poolname is %s, volname is %s" % + (poolname, volname)) + logger.info("download offset is: %s" % offset) + logger.info("the data length to download is: %s" % length) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + volume_path = path_value + "/" + volname + logger.debug("volume target path: %s" % volume_path) + + xmlstr = xmlstr.replace('TARGETPATH', volume_path) + logger.debug("volume xml:\n%s" % xmlstr) + + logger.info("create %s logical storage volume" % volname) + vol = poolobj.createXML(xmlstr, 0) + logger.debug("current created storage volume: %s" % + poolobj.listVolumes()) + + write_file(volume_path, capacity) + origdigest = utils.digest(volume_path, offset, length) + logger.debug("the md5 hex digest of data read from %s is: %s" % + (volume_path, origdigest)) + + st = conn.newStream(0) + + test_path = path_value + "/" + "vol_test" + + f = open(test_path, 'w') + logger.info("start download") + st.download(vol, offset, length, 0) + logger.info("downloaded all data") + st.recvAll(handler, f) + logger.info("finished stream") + st.finish() + f.close() + + newdigest = utils.digest(test_path, 0, 0) + logger.debug("the md5 hex digest of data read from %s is: %s" % + (test_path, newdigest)) + + if origdigest == newdigest: + logger.info("file digests match, download succeed") + else: + logger.error("file digests not match, download failed") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 + +def logical_vol_download_clean(params): + """clean testing environment""" + poolname = params['poolname'] + volname = params['volname'] + + conn = sharedmod.libvirtobj['conn'] + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + test_path = path_value + "/" + "vol_test" + + if os.path.exists(test_path): + os.unlink(test_path) + + return 0 diff --git a/repos/storage/logical_vol_upload.py b/repos/storage/logical_vol_upload.py new file mode 100644 index 0000000..fc03ee6 --- /dev/null +++ b/repos/storage/logical_vol_upload.py @@ -0,0 +1,152 @@ +#!/usr/bin/env python +# logical storage volume upload testing, offset and length can +# only be chosen in 0 and 1048576. + +import os +import string +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('poolname', 'volname', 'capacity', 'offset', 'length',) +optional_params = {'xml' : 'xmls/logical_volume.xml', + } + +def get_pool_path(poolobj): + """ get pool xml description + """ + poolxml = poolobj.XMLDesc(0) + + logger.debug("the xml description of pool is %s" % poolxml) + + doc = minidom.parseString(poolxml) + path_element = doc.getElementsByTagName('path')[0] + textnode = path_element.childNodes[0] + path_value = textnode.data + + return path_value + +def write_file(path): + """write 1M test data to file + """ + logger.info("write 1M data into file %s" % path) + f = open(path, 'w') + datastr = ''.join(string.lowercase + string.uppercase + + string.digits + '.' + '\n') + data = ''.join(16384 * datastr) + f.write(data) + f.close() + +def handler(stream, data, file_): + return file_.read(data) + +def logical_vol_upload(params): + """test volume download and check""" + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + offset = int(params['offset']) + length = int(params['length']) + capacity = int(params['capacity']) + xmlstr = params['xml'] + + logger.info("the poolname is %s, volname is %s" % + (poolname, volname)) + logger.info("download offset is: %s" % offset) + logger.info("the data length to download is: %s" % length) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + volume_path = path_value + "/" + volname + logger.debug("volume target path: %s" % volume_path) + + xmlstr = xmlstr.replace('TARGETPATH', volume_path) + logger.debug("volume xml:\n%s" % xmlstr) + + logger.info("create %s logical storage volume" % volname) + vol = poolobj.createXML(xmlstr, 0) + logger.debug("current created storage volume: %s" % + poolobj.listVolumes()) + + test_path = path_value + "/" + "vol_test" + write_file(test_path) + olddigest = utils.digest(test_path, 0, 0) + logger.debug("the old file digest is: %s" % olddigest) + + if offset: + origdigestpre = utils.digest(volume_path, 0, offset) + else: + origdigestpre = '' + logger.debug("the original pre region digest is: %s" % origdigestpre) + + origdigestpost = utils.digest(volume_path, offset + 1024 * 1024, 0) + logger.debug("the original post region digest is: %s" % origdigestpost) + + st = conn.newStream(0) + + f = open(test_path, 'r') + logger.info("start upload") + st.upload(vol, offset, length, 0) + logger.info("sent all data") + st.sendAll(handler, f) + logger.info("finished stream") + st.finish() + f.close() + + newdigest = utils.digest(volume_path, offset, 1024 * 1024) + logger.debug("the new file digest is: %s" % olddigest) + + if offset: + newdigestpre = utils.digest(volume_path, 0, offset) + else: + newdigestpre = '' + logger.debug("the new pre region digest is: %s" % origdigestpre) + + newdigestpost = utils.digest(volume_path, offset + 1024 * 1024, 0) + logger.debug("the new post region digest is: %s" % origdigestpost) + + if newdigestpre == origdigestpre: + logger.info("file pre region digests match") + else: + logger.error("file pre region digests not match") + return 1 + + if olddigest == newdigest: + logger.info("file digests match") + else: + logger.error("file digests not match") + return 1 + + if newdigestpost == origdigestpost: + logger.info("file post region digests match") + else: + logger.error("file post region digests not match") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 + +def logical_vol_upload_clean(params): + """clean testing environment""" + poolname = params['poolname'] + volname = params['volname'] + + conn = sharedmod.libvirtobj['conn'] + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + test_path = path_value + "/" + "vol_test" + + if os.path.exists(test_path): + os.unlink(test_path) + + return 0 -- 1.7.1

2 1

[libvirt] [test-API][PATCH] Add volume resize case with delta flag
by Wayne Sun 15 Jan '13

15 Jan '13

Only storage backend for RBD (RADOS Block Device), FS and directory have the resizeVol function, so only testing dir volume here. Flags 'allocate' and 'shrik' are with bug: https://bugzilla.redhat.com/show_bug.cgi?id=804516 they are not supported yet, so leave the case for later. * using volume resize API with flag VIR_STORAGE_VOL_RESIZE_DELTA * using volume info API to get volume info and check * add dir volume resize conf Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/storage_dir_vol_resize_delta.conf | 47 +++++++++++++++++++ repos/storage/vol_resize_delta.py | 75 +++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 0 deletions(-) create mode 100644 cases/storage_dir_vol_resize_delta.conf create mode 100644 repos/storage/vol_resize_delta.py diff --git a/cases/storage_dir_vol_resize_delta.conf b/cases/storage_dir_vol_resize_delta.conf new file mode 100644 index 0000000..58e15bf --- /dev/null +++ b/cases/storage_dir_vol_resize_delta.conf @@ -0,0 +1,47 @@ +storage:create_dir_pool + poolname + $defaultpoolname + +storage:create_dir_volume + poolname + $defaultpoolname + volname + $defaultvolumename + volformat + $defaultvolumetype + capacity + $defaultvolumesize + +storage:vol_resize_delta + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 1M + +storage:vol_resize_delta + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 2G + +storage:vol_resize_delta + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 4096K + +storage:delete_dir_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:destroy_pool + poolname + $defaultpoolname diff --git a/repos/storage/vol_resize_delta.py b/repos/storage/vol_resize_delta.py new file mode 100644 index 0000000..a87941e --- /dev/null +++ b/repos/storage/vol_resize_delta.py @@ -0,0 +1,75 @@ +#!/usr/bin/env python +# volume resize testing with delta flags, libvirt storage +# driver only support dir now + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('poolname', 'volname', 'capacity',) +optional_params = {} + +def vol_resize_delta(params): + """test volume resize with delta flags""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + capacity = params['capacity'] + + logger.info("the poolname is %s, volname is %s" % + (poolname, volname)) + + logger.info("the capacity given is %s" % capacity) + out = utils.get_capacity_suffix_size(capacity) + capacity_val = out['capacity_byte'] + logger.debug("the capacity to byte is %s" % capacity_val) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + vol = poolobj.storageVolLookupByName(volname) + + logger.info("get volume info before resize") + out = vol.info() + pre_capacity = out[1] + pre_allocation = out[2] + logger.info("volume capacity is %s bytes, allocation is %s bytes" % + (pre_capacity, pre_allocation)) + + flag = libvirt.VIR_STORAGE_VOL_RESIZE_DELTA + logger.info("resize %s with capacity %s in pool %s using flag: %s" + % (volname, capacity, poolname, flag)) + + vol.resize(capacity_val, flag) + + logger.info("get volume info after resize") + out = vol.info() + post_capacity = out[1] + post_allocation = out[2] + logger.info("volume capacity is %s bytes, allocation is %s bytes" % + (post_capacity, post_allocation)) + + logger.info("check resize effect") + if post_capacity - pre_capacity == capacity_val: + logger.info("increased size is expected") + else: + logger.error("increase size not equal to set, resize failed") + return 1 + + if pre_allocation == post_allocation: + logger.info("allocation is expected") + else: + logger.error("allocation changed, resize failed") + return 1 + + logger.info("resize succeed") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 -- 1.7.1

2 1

[libvirt] [test-API][PATCH] Add find storage pool sources cases
by Wayne Sun 15 Jan '13

15 Jan '13

Add cases for testing findStoragePoolSources API * add 3 cases for storage type 'netfs', 'iscsi' and 'logical' * add 2 xmls for 'netfs' and 'iscsi' find 'logical' storage pool sources did not require xml start with source tag and xml could be empty * add test conf for find storage pool sources Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/find_storage_pool_sources.conf | 31 +++++++++++ repos/storage/find_iscsi_pool_sources.py | 72 ++++++++++++++++++++++++ repos/storage/find_logical_pool_sources.py | 82 ++++++++++++++++++++++++++++ repos/storage/find_netfs_pool_sources.py | 71 ++++++++++++++++++++++++ repos/storage/xmls/iscsi_pool_source.xml | 3 + repos/storage/xmls/netfs_pool_source.xml | 4 ++ 6 files changed, 263 insertions(+), 0 deletions(-) create mode 100644 cases/find_storage_pool_sources.conf create mode 100644 repos/storage/find_iscsi_pool_sources.py create mode 100644 repos/storage/find_logical_pool_sources.py create mode 100644 repos/storage/find_netfs_pool_sources.py create mode 100644 repos/storage/xmls/iscsi_pool_source.xml create mode 100644 repos/storage/xmls/netfs_pool_source.xml diff --git a/cases/find_storage_pool_sources.conf b/cases/find_storage_pool_sources.conf new file mode 100644 index 0000000..d2e86db --- /dev/null +++ b/cases/find_storage_pool_sources.conf @@ -0,0 +1,31 @@ +storage:find_iscsi_pool_sources + sourcehost + $iscsi_server + +storage:find_netfs_pool_sources + sourcehost + $nfs_server + +storage:define_logical_pool + poolname + $defaultpoolname + sourcename + $defaultpoolname + sourcepath + $defaultpartition + +storage:build_logical_pool + poolname + $defaultpoolname + +storage:find_logical_pool_sources + sourcepath + $defaultpartition + +storage:delete_logical_pool + poolname + $defaultpoolname + +storage:undefine_pool + poolname + $defaultpoolname diff --git a/repos/storage/find_iscsi_pool_sources.py b/repos/storage/find_iscsi_pool_sources.py new file mode 100644 index 0000000..4b758d2 --- /dev/null +++ b/repos/storage/find_iscsi_pool_sources.py @@ -0,0 +1,72 @@ +#!/usr/bin/env python +# Test finding storage pool source of 'iscsi' type + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('sourcehost',) +optional_params = {'xml' : 'xmls/iscsi_pool_source.xml', + } + +def check_pool_sources(host, xmlstr): + """check the iscsi sources with command: + iscsiadm --mode discovery --type sendtargets --portal + """ + source_val = [] + + doc = minidom.parseString(xmlstr) + for diskTag in doc.getElementsByTagName("source"): + device_element = diskTag.getElementsByTagName("device")[0] + attr = device_element.getAttributeNode('path') + path_val = attr.nodeValue + + source_val.append(path_val) + + logger.debug("pool source info list is: %s" % source_val) + + cmd = "iscsiadm --mode discovery --type sendtargets --portal %s:3260,1 |\ + awk -F' ' '{print $2}'" % host + ret, path_list = utils.exec_cmd(cmd, shell=True) + + logger.debug("iscsiadm command output list is: %s" % path_list) + + if source_val == path_list: + logger.info("source list matched with iscsiadm command output") + return 0 + else: + logger.error("source list did not match with iscsiadm command output") + return 1 + +def find_iscsi_pool_sources(params): + """Find iscsi type storage pool sources from xml""" + global logger + logger = params['logger'] + sourcehost = params['sourcehost'] + xmlstr = params['xml'] + + conn = sharedmod.libvirtobj['conn'] + try: + + logger.debug("storage source spec xml:\n%s" % xmlstr) + + logger.info("find pool sources of iscsi type") + source_xml = conn.findStoragePoolSources('iscsi', xmlstr, 0) + logger.info("pool sources xml description is:\n %s" % source_xml) + + ret = check_pool_sources(sourcehost, source_xml) + if ret: + logger.error("pool sources check failed") + return 1 + else: + logger.info("pool sources check succeed") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/storage/find_logical_pool_sources.py b/repos/storage/find_logical_pool_sources.py new file mode 100644 index 0000000..255d879 --- /dev/null +++ b/repos/storage/find_logical_pool_sources.py @@ -0,0 +1,82 @@ +#!/usr/bin/env python +# Test finding storage pool source of 'logical' type + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('sourcepath',) +optional_params = {'xml' : 'xmls/logical_pool.xml', + } + +def check_pool_sources(xmlstr): + """check the logical sources with command: + pvs --noheadings -o pv_name,vg_name + """ + source_val = {} + source_cmp = {} + + doc = minidom.parseString(xmlstr) + for diskTag in doc.getElementsByTagName("source"): + device_element = diskTag.getElementsByTagName("device")[0] + attr = device_element.getAttributeNode('path') + path_val = attr.nodeValue + + name_element = diskTag.getElementsByTagName("name")[0] + textnode = name_element.childNodes[0] + name_val = textnode.data + + source_val.update({path_val: name_val, }) + + logger.debug("pool source info dict is: %s" % source_val) + + cmd = "pvs --noheadings -o pv_name,vg_name | awk -F' ' '{print $1}'" + ret, path_list = utils.exec_cmd(cmd, shell=True) + + cmd = "pvs --noheadings -o pv_name,vg_name | awk -F' ' '{print $2}'" + ret, name_list = utils.exec_cmd(cmd, shell=True) + + for i in range(len(path_list)): + source_cmp.update({path_list[i]: name_list[i]}) + + logger.debug("pvs command output dict is: %s" % source_cmp) + + if source_val == source_cmp: + logger.info("source dict match with pvs command output") + return 0 + else: + logger.error("source dict did not match with pvs command output") + return 1 + +def find_logical_pool_sources(params): + """Find logical type storage pool sources from xml""" + global logger + logger = params['logger'] + sourcepath = params['sourcepath'] + xmlstr = params['xml'] + + conn = sharedmod.libvirtobj['conn'] + try: + + logger.debug("storage source spec xml:\n%s" % xmlstr) + + logger.info("find pool sources of logical type") + source_xml = conn.findStoragePoolSources('logical', xmlstr, 0) + logger.info("pool sources xml description is:\n %s" % source_xml) + + ret = check_pool_sources(source_xml) + if ret: + logger.error("pool sources check failed") + return 1 + else: + logger.info("pool sources check succeed") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/storage/find_netfs_pool_sources.py b/repos/storage/find_netfs_pool_sources.py new file mode 100644 index 0000000..bc71233 --- /dev/null +++ b/repos/storage/find_netfs_pool_sources.py @@ -0,0 +1,71 @@ +#!/usr/bin/env python +# Test finding storage pool source of 'netfs' type + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('sourcehost',) +optional_params = {'xml' : 'xmls/netfs_pool_source.xml', + } + +def check_pool_sources(host, xmlstr): + """check the netfs sources with command: + showmount --no-headers -e HOSTNAME + """ + source_val = [] + + doc = minidom.parseString(xmlstr) + for diskTag in doc.getElementsByTagName("source"): + device_element = diskTag.getElementsByTagName("dir")[0] + attr = device_element.getAttributeNode('path') + path_val = attr.nodeValue + + source_val.append(path_val) + + logger.debug("pool source info list is: %s" % source_val) + + cmd = "showmount --no-headers -e %s | awk -F' ' '{print $1}'" % host + ret, path_list = utils.exec_cmd(cmd, shell=True) + + logger.debug("showmount command output list is: %s" % path_list) + + if source_val == path_list: + logger.info("source list matched with showmount command output") + return 0 + else: + logger.error("source list did not match with showmount command output") + return 1 + +def find_netfs_pool_sources(params): + """Find netfs type storage pool sources from xml""" + global logger + logger = params['logger'] + sourcehost = params['sourcehost'] + xmlstr = params['xml'] + + conn = sharedmod.libvirtobj['conn'] + try: + + logger.debug("storage source spec xml:\n%s" % xmlstr) + + logger.info("find pool sources of netfs type") + source_xml = conn.findStoragePoolSources('netfs', xmlstr, 0) + logger.info("pool sources xml description is:\n %s" % source_xml) + + ret = check_pool_sources(sourcehost, source_xml) + if ret: + logger.error("pool sources check failed") + return 1 + else: + logger.info("pool sources check succeed") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/storage/xmls/iscsi_pool_source.xml b/repos/storage/xmls/iscsi_pool_source.xml new file mode 100644 index 0000000..93216c5 --- /dev/null +++ b/repos/storage/xmls/iscsi_pool_source.xml @@ -0,0 +1,3 @@ +<source> + <host name="SOURCEHOST"/> +</source> diff --git a/repos/storage/xmls/netfs_pool_source.xml b/repos/storage/xmls/netfs_pool_source.xml new file mode 100644 index 0000000..6a2aeea --- /dev/null +++ b/repos/storage/xmls/netfs_pool_source.xml @@ -0,0 +1,4 @@ +<source> + <host name="SOURCEHOST"/> + <format type="nfs"/> +</source> -- 1.7.1

2 1

[libvirt] [test-API][PATCH] Add the volume clone case
by Wayne Sun 15 Jan '13

15 Jan '13

This is for volume clone testing by using createXMLFrom API * add the vol_clone case under storage it is general for all pool types * add cases into confs: cases/storage_dir.conf cases/storage_logical.conf cases/storage_netfs.conf * add variable 'defaultvolclonename' in global.cfg Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/storage_dir.conf | 14 +++++++ cases/storage_logical.conf | 14 +++++++ cases/storage_netfs.conf | 14 +++++++ global.cfg | 2 + repos/storage/vol_clone.py | 81 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 125 insertions(+), 0 deletions(-) create mode 100644 repos/storage/vol_clone.py diff --git a/cases/storage_dir.conf b/cases/storage_dir.conf index dcac700..38b349d 100644 --- a/cases/storage_dir.conf +++ b/cases/storage_dir.conf @@ -20,6 +20,20 @@ storage:create_dir_volume capacity $defaultvolumesize +storage:vol_clone + poolname + $defaultpoolname + volname + $defaultvolumename + clonevolname + $defaultvolclonename + +storage:delete_dir_volume + poolname + $defaultpoolname + volname + $defaultvolclonename + storage:delete_dir_volume poolname $defaultpoolname diff --git a/cases/storage_logical.conf b/cases/storage_logical.conf index 3334abd..d374dfa 100644 --- a/cases/storage_logical.conf +++ b/cases/storage_logical.conf @@ -22,6 +22,20 @@ storage:create_logical_volume capacity $defaultvolumesize +storage:vol_clone + poolname + $defaultpoolname + volname + $defaultvolumename + clonevolname + $defaultvolclonename + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolclonename + storage:delete_logical_volume poolname $defaultpoolname diff --git a/cases/storage_netfs.conf b/cases/storage_netfs.conf index e764813..f486ff4 100644 --- a/cases/storage_netfs.conf +++ b/cases/storage_netfs.conf @@ -24,6 +24,20 @@ storage:create_netfs_volume capacity $defaultvolumesize +storage:vol_clone + poolname + $defaultpoolname + volname + $defaultvolumename + clonevolname + $defaultvolclonename + +storage:delete_netfs_volume + poolname + $defaultpoolname + volname + $defaultvolclonename + storage:delete_netfs_volume poolname $defaultpoolname diff --git a/global.cfg b/global.cfg index 9e28614..182acbd 100644 --- a/global.cfg +++ b/global.cfg @@ -156,6 +156,8 @@ defaultpoolname = test_api_pool defaultpoolpath = /var/lib/libvirt/images/dir_pool # default volume name for creating new volume defaultvolumename = test_api_volume +# default clone volume name for clone a volume +defaultvolclonename = test_clone_volume # default volume type for creating a new volume defaultvolumetype = raw # default volume capacity for creating a new volume diff --git a/repos/storage/vol_clone.py b/repos/storage/vol_clone.py new file mode 100644 index 0000000..abf5644 --- /dev/null +++ b/repos/storage/vol_clone.py @@ -0,0 +1,81 @@ +#!/usr/bin/env python +# volume clone testing + +import os +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('poolname', 'volname', 'clonevolname',) +optional_params = {} + +def prepare_clone_xml(xmlstr, volname): + """prepare clone xmldesc by replace name element + with clone souce volume xml + """ + doc = minidom.parseString(xmlstr) + oldname = doc.getElementsByTagName("name")[0] + + newname = doc.createElement('name') + newnameval = doc.createTextNode(volname) + newname.appendChild(newnameval) + + volume = doc.getElementsByTagName('volume')[0] + + volume.replaceChild(newname, oldname) + newxmlstr = doc.toxml() + + return newxmlstr + +def vol_clone(params): + """volume clone testing""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + clonevolname = params['clonevolname'] + + logger.info("the poolname is %s, volname is %s" % (poolname, volname)) + logger.info("the clone volume name is %s" % clonevolname) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + old_vol = poolobj.storageVolLookupByName(volname) + + xmlstr = old_vol.XMLDesc(0) + newxmlstr = prepare_clone_xml(xmlstr, clonevolname) + logger.debug("volume xml:\n%s" % newxmlstr) + + logger.info("clone volume %s from source volume %s" % + (clonevolname, volname)) + + old_volnum = poolobj.numOfVolumes() + + new_vol = poolobj.createXMLFrom(newxmlstr, old_vol, 0) + poolobj.refresh(0) + + new_volnum = poolobj.numOfVolumes() + + logger.debug("new cloned volume path is: %s" % new_vol.path()) + if os.access(new_vol.path(), os.R_OK): + logger.info("cloned volume path exist") + else: + logger.error("cloned volume path not exist") + return 1 + + if new_volnum > old_volnum: + logger.info("clone succeed") + else: + logger.error("clone failed") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 -- 1.7.1

2 1

[libvirt] [PATCH] docs: remove extra "
by Eric Blake 15 Jan '13

15 Jan '13

* tools/virsh.pod: Fix typo. --- Pushing under the trivial rule. tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 3687a4d..c9ebc8f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2095,7 +2095,7 @@ destroy and re-start the network. I<command> is one of "add-first", "add-last", "add" (a synonym for add-last), "delete", or "modify". -I<section> is one of ""bridge", "domain", "ip", "ip-dhcp-host", +I<section> is one of "bridge", "domain", "ip", "ip-dhcp-host", "ip-dhcp-range", "forward", "forward-interface", "forward-pf", "portgroup", "dns-host", "dns-txt", or "dns-srv", each section being named by a concatenation of the xml element hierarchy leading to the -- 1.8.0.2

1 0

[libvirt] [PATCH v2] Build breaker securityselinuxhelper.c
by John Ferlan 15 Jan '13

15 Jan '13

v2: syntax-check - need space on # include Commit 907a39e7 missed adding the WITH_ATTR around #include <attr/xattr.h> resulting in a build failure: CC libsecurityselinuxhelper_la-securityselinuxhelper.lo securityselinuxhelper.c:27:24: fatal error: attr/xattr.h: No such file or directory compilation terminated. make[2]: *** [libsecurityselinuxhelper_la-securityselinuxhelper.lo] Error 1 make[2]: Leaving directory `/home/jferlan/libvirt.work/tests' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/jferlan/libvirt.work' make: *** [all] Error 2 --- tests/securityselinuxhelper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index daad7dd..a9656a8 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -24,7 +24,9 @@ #include <string.h> #include <unistd.h> #include <errno.h> -#include <attr/xattr.h> +#if WITH_ATTR +# include <attr/xattr.h> +#endif /* -- 1.7.11.7

3 2

[libvirt] [PATCH] Don't try to include xattr.h if not available
by Guido Günther 15 Jan '13

15 Jan '13

--- tests/securityselinuxhelper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index abe4d7c..bd5ea87 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -24,7 +24,9 @@ #include <string.h> #include <unistd.h> #include <errno.h> -#include <attr/xattr.h> +#ifdef WITH_ATTR +# include <attr/xattr.h> +#endif /* -- 1.7.10.4

1 0

[libvirt] [ANNOUNCE] libvirt-glib 0.1.5 release
by Daniel P. Berrange 15 Jan '13

15 Jan '13

I am pleased to announce that a new release of the libvirt-glib package, version 0.1.5, is now available from ftp://libvirt.org/libvirt/glib/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) New in this release: - Add support for bridge interface types in guest XML - Add API to open a read-only connection - Add support for smartcard devices in guest XML - Remove storage volume from pool list after deleting it libvirt-glib comprises three distinct libraries: - libvirt-glib - Integrate with the GLib event loop and error handling - libvirt-gconfig - Representation of libvirt XML documents as GObjects - libvirt-gobject - Mapping of libvirt APIs into the GObject type system NB: While libvirt aims to be API/ABI stable forever, with libvirt-glib we are not yet guaranteeing that libvirt-glib libraries are API/ABI permanently stable. As of the 0.0.8 release, we have tentatively frozen the API/ABI with the intent of being longterm stable hereafter, but there is still a small chance we might find flaws requiring an API/ABI change. The likelihood of this is low, however, and we will strive to avoid it. Follow up comments about libvirt-glib should be directed to the regular libvir-list(a)redhat.com development list. Thanks to all the people involved in contributing to this release. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] Build breaker securityselinuxhelper.c
by John Ferlan 15 Jan '13

15 Jan '13

Commit 907a39e7 missed adding the WITH_ATTR around #include <attr/xattr.h> resulting in a build failure: CC libsecurityselinuxhelper_la-securityselinuxhelper.lo securityselinuxhelper.c:27:24: fatal error: attr/xattr.h: No such file or directory compilation terminated. make[2]: *** [libsecurityselinuxhelper_la-securityselinuxhelper.lo] Error 1 make[2]: Leaving directory `/home/jferlan/libvirt.work/tests' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/jferlan/libvirt.work' make: *** [all] Error 2 --- tests/securityselinuxhelper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index daad7dd..206d936 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -24,7 +24,9 @@ #include <string.h> #include <unistd.h> #include <errno.h> +#if WITH_ATTR #include <attr/xattr.h> +#endif /* -- 1.7.11.7

1 0

[libvirt] [PATCH] build: work around broken kernel header
by Eric Blake 15 Jan '13

15 Jan '13

I got this scary warning during ./configure on rawhide: checking linux/if_bridge.h usability... no checking linux/if_bridge.h presence... yes configure: WARNING: linux/if_bridge.h: present but cannot be compiled configure: WARNING: linux/if_bridge.h: check for missing prerequisite headers? configure: WARNING: linux/if_bridge.h: see the Autoconf documentation configure: WARNING: linux/if_bridge.h: section "Present But Cannot Be Compiled" configure: WARNING: linux/if_bridge.h: proceeding with the compiler's result configure: WARNING: ## ------------------------------------- ## configure: WARNING: ## Report this to libvir-list(a)redhat.com ## configure: WARNING: ## ------------------------------------- ## checking for linux/if_bridge.h... no * configure.ac (AC_CHECK_HEADERS): Provide struct in6_addr, since linux/if_bridge.h uses it without declaring it. --- Pushing under the build-breaker rule. I also plan on opening a BZ against the kernel headers. configure.ac | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 753916c..31e7f80 100644 --- a/configure.ac +++ b/configure.ac @@ -978,7 +978,9 @@ dnl if test "$with_linux" = "yes"; then if test "$with_qemu" = "yes" || test "$with_lxc" = "yes" ; then AC_CHECK_HEADERS([linux/param.h linux/sockios.h linux/if_bridge.h linux/if_tun.h],, - AC_MSG_ERROR([You must install kernel-headers in order to compile libvirt with QEMU or LXC support])) + [AC_MSG_ERROR([You must install kernel-headers in order to compile libvirt with QEMU or LXC support])], + [[#include <netinet/ip6.h> + ]]) fi fi -- 1.7.1

1 2