From patchwork Mon Aug 23 08:53:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 123631 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 o7N9QZRE027645 for ; Mon, 23 Aug 2010 09:39:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753127Ab0HWIuk (ORCPT ); Mon, 23 Aug 2010 04:50:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42581 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753056Ab0HWIuk (ORCPT ); Mon, 23 Aug 2010 04:50:40 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7N8odac030848 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 23 Aug 2010 04:50:39 -0400 Received: from [0.0.0.190] (dhcp-91-190.nay.redhat.com [10.66.91.190]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o7N8obKT009237; Mon, 23 Aug 2010 04:50:38 -0400 Subject: [PATCH v2 13/17] KVM-test: Add a subtest of netperf To: autotest@vger.kernel.org From: Amos Kong Cc: lmr@redhat.com, kvm@vger.kernel.org Date: Mon, 23 Aug 2010 16:53:35 +0800 Message-ID: <20100823085335.19173.68507.stgit@190> In-Reply-To: <20100823084745.19173.61655.stgit@190> References: <20100823084745.19173.61655.stgit@190> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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]); Mon, 23 Aug 2010 09:39:50 +0000 (UTC) diff --git a/client/tests/kvm/tests/netperf.py b/client/tests/kvm/tests/netperf.py new file mode 100644 index 0000000..f143bf8 --- /dev/null +++ b/client/tests/kvm/tests/netperf.py @@ -0,0 +1,55 @@ +import logging, commands, os +from autotest_lib.client.common_lib import error +from autotest_lib.client.bin import utils +import kvm_test_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.resultsdir, "output_%s" % test.iteration) + + session.get_command_output("iptables -F") + 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=200) != 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") + utils.run(setup_cmd % netperf_dir) + 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("Some of the netperf tests failed") + 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 36e3564..3332bc6 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -402,6 +402,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}'