From patchwork Tue Jul 20 01:36:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 112933 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6K1aiNv029849 for ; Tue, 20 Jul 2010 01:36:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936557Ab0GTBgj (ORCPT ); Mon, 19 Jul 2010 21:36:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63930 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936554Ab0GTBgj (ORCPT ); Mon, 19 Jul 2010 21:36:39 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6K1aaGM020282 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 19 Jul 2010 21:36:36 -0400 Received: from [127.0.1.1] (dhcp-91-133.nay.redhat.com [10.66.91.133]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6K1aXjM021317; Mon, 19 Jul 2010 21:36:34 -0400 Subject: [RFC PATCH 12/14] KVM-test: Add a subtest of netperf To: lmr@redhat.com From: Amos Kong Cc: autotest@test.kernel.org, qemu-devel@nongnu.org, kvm@vger.kernel.org Date: Tue, 20 Jul 2010 09:36:33 +0800 Message-ID: <20100720013632.2212.40372.stgit@z> In-Reply-To: <20100720013414.2212.13476.stgit@z> References: <20100720013414.2212.13476.stgit@z> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 20 Jul 2010 01:36:44 +0000 (UTC) diff --git a/client/tests/kvm/tests/netperf.py b/client/tests/kvm/tests/netperf.py new file mode 100644 index 0000000..00a91f0 --- /dev/null +++ b/client/tests/kvm/tests/netperf.py @@ -0,0 +1,56 @@ +import logging, commands, os +from autotest_lib.client.common_lib import error +import kvm_subprocess, kvm_test_utils, kvm_utils + +def run_netperf(test, params, env): + """ + Network stress test with netperf + + 1) Boot up a virtual machine + 2) Launch netserver on guest + 3) Execute netperf client on host with different protocols + 4) Outout the test result + + @param test: Kvm test object + @param params: Dictionary with the test parameters. + @param env: Dictionary with test environment. + """ + vm = kvm_test_utils.get_living_vm(env, params.get("main_vm")) + session = kvm_test_utils.wait_for_login(vm, + timeout=int(params.get("login_timeout", 360))) + netperf_dir = os.path.join(os.environ['AUTODIR'], "tests/netperf2") + setup_cmd = params.get("setup_cmd") + guest_ip = vm.get_address() + result_file = os.path.join(test.debugdir, "result.txt") + + session.get_command_output("service iptables stop") + for i in params.get("netperf_files").split(): + if not vm.copy_files_to(os.path.join(netperf_dir, i), "/tmp"): + raise error.TestError("Could not copy files to guest") + if session.get_command_status(setup_cmd % "/tmp", timeout=100) != 0: + raise error.TestFail("Fail to setup netperf on guest") + if session.get_command_status(params.get("netserver_cmd") % "/tmp") != 0: + raise error.TestFail("Fail to start netperf server on guest") + + try: + logging.info("Setup and run netperf client on host") + s, o = commands.getstatusoutput(setup_cmd % netperf_dir) + if s != 0: + raise error.TestFail("Fail to setup netperf on host, o: %s" % o) + success = True + file(result_file, "w").write("Netperf Test Result\n") + for i in params.get("protocols").split(): + cmd = params.get("netperf_cmd") % (netperf_dir, i, guest_ip) + logging.debug("Execute netperf client test: %s" % cmd) + s, o = commands.getstatusoutput(cmd) + if s != 0: + logging.error("Fail to execute netperf test, protocol:%s" % i) + success = False + else: + logging.info(o) + file(result_file, "a+").write("%s\n" % o) + if not success: + raise error.TestFail("Not all the test passed") + finally: + session.get_command_output("killall netserver") + session.close() diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 7716d48..dec988e 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -398,6 +398,16 @@ variants: type = mac_change kill_vm = yes + - netperf: install setup unattended_install.cdrom + type = netperf + nic_mode = tap + netperf_files = netperf-2.4.5.tar.bz2 wait_before_data.patch + setup_cmd = "cd %s && tar xvfj netperf-2.4.5.tar.bz2 && cd netperf-2.4.5 && patch -p0 < ../wait_before_data.patch && ./configure && make" + netserver_cmd = %s/netperf-2.4.5/src/netserver + # test time is 60 seconds, set the buffer size to 1 for more hardware interrupt + netperf_cmd = %s/netperf-2.4.5/src/netperf -t %s -H %s -l 60 -- -m 1 + protocols = "TCP_STREAM TCP_MAERTS TCP_RR TCP_CRR UDP_RR TCP_SENDFILE UDP_STREAM" + - physical_resources_check: install setup unattended_install.cdrom type = physical_resources_check catch_uuid_cmd = dmidecode | awk -F: '/UUID/ {print $2}'