From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id BEFAE5A75 for ; Mon, 26 Jan 2015 05:53:11 +0100 (CET) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP; 25 Jan 2015 20:50:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,466,1418112000"; d="scan'208";a="656366485" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by fmsmga001.fm.intel.com with ESMTP; 25 Jan 2015 20:53:08 -0800 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id t0Q4r7SD015000; Mon, 26 Jan 2015 12:53:07 +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 t0Q4r4CC030682; Mon, 26 Jan 2015 12:53:06 +0800 Received: (from yliu84x@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id t0Q4r48V030678; Mon, 26 Jan 2015 12:53:04 +0800 From: Yong Liu To: dts@dpdk.org Date: Mon, 26 Jan 2015 12:52:55 +0800 Message-Id: <1422247975-30646-1-git-send-email-yong.liu@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dts] [PATCH] framework: DUT and Tester coexisted in the same platform 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, 26 Jan 2015 04:53:12 -0000 This patch based on "[PATCH 0/4] Support additional port configuration file". And do not support to run softwore performance test in the same platform. Fix one bug in pci numa parse. Signed-off-by: Marvinliu --- framework/config.py | 5 ++++- framework/tester.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/framework/config.py b/framework/config.py index 140c84b..948609a 100755 --- a/framework/config.py +++ b/framework/config.py @@ -79,7 +79,10 @@ class UserConf(): for param in port.split(','): (key, _, value) = param.partition('=') - portDict[key] = value + if key == 'numa': + portDict[key] = int(value) + else: + portDict[key] = value return portDict diff --git a/framework/tester.py b/framework/tester.py index 345ab41..b35a359 100644 --- a/framework/tester.py +++ b/framework/tester.py @@ -287,6 +287,10 @@ class Tester(Crb): if hits[localPort]: continue + # skip ping self port + if (self.crb['IP'] == self.crb['tester IP']) and (self.dut.ports_info[dutPort]['pci'] == self.ports_info[localPort]['pci']): + continue + ipv6 = self.dut.get_ipv6_address(dutPort) if ipv6 == "Not connected": continue @@ -440,7 +444,6 @@ class Tester(Crb): """ if not self.has_external_traffic_generator(): self.alt_session.send_expect('killall scapy 2>/dev/null; echo tester', '# ', 5) - super(Tester, self).kill_all() def close(self): """ -- 1.8.1.4