From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 8661F5A98 for ; Thu, 12 Feb 2015 09:09:36 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP; 12 Feb 2015 00:02:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,564,1418112000"; d="scan'208";a="651098487" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga001.jf.intel.com with ESMTP; 12 Feb 2015 00:09:34 -0800 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id t1C89VnE030834; Thu, 12 Feb 2015 16:09:31 +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 t1C89T7D014857; Thu, 12 Feb 2015 16:09:31 +0800 Received: (from yliu84x@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id t1C89TIU014853; Thu, 12 Feb 2015 16:09:29 +0800 From: Yong Liu To: dts@dpdk.org Date: Thu, 12 Feb 2015 16:09:09 +0800 Message-Id: <1423728550-14792-5-git-send-email-yong.liu@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1423728550-14792-1-git-send-email-yong.liu@intel.com> References: <1423728550-14792-1-git-send-email-yong.liu@intel.com> Subject: [dts] [PATCH 4/5] framework: optimize wirespeed calculation and 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: Thu, 12 Feb 2015 08:09:37 -0000 Signed-off-by: Marvinliu --- framework/crb.py | 1 - framework/test_case.py | 26 ++++++++++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/framework/crb.py b/framework/crb.py index fa03757..fb3639c 100644 --- a/framework/crb.py +++ b/framework/crb.py @@ -284,7 +284,6 @@ class Crb(object): | awk '/config/ {print $2}'` ; do kill -9 $i; done" self.alt_session.session.send_expect(cmd, "# ", 10) time.sleep(.7) - self.check_os_type() def close(self): """ diff --git a/framework/test_case.py b/framework/test_case.py index c5dd10f..fbde06c 100644 --- a/framework/test_case.py +++ b/framework/test_case.py @@ -33,9 +33,9 @@ A base class for creating DTF test cases. """ +import dts from exception import VerifyFailure -from settings import DRIVERS - +from settings import DRIVERS, NICS class TestCase(object): @@ -67,18 +67,32 @@ class TestCase(object): raise ValueError(nic_name) + def get_nic_name(self, pci_id): + for nic_name, pci in NICS.items(): + if pci_id == pci: + return nic_name + + raise ValueError(nic_name) + def wirespeed(self, nic, frame_size, num_ports): """ Calculate bit rate. It is depended for NICs """ bitrate = 1000.0 # 1Gb ('.0' forces to operate as float) - if self.get_nic_driver(self.nic) == "ixgbe": + if self.nic == "any" or self.nic == "cfg": + driver = dts.get_nic_driver(self.dut.ports_info[0]['type']) + nic = self.get_nic_name(self.dut.ports_info[0]['type']) + else: + driver = self.get_nic_driver(self.nic) + nic = self.nic + + if driver == "ixgbe": bitrate *= 10 # 10 Gb NICs - elif self.nic == "avoton2c5": + elif nic == "avoton2c5": bitrate *= 2.5 # 2.5 Gb NICs - elif self.nic in ["fortville_spirit", "fortville_spirit_single"]: + elif nic in ["fortville_spirit", "fortville_spirit_single"]: bitrate *= 40 - elif self.nic == 'fortville_eagle': + elif nic == 'fortville_eagle': bitrate *= 10 return bitrate * num_ports / 8 / (frame_size + 20) -- 1.9.3