From patchwork Mon Aug 23 08:52:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 123681 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 o7N9QZR4027645 for ; Mon, 23 Aug 2010 09:38:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752533Ab0HWItY (ORCPT ); Mon, 23 Aug 2010 04:49:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7726 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752344Ab0HWItX (ORCPT ); Mon, 23 Aug 2010 04:49:23 -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 o7N8nNqQ001716 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 23 Aug 2010 04:49:23 -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 o7N8nKLH008594; Mon, 23 Aug 2010 04:49:21 -0400 Subject: [PATCH v2 04/17] KVM Test: Add a common ping module for network related tests To: autotest@vger.kernel.org From: Amos Kong Cc: lmr@redhat.com, kvm@vger.kernel.org Date: Mon, 23 Aug 2010 16:52:19 +0800 Message-ID: <20100823085219.19173.17980.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:38:37 +0000 (UTC) diff --git a/client/tests/kvm/kvm_test_utils.py b/client/tests/kvm/kvm_test_utils.py index 8cd7acd..6a93b72 100644 --- a/client/tests/kvm/kvm_test_utils.py +++ b/client/tests/kvm/kvm_test_utils.py @@ -21,7 +21,7 @@ More specifically: @copyright: 2008-2009 Red Hat Inc. """ -import time, os, logging, re, commands +import time, os, logging, re, commands, signal from autotest_lib.client.common_lib import error from autotest_lib.client.bin import utils import kvm_utils, kvm_vm, kvm_subprocess, scan_results @@ -498,3 +498,113 @@ def get_linux_ifname(session, mac_address): return ethname except: return None + + +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 is None: + process = kvm_subprocess.run_bg(command, output_func=output_func, + timeout=timeout) + + # Send SIGINT signal 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 not status: + # Send ctrl+c (SIGINT) through ssh session + session.send("\003") + status, output2 = session.read_up_to_prompt(print_func=output_func) + output += output2 + if not status: + # We also need to use this session to query the return value + session.send("\003") + + session.sendline(session.status_test_command) + s2, o2 = session.read_up_to_prompt() + if not s2: + status = -1 + else: + try: + status = int(re.findall("\d+", o2)[0]) + except: + status = -1 + + return status, output + + +def ping(dest=None, 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=None): + """ + 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 + """ + if dest is not None: + command = "ping %s " % dest + else: + command = "ping localhost " + 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: + command += " -A" + if broadcast: + command += " -b" + if flood: + command += " -f -q" + output_func = None + + return raw_ping(command, timeout, session, output_func)