From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 1CFD0B591 for ; Mon, 16 Feb 2015 04:08:02 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 15 Feb 2015 19:02:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,584,1418112000"; d="scan'208";a="652605909" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga001.jf.intel.com with ESMTP; 15 Feb 2015 19:08:02 -0800 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id t1G37xHV023094; Mon, 16 Feb 2015 11:07:59 +0800 Received: from shecgisg003.sh.intel.com (localhost [127.0.0.1]) by shecgisg003.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id t1G37ueP001337; Mon, 16 Feb 2015 11:07:58 +0800 Received: (from yliu84x@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id t1G37uwP001333; Mon, 16 Feb 2015 11:07:56 +0800 From: Yong Liu To: dts@dpdk.org Date: Mon, 16 Feb 2015 11:07:46 +0800 Message-Id: <1424056068-1156-4-git-send-email-yong.liu@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1424056068-1156-1-git-send-email-yong.liu@intel.com> References: <1423728550-14792-1-git-send-email-yong.liu@intel.com> <1424056068-1156-1-git-send-email-yong.liu@intel.com> Subject: [dts] [PATCH V3 3/5] framework: seperate kill scapy and DPDK application in kill_all function X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2015 03:08:03 -0000 Implement get pci address funciton in tester module, it will support etgen module parse IXIA card number and port id. Implement get tester port index function in tester module, it will support detect dut/tester port type automatically. Tester should known that whether only kill scapy session or also kill dpdk application. Signed-off-by: Marvinliu diff --git a/framework/tester.py b/framework/tester.py index 2834d77..2debcd6 100644 --- a/framework/tester.py +++ b/framework/tester.py @@ -143,6 +143,22 @@ class Tester(Crb): """ return self.ports_info[self.get_local_port(remotePort)]['type'] + def get_local_index(self, pci): + """ + Return tester local port index by pci id + """ + index = -1 + for port in self.ports_info: + index += 1 + if pci == port['pci']: + return index + + def get_pci(self, localPort): + """ + Return tester local port pci id. + """ + return self.ports_info[localPort]['pci'] + def get_interface(self, localPort): """ Return tester local port interface name. @@ -245,7 +261,7 @@ class Tester(Crb): Send ping6 packet from local port with destination ipv6 address. """ if self.ports_info[localPort]['type'] == 'ixia': - return self.ixia_packet_gen.send_ping6(self.ports_info[localPort]['intf'], mac, ipv6) + return self.ixia_packet_gen.send_ping6(self.ports_info[localPort]['pci'], mac, ipv6) else: return self.send_expect("ping6 -w 5 -c 5 -A -I %s %s" % (self.ports_info[localPort]['intf'], ipv6), "# ", 10) @@ -384,13 +400,13 @@ class Tester(Crb): instance.__dict__ = self.ixia_packet_gen.__dict__ instance.__dict__.update(current_attrs) - def kill_all(self): + def kill_all(self, killall=False): """ - Kill all scapy process and DPDK applications on tester. + Kill all scapy process or DPDK application on tester. """ if not self.has_external_traffic_generator(): self.alt_session.send_expect('killall scapy 2>/dev/null; echo tester', '# ', 5) - else: + if killall: super(Tester, self).kill_all() def close(self): -- 1.9.3