From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CE842A0613 for ; Mon, 23 Sep 2019 08:49:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EF8E91BECC; Mon, 23 Sep 2019 08:49:13 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 6E4861BEBC for ; Mon, 23 Sep 2019 08:49:12 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Sep 2019 23:49:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,539,1559545200"; d="scan'208";a="388384375" Received: from dpdk-moyufen06.sh.intel.com ([10.67.116.222]) by fmsmga005.fm.intel.com with ESMTP; 22 Sep 2019 23:49:10 -0700 From: yufengmx To: dts@dpdk.org, wenjiex.a.li@intel.com, zhaoyan.chen@intel.com, lijuan.tu@intel.com Cc: yufengmx Date: Mon, 23 Sep 2019 14:50:39 +0800 Message-Id: <20190923065040.8251-7-yufengx.mo@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190923065040.8251-1-yufengx.mo@intel.com> References: <20190923065040.8251-1-yufengx.mo@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dts] [PATCH V2 6/7] framework/pktgen_trex: fix internal bug 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: , Errors-To: dts-bounces@dpdk.org Sender: "dts" *. use tester alt session to close trex. *. set part of information logger display to debug level. *. remove logger format setting after import libs to eliminate dts redundant logs. Signed-off-by: yufengmx --- framework/pktgen_trex.py | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/framework/pktgen_trex.py b/framework/pktgen_trex.py index c6c904b..690d070 100644 --- a/framework/pktgen_trex.py +++ b/framework/pktgen_trex.py @@ -35,14 +35,9 @@ import time import logging from pprint import pformat -from pktgen_base import (PacketGenerator, PKTGEN_TREX, +from pktgen_base import (PacketGenerator, PKTGEN_TREX, PKTGEN, TRANSMIT_CONT, TRANSMIT_M_BURST, TRANSMIT_S_BURST) -FORMAT = '%(message)s' -logging.basicConfig(format=FORMAT) -logger = logging.getLogger(os.path.basename(__file__)[:-3].upper()) -logger.setLevel(logging.INFO) - class TrexConfigVm(object): ''' @@ -492,7 +487,7 @@ class TrexPacketGenerator(PacketGenerator): ''' for name, _port_obj in self._conn.ports.iteritems(): _pci = _port_obj.info['pci_addr'] - self.logger.info((_pci, pci)) + self.logger.debug((_pci, pci)) if _pci == pci: return True else: @@ -585,9 +580,7 @@ class TrexPacketGenerator(PacketGenerator): app_param_temp = app_param_temp + " --cfg " + self.conf[key] elif key == 'core_num': app_param_temp = app_param_temp + " -c " + self.conf[key] - self.control_session = \ - self.tester.create_session('trex_control_session') - + self.control_session = self.tester.create_session(PKTGEN) self.control_session.send_expect( ';'.join(['cd ' + self.conf['trex_root_path'], './' + self.trex_app + " " + app_param_temp]), @@ -628,7 +621,7 @@ class TrexPacketGenerator(PacketGenerator): if port_id not in ports: return None features = self._conn.ports[port_id].get_formatted_info() - self.logger.info(pformat(features)) + self.logger.debug(pformat(features)) return features @@ -637,7 +630,7 @@ class TrexPacketGenerator(PacketGenerator): features = self._get_port_features(port_id) if not features or features.get('fc_supported') == 'no': msg = "trex port <{0}> not support flow control".format(port_id) - self.logger.warning(msg) + self.logger.debug(msg) return False else: return True @@ -669,8 +662,8 @@ class TrexPacketGenerator(PacketGenerator): "Tx Port %d stats: " % (tx_port_id), "tx_port: %d, tx_bps: %f, tx_pps: %f " % ( tx_port_id, tx_bps, tx_pps)] - self.logger.info(pformat(port_stats)) - self.logger.info(os.linesep.join(msg)) + self.logger.debug(pformat(port_stats)) + self.logger.debug(os.linesep.join(msg)) # rx bps/pps rx_port_id = stream["rx_port"] port_stats = self.runtime_stats.get(rx_port_id) @@ -684,8 +677,8 @@ class TrexPacketGenerator(PacketGenerator): "rx_port: %d, rx_bps: %f, rx_pps: %f" % ( rx_port_id, rx_bps, rx_pps)] - self.logger.info(pformat(port_stats)) - self.logger.info(os.linesep.join(msg)) + self.logger.debug(pformat(port_stats)) + self.logger.debug(os.linesep.join(msg)) return rx_bps, rx_pps @@ -699,13 +692,13 @@ class TrexPacketGenerator(PacketGenerator): self.logger.error(msg) return None msg = "Tx Port %d stats: " % (port_id) - self.logger.info(msg) + self.logger.debug(msg) opackets = port_stats["opackets"] # rx packet port_id = stream.get("rx_port") port_stats = stats[port_id] msg = "Rx Port %d stats: " % (port_id) - self.logger.info(msg) + self.logger.debug(msg) ipackets = port_stats["ipackets"] return opackets, ipackets @@ -813,13 +806,14 @@ class TrexPacketGenerator(PacketGenerator): 'core_mask':core_mask, 'force': True,} self.logger.info("begin traffic ......") + self.logger.debug(run_opt) self._conn.start(**run_opt) ########################################### if sample_delay: time.sleep(sample_delay) # wait # get ports runtime statistics self.runtime_stats = self._conn.get_stats() - self.logger.info(pformat(self.runtime_stats)) + self.logger.debug(pformat(self.runtime_stats)) ########################################### # Block until traffic on specified port(s) has ended wait_opt = {'ports': self._traffic_ports} @@ -840,8 +834,8 @@ class TrexPacketGenerator(PacketGenerator): ''' stats = self._conn.get_stats() stream = self._get_stream(stream_id) - self.logger.info(pformat(stream)) - self.logger.info(pformat(stats)) + self.logger.debug(pformat(stream)) + self.logger.debug(pformat(stats)) if mode == 'throughput': return self._throughput_stats(stream, stats) elif mode == 'loss': @@ -855,7 +849,7 @@ class TrexPacketGenerator(PacketGenerator): if self._conn is not None: self._disconnect() if self.control_session is not None: - self.tester.send_expect('pkill -f _t-rex-64', '# ') + self.tester.alt_session.send_expect('pkill -f _t-rex-64', '# ') time.sleep(5) self.tester.destroy_session(self.control_session) self.control_session = None -- 2.21.0