From patchwork Tue Sep 14 22:25:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 181302 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8EMQpsu022755 for ; Tue, 14 Sep 2010 22:26:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755663Ab0INW0u (ORCPT ); Tue, 14 Sep 2010 18:26:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38103 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754527Ab0INW0B (ORCPT ); Tue, 14 Sep 2010 18:26:01 -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 o8EMQ0On018037 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 14 Sep 2010 18:26:00 -0400 Received: from freedom.redhat.com (vpn-10-95.rdu.redhat.com [10.11.10.95]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8EMPlul004475; Tue, 14 Sep 2010 18:25:58 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues , Jason Wang , Amos Kong Subject: [PATCH 05/18] KVM Test: Add a common ping module for network related tests Date: Tue, 14 Sep 2010 19:25:30 -0300 Message-Id: <1284503143-5993-6-git-send-email-lmr@redhat.com> In-Reply-To: <1284503143-5993-1-git-send-email-lmr@redhat.com> References: <1284503143-5993-1-git-send-email-lmr@redhat.com> 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 (demeter1.kernel.org [140.211.167.41]); Tue, 14 Sep 2010 22:26:55 +0000 (UTC) diff --git a/client/tests/kvm/kvm_test_utils.py b/client/tests/kvm/kvm_test_utils.py index 5412aac..1e4bd9d 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 @@ -505,3 +505,113 @@ def run_autotest(vm, session, control_path, timeout, outputdir): e_msg = ("Tests %s failed during control file execution" % " ".join(bad_results)) raise error.TestFail(e_msg) + + +def get_loss_ratio(output): + """ + Get the packet loss ratio from the output of ping +. + @param output: Ping 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)