From patchwork Tue Jul 20 01:35:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 112924 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 o6K1ZBWB029556 for ; Tue, 20 Jul 2010 01:35:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761072Ab0GTBfV (ORCPT ); Mon, 19 Jul 2010 21:35:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26530 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761061Ab0GTBfU (ORCPT ); Mon, 19 Jul 2010 21:35:20 -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 o6K1ZIUO020716 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 19 Jul 2010 21:35:18 -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 o6K1ZGnR021052; Mon, 19 Jul 2010 21:35:17 -0400 Subject: [RFC PATCH 03/14] KVM Test: Add a common ping module for network related tests 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:35:15 +0800 Message-ID: <20100720013515.2212.66387.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:35:27 +0000 (UTC) diff --git a/client/tests/kvm/kvm_net_utils.py b/client/tests/kvm/kvm_net_utils.py index ede4965..8a71858 100644 --- a/client/tests/kvm/kvm_net_utils.py +++ b/client/tests/kvm/kvm_net_utils.py @@ -1,4 +1,114 @@ -import re +import logging, re, signal +from autotest_lib.client.common_lib import error +import kvm_subprocess, kvm_utils + +def get_loss_ratio(output): + """ + Get the packet loss ratio from the output of ping + + @param output + """ + try: + return int(re.findall('(\d+)% packet loss', output)[0]) + except IndexError: + logging.debug(output) + return -1 + +def raw_ping(command, timeout, session, output_func): + """ + Low-level ping command execution. + + @param command: ping command + @param timeout: timeout of the ping command + @param session: local executon hint or session to execute the ping command + """ + if session == "localhost": + process = kvm_subprocess.run_bg(command, output_func=output_func, + timeout=timeout) + + # Send SIGINT singal to notify the timeout of running ping process, + # Because ping have the ability to catch the SIGINT signal so we can + # always get the packet loss ratio even if timeout. + if process.is_alive(): + kvm_utils.kill_process_tree(process.get_pid(), signal.SIGINT) + + status = process.get_status() + output = process.get_output() + + process.close() + return status, output + else: + session.sendline(command) + status, output = session.read_up_to_prompt(timeout=timeout, + print_func=output_func) + if status is False: + # Send ctrl+c (SIGINT) through ssh session + session.sendline("\003") + status, output2 = session.read_up_to_prompt(print_func=output_func) + output += output2 + if status is False: + # We also need to use this session to query the return value + session.sendline("\003") + + session.sendline(session.status_test_command) + s2, o2 = session.read_up_to_prompt() + if s2 is False: + status = -1 + else: + try: + status = int(re.findall("\d+", o2)[0]) + except: + status = -1 + + return status, output + +def ping(dest = "localhost", count = None, interval = None, interface = None, + packetsize = None, ttl = None, hint = None, adaptive = False, + broadcast = False, flood = False, timeout = 0, + output_func = logging.debug, session = "localhost"): + """ + Wrapper of ping. + + @param dest: destination address + @param count: count of icmp packet + @param interval: interval of two icmp echo request + @param interface: specified interface of the source address + @param packetsize: packet size of icmp + @param ttl: ip time to live + @param hint: path mtu discovery hint + @param adaptive: adaptive ping flag + @param broadcast: broadcast ping flag + @param flood: flood ping flag + @param timeout: timeout for the ping command + @param output_func: function used to log the result of ping + @param session: local executon hint or session to execute the ping command + """ + + command = "ping %s " % dest + + if count is not None: + command += " -c %s" % count + if interval is not None: + command += " -i %s" % interval + if interface is not None: + command += " -I %s" % interface + if packetsize is not None: + command += " -s %s" % packetsize + if ttl is not None: + command += " -t %s" % ttl + if hint is not None: + command += " -M %s" % hint + if adaptive is True: + command += " -A" + if broadcast is True: + command += " -b" + if flood is True: + # temporary workaround as the kvm_subprocess may not properly handle + # the timeout for the output of flood ping + command += " -f -q" + output_func = None + + return raw_ping(command, timeout, session, output_func) def get_linux_ifname(session, mac_address): """