[libvirt] [libvirt-test-api][PATCH 1/3] Introduce new test case for add/del IOthread
Signed-off-by: Luyao Huang <lhuang@redhat.com> --- cases/linux_domain.conf | 6 +++ repos/domain/add_del_iothread.py | 82 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 repos/domain/add_del_iothread.py diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index fd32aad..8a7efe9 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -281,6 +281,12 @@ domain:set_memory_period conn qemu:///system +domain:add_del_iothread + guestname + $defaultname + conn + qemu:///system + domain:destroy guestname $defaultname diff --git a/repos/domain/add_del_iothread.py b/repos/domain/add_del_iothread.py new file mode 100644 index 0000000..2d874f9 --- /dev/null +++ b/repos/domain/add_del_iothread.py @@ -0,0 +1,82 @@ +#!/usr/bin/env python + +import libvirt +from libvirt import libvirtError +import lxml +import lxml.etree + +required_params = ('guestname',) +optional_params = {'conn': 'qemu:///system'} + +def find_iothreadid_fromxml(vm, running, iothreadid): + if (running == 1): + tree = lxml.etree.fromstring(vm.XMLDesc(0)) + else: + tree = lxml.etree.fromstring(vm.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE)) + + set = tree.xpath("//iothreadids/iothread") + for n in set: + ids = n.attrib['id'] + if int(ids) == iothreadid: + return True + + return False + +def add_del_iothread(params): + """ + test API for addIOThread and delIOThread in class virDomain + """ + + logger = params['logger'] + fail=0 + + try: + conn = libvirt.open(params['conn']) + + logger.info("get connection to libvirtd") + guest = params['guestname'] + vm = conn.lookupByName(guest) + logger.info("test guest name: %s" % guest) + + """ test effect guest running XML """ + if vm.isActive() == 1: + logger.info("guest is running test with running guest") + + for i in range(300, 1000): + if not find_iothreadid_fromxml(vm, 1, i): + logger.info("add iothread %d to running guest" % i) + vm.addIOThread(i, libvirt.VIR_DOMAIN_AFFECT_LIVE) + if find_iothreadid_fromxml(vm, 1, i): + vm.delIOThread(i, libvirt.VIR_DOMAIN_AFFECT_LIVE) + if find_iothreadid_fromxml(vm, 1, i): + logger.info("FAIL: still can find iothread id in XML") + fail=1 + + break + else: + logger.info("FAIL: cannot find iothread id in XML") + fail=1 + break + + """ test effect guest config""" + logger.info("test with guest inactive XML") + for i in range(300, 1000): + if not find_iothreadid_fromxml(vm, 0, i): + logger.info("add iothread %d to guest config" % i) + vm.addIOThread(i, libvirt.VIR_DOMAIN_AFFECT_CONFIG) + if find_iothreadid_fromxml(vm, 0, i): + vm.delIOThread(i, libvirt.VIR_DOMAIN_AFFECT_CONFIG) + if find_iothreadid_fromxml(vm, 0, i): + logger.info("FAIL: still can find iothread id in XML") + fail=1 + + break + else: + logger.info("FAIL: cannot find iothread id in XML") + fail=1 + break + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + fail=1 + return fail -- 1.8.3.1
Signed-off-by: Luyao Huang <lhuang@redhat.com> --- cases/linux_domain.conf | 6 ++ repos/domain/pin_iothread.py | 158 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+) create mode 100644 repos/domain/pin_iothread.py diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index 8a7efe9..b0bfb24 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -287,6 +287,12 @@ domain:add_del_iothread conn qemu:///system +domain:pin_iothread + guestname + $defaultname + conn + qemu:///system + domain:destroy guestname $defaultname diff --git a/repos/domain/pin_iothread.py b/repos/domain/pin_iothread.py new file mode 100644 index 0000000..28ee2c4 --- /dev/null +++ b/repos/domain/pin_iothread.py @@ -0,0 +1,158 @@ +#!/usr/bin/env python + +import libvirt +import libvirt_qemu +from libvirt import libvirtError +import lxml +import lxml.etree +import json +from utils import utils + +required_params = ('guestname',) +optional_params = {'conn': 'qemu:///system'} + +def find_iothreadid_fromxml(vm, running, iothreadid): + if (running == 1): + tree = lxml.etree.fromstring(vm.XMLDesc(0)) + else: + tree = lxml.etree.fromstring(vm.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE)) + + set = tree.xpath("//iothreadids/iothread") + for n in set: + ids = n.attrib['id'] + if int(ids) == iothreadid: + return True + + return False + +def find_iothreadpin_fromxml(vm, running, iothreadid): + if (running == 1): + tree = lxml.etree.fromstring(vm.XMLDesc(0)) + else: + tree = lxml.etree.fromstring(vm.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE)) + + set = tree.xpath("//cputune/iothreadpin") + for n in set: + ids = n.attrib["iothread"] + cpuset_xml = n.attrib["cpuset"] + if int(ids) == iothreadid: + logger.info("cpuset in xml is %s" % cpuset_xml) + return cpuset_xml + + return False + +def get_qmp_return_iothread(string, iothreadid): + js = json.loads(string) + + try: + js['return'] + err = False + except KeyError: + try: + js['error'] + err = True + except KeyError: + error = "invalid string" + return False + + if not err: + for n in js['return']: + if n['id'] == ("iothread%d" % iothreadid): + return int(n['thread-id']) + logger.info("cannot find iothread in query-iothreads return") + return False + + else: + logger.info("qmp command get failed: %s" % js['error']['desc']) + return False + +def check_iothreadpin(vm, iothreadid, cpuset): + ret = libvirt_qemu.qemuMonitorCommand(vm, '{ "execute": "query-iothreads" }', 0) + tid = get_qmp_return_iothread(ret, iothreadid) + if not tid: + return False + + cmds = "taskset --cpu-list -p %d| awk {'print $6'}" % tid + (status, output) = utils.exec_cmd(cmds, shell=True) + if status != 0: + logger.info("Exec_cmd failed: %s" % cmds) + return False + + logger.info("cpuset from taskset is %s" % output[0]) + if output[0] != cpuset: + logger.info("Cpuset is not equal: taskset is %s and libvirt is %s" % (output, cpuset)) + return False + + return True + +def pin_iothread(params): + """ + test API for pinIOThread in class virDomain + """ + + global logger + logger = params['logger'] + fail=0 + + try: + conn = libvirt.open(params['conn']) + + logger.info("get connection to libvirtd") + guest = params['guestname'] + vm = conn.lookupByName(guest) + hostcpu = utils.get_host_cpus() + tu_cpu = () + logger.info("test guest name: %s" % guest) + + for i in range(hostcpu): + if i % 2 == 0: + tu_cpu += (1,) + else: + tu_cpu += (0,) + + """ test effect a running guest""" + if vm.isActive() == 1: + logger.info("guest is running test with running guest") + + if not find_iothreadid_fromxml(vm, 1, 1): + logger.info("add iothread %d to running guest" % 1) + vm.addIOThread(i, libvirt.VIR_DOMAIN_AFFECT_LIVE) + + vm.pinIOThread(1, tu_cpu, libvirt.VIR_DOMAIN_AFFECT_LIVE) + cpuset = find_iothreadpin_fromxml(vm, 1, 1) + if cpuset: + if not check_iothreadpin(vm, 1, cpuset): + fail=1 + tmp_cpuset = utils.param_to_tuple(cpuset, hostcpu) + if not tmp_cpuset: + fail=1 + elif tmp_cpuset != tu_cpu: + logger.info("FAIL: the cpuset in xml is not equal the cpuset we set") + fail=1 + else: + logger.info("FAIL: cannot find iothreadpin in XML") + fail=1 + + """ test effect guest config""" + logger.info("test with guest inactive XML") + if not find_iothreadid_fromxml(vm, 0, 1): + logger.info("add iothread 1 to guest config") + vm.addIOThread(1, libvirt.VIR_DOMAIN_AFFECT_CONFIG) + + vm.pinIOThread(1, tu_cpu, libvirt.VIR_DOMAIN_AFFECT_LIVE) + cpuset = find_iothreadpin_fromxml(vm, 1, 1) + if cpuset: + tmp_cpuset = utils.param_to_tuple(cpuset, hostcpu) + if not tmp_cpuset: + fail=1 + elif tmp_cpuset != tu_cpu: + logger.info("FAIL: the cpuset in xml is not equal the cpuset we set") + fail=1 + else: + logger.info("FAIL: cannot find iothreadpin in XML") + fail=1 + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + fail=1 + return fail -- 1.8.3.1
Signed-off-by: Luyao Huang <lhuang@redhat.com> --- cases/linux_domain.conf | 6 ++++ repos/domain/info_iothread.py | 80 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 repos/domain/info_iothread.py diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index b0bfb24..f8b5663 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -293,6 +293,12 @@ domain:pin_iothread conn qemu:///system +domain:info_iothread + guestname + $defaultname + conn + qemu:///system + domain:destroy guestname $defaultname diff --git a/repos/domain/info_iothread.py b/repos/domain/info_iothread.py new file mode 100644 index 0000000..74aedac --- /dev/null +++ b/repos/domain/info_iothread.py @@ -0,0 +1,80 @@ +#!/usr/bin/env python + +import libvirt +from libvirt import libvirtError +import lxml +import lxml.etree + +required_params = ('guestname',) +optional_params = {'conn': 'qemu:///system'} + +def find_iothreadid_fromxml(vm, running, iothreadid): + if (running == 1): + tree = lxml.etree.fromstring(vm.XMLDesc(0)) + else: + tree = lxml.etree.fromstring(vm.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE)) + + set = tree.xpath("//iothreadids/iothread") + for n in set: + ids = n.attrib['id'] + if int(ids) == iothreadid: + return True + + return False + +def info_iothread(params): + """ + test API for ioThreadInfo in class virDomain + """ + + logger = params['logger'] + fail=0 + + try: + conn = libvirt.open(params['conn']) + + logger.info("get connection to libvirtd") + guest = params['guestname'] + vm = conn.lookupByName(guest) + logger.info("test guest name: %s" % guest) + + """ test effect guest running XML """ + if vm.isActive() == 1: + logger.info("guest is running test with running guest") + + ret = vm.ioThreadInfo(libvirt.VIR_DOMAIN_AFFECT_LIVE) + + if len(ret) == 0: + vm.addIOThread(1, libvirt.VIR_DOMAIN_AFFECT_LIVE) + if not find_iothreadid_fromxml(vm, 1, 1): + logger.info("FAIL: cannot find iothread id in XML") + return 1 + else: + ret = vm.ioThreadInfo(libvirt.VIR_DOMAIN_AFFECT_LIVE) + + for n in ret: + if not find_iothreadid_fromxml(vm, 1, n[0]): + logger.info("FAIL: cannot find iothread id in XML") + fail=1 + + """ test effect guest config""" + logger.info("test with guest inactive XML") + ret = vm.ioThreadInfo(libvirt.VIR_DOMAIN_AFFECT_CONFIG) + + if len(ret) == 0: + vm.addIOThread(1, libvirt.VIR_DOMAIN_AFFECT_CONFIG) + if not find_iothreadid_fromxml(vm, 0, 1): + logger.info("FAIL: cannot find iothread id in XML") + return 1 + else: + ret = vm.ioThreadInfo(libvirt.VIR_DOMAIN_AFFECT_CONFIG) + + for n in ret: + if not find_iothreadid_fromxml(vm, 0, n[0]): + logger.info("FAIL: cannot find iothread id in XML") + fail=1 + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + fail=1 + return fail -- 1.8.3.1
On 08/13/2015 11:09 AM, Luyao Huang wrote:
Signed-off-by: Luyao Huang <lhuang@redhat.com> --- cases/linux_domain.conf | 6 ++++ repos/domain/info_iothread.py | 80 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 repos/domain/info_iothread.py
diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index b0bfb24..f8b5663 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -293,6 +293,12 @@ domain:pin_iothread conn qemu:///system
+domain:info_iothread + guestname + $defaultname + conn + qemu:///system + domain:destroy guestname $defaultname diff --git a/repos/domain/info_iothread.py b/repos/domain/info_iothread.py new file mode 100644 index 0000000..74aedac --- /dev/null +++ b/repos/domain/info_iothread.py @@ -0,0 +1,80 @@ +#!/usr/bin/env python + +import libvirt +from libvirt import libvirtError +import lxml +import lxml.etree + +required_params = ('guestname',) +optional_params = {'conn': 'qemu:///system'} + +def find_iothreadid_fromxml(vm, running, iothreadid): + if (running == 1): + tree = lxml.etree.fromstring(vm.XMLDesc(0)) + else: + tree = lxml.etree.fromstring(vm.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE)) + + set = tree.xpath("//iothreadids/iothread") + for n in set: + ids = n.attrib['id'] + if int(ids) == iothreadid: + return True + + return False + +def info_iothread(params): + """ + test API for ioThreadInfo in class virDomain + """ + + logger = params['logger'] + fail=0 + + try: + conn = libvirt.open(params['conn']) + + logger.info("get connection to libvirtd") + guest = params['guestname'] + vm = conn.lookupByName(guest) + logger.info("test guest name: %s" % guest) + + """ test effect guest running XML """ + if vm.isActive() == 1: + logger.info("guest is running test with running guest") + + ret = vm.ioThreadInfo(libvirt.VIR_DOMAIN_AFFECT_LIVE) + + if len(ret) == 0: + vm.addIOThread(1, libvirt.VIR_DOMAIN_AFFECT_LIVE) + if not find_iothreadid_fromxml(vm, 1, 1): + logger.info("FAIL: cannot find iothread id in XML") + return 1 + else: + ret = vm.ioThreadInfo(libvirt.VIR_DOMAIN_AFFECT_LIVE) + + for n in ret: + if not find_iothreadid_fromxml(vm, 1, n[0]): + logger.info("FAIL: cannot find iothread id in XML") + fail=1 + + """ test effect guest config""" + logger.info("test with guest inactive XML") + ret = vm.ioThreadInfo(libvirt.VIR_DOMAIN_AFFECT_CONFIG) + + if len(ret) == 0: + vm.addIOThread(1, libvirt.VIR_DOMAIN_AFFECT_CONFIG) + if not find_iothreadid_fromxml(vm, 0, 1): + logger.info("FAIL: cannot find iothread id in XML") + return 1 + else: + ret = vm.ioThreadInfo(libvirt.VIR_DOMAIN_AFFECT_CONFIG) + + for n in ret: + if not find_iothreadid_fromxml(vm, 0, n[0]): + logger.info("FAIL: cannot find iothread id in XML") + fail=1 + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + fail=1 + return fail ACK and Pushed
Thanks Hongming
participants (2)
-
hongming -
Luyao Huang