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 1F100A0613 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 587ED1BEC6; 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 348771BE82 for ; Mon, 23 Sep 2019 08:49:11 +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:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,539,1559545200"; d="scan'208";a="388384367" Received: from dpdk-moyufen06.sh.intel.com ([10.67.116.222]) by fmsmga005.fm.intel.com with ESMTP; 22 Sep 2019 23:49:09 -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:38 +0800 Message-Id: <20190923065040.8251-6-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 5/7] framework/pktgen_ixia: 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" *. set part of information logger display to debug level. *. set PacketGenerator class logger as Ixia class logger. *. remove un-used libs import. Signed-off-by: yufengmx --- framework/pktgen_ixia.py | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/framework/pktgen_ixia.py b/framework/pktgen_ixia.py index d324263..69f858e 100644 --- a/framework/pktgen_ixia.py +++ b/framework/pktgen_ixia.py @@ -36,7 +36,6 @@ from pprint import pformat from ssh_connection import SSHConnection from settings import SCAPY2IXIA -from logger import getLogger from utils import (convert_int2ip, convert_ip2int, convert_mac2long, convert_mac2str) @@ -52,15 +51,15 @@ class Ixia(SSHConnection): IXIA performance measurement class. """ - def __init__(self, tester, ixiaPorts): + def __init__(self, tester, ixiaPorts, logger): self.tester = tester self.NAME = PKTGEN_IXIA - self.logger = getLogger(self.NAME) super(Ixia, self).__init__( self.get_ip_address(), self.NAME, self.tester.get_username(), self.get_password()) + self.logger = logger super(Ixia, self).init_log(self.logger) self.tcl_cmds = [] @@ -79,8 +78,8 @@ class Ixia(SSHConnection): else: self.enable100g = 'disable' - self.logger.info(self.ixiaVersion) - self.logger.info(self.ports) + self.logger.debug(self.ixiaVersion) + self.logger.debug(self.ports) self.tclServerIP = ixiaPorts[ixiaRef]["IP"] @@ -758,7 +757,7 @@ class Ixia(SSHConnection): sendNumber += self.get_frames_sent() time.sleep(0.5) - self.logger.info("send :%f" % sendNumber) + self.logger.debug("send :%f" % sendNumber) assert sendNumber != 0 @@ -766,7 +765,7 @@ class Ixia(SSHConnection): for port in rxPortlist: self.stat_get_stat_all_stats(port) revNumber += self.get_frames_received() - self.logger.info("rev :%f" % revNumber) + self.logger.debug("rev :%f" % revNumber) return float(sendNumber - revNumber) / sendNumber, sendNumber, revNumber @@ -943,8 +942,8 @@ class Ixia(SSHConnection): out = self.send_expect("stat cget -oversize", '%', 10) oversize += int(out.strip()) - self.logger.info("Rate: %f Mpps" % (rate * 1.0 / 1000000)) - self.logger.info("Mbps rate: %f Mbps" % (bpsRate * 1.0 / 1000000)) + self.logger.debug("Rate: %f Mpps" % (rate * 1.0 / 1000000)) + self.logger.debug("Mbps rate: %f Mbps" % (bpsRate * 1.0 / 1000000)) self.hook_transmission_func() @@ -1233,7 +1232,7 @@ class Ixia(SSHConnection): self.stat_get_stat_all_stats(port) txPackets = self.get_frames_sent() rxPackets += self.get_frames_received() - self.logger.info("Received packets :%s" % rxPackets) + self.logger.debug("Received packets :%s" % rxPackets) return rxPackets @@ -1399,7 +1398,7 @@ class IxiaPacketGenerator(PacketGenerator): def _connect(self, tester, conf): # initialize ixia class - self._conn = Ixia(tester, conf) + self._conn = Ixia(tester, conf, self.logger) for p in self._conn.get_ports(): self._ports.append(p) @@ -1445,7 +1444,7 @@ class IxiaPacketGenerator(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: @@ -1535,8 +1534,8 @@ class IxiaPacketGenerator(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 = stats.get(rx_port_id) @@ -1550,8 +1549,8 @@ class IxiaPacketGenerator(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 @@ -1566,13 +1565,13 @@ class IxiaPacketGenerator(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 @@ -1699,8 +1698,8 @@ class IxiaPacketGenerator(PacketGenerator): ''' ixia traffic statistics ''' stats = self._conn.get_stats(self._traffic_ports, mode) 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': -- 2.21.0