From patchwork Thu Nov 25 10:24:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Juraj_Linke=C5=A1?= X-Patchwork-Id: 104696 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 785FCA0C41; Thu, 25 Nov 2021 11:24:45 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5266540DF5; Thu, 25 Nov 2021 11:24:45 +0100 (CET) Received: from lb.pantheon.sk (lb.pantheon.sk [46.229.239.20]) by mails.dpdk.org (Postfix) with ESMTP id E9EF640140 for ; Thu, 25 Nov 2021 11:24:43 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by lb.pantheon.sk (Postfix) with ESMTP id 59FDF11385A; Thu, 25 Nov 2021 11:24:43 +0100 (CET) X-Virus-Scanned: amavisd-new at siecit.sk Received: from lb.pantheon.sk ([127.0.0.1]) by localhost (lb.pantheon.sk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UMppSFkrRh4p; Thu, 25 Nov 2021 11:24:42 +0100 (CET) Received: from service-node1.lab.pantheon.local (unknown [46.229.239.141]) by lb.pantheon.sk (Postfix) with ESMTP id D39E610DDBC; Thu, 25 Nov 2021 11:24:41 +0100 (CET) From: =?utf-8?q?Juraj_Linke=C5=A1?= To: lijuan.tu@intel.com, ohilyard@iol.unh.edu Cc: dts@dpdk.org, =?utf-8?q?Juraj_Linke=C5=A1?= Subject: [PATCH v1] framework/pktgen_*: fix pylama errors Date: Thu, 25 Nov 2021 11:24:41 +0100 Message-Id: <1637835881-7535-1-git-send-email-juraj.linkes@pantheon.tech> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 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 Pylama found the following errors: framework/pktgen_base.py:108: [E] E1101 Instance of 'PacketGenerator' has no '_get_gen_port' member [pylint] framework/pktgen_base.py:148: [E] E1101 Instance of 'PacketGenerator' has no '_clear_streams' member; maybe 'clear_streams'? [pylint] framework/pktgen_base.py:173: [E] E1101 Instance of 'PacketGenerator' has no 'pktgen_type' member [pylint] framework/pktgen_base.py:279: [E] E1101 Instance of 'PacketGenerator' has no 'pktgen_type' member [pylint] framework/pktgen_base.py:479: [E] E1101 Instance of 'PacketGenerator' has no '_clear_streams' member; maybe 'clear_streams'? [pylint] framework/pktgen_base.py:528: [E] E0602 Undefined variable 'last_no_lost_mult' [pylint] framework/pktgen_base.py:558: [E] E1101 Instance of 'PacketGenerator' has no 'pktgen_type' member [pylint] framework/pktgen_base.py:573: [E] E1101 Instance of 'PacketGenerator' has no '_clear_streams' member; maybe 'clear_streams'? [pylint] framework/pktgen_base.py:607: [E] E1101 Instance of 'PacketGenerator' has no '_clear_streams' member; maybe 'clear_streams'? [pylint] framework/pktgen_base.py:673: [E] E1101 Instance of 'PacketGenerator' has no 'pktgen_type' member [pylint] framework/pktgen_base.py:677: [E] E1101 Instance of 'PacketGenerator' has no 'pktgen_type' member [pylint] framework/pktgen_base.py:69: [E] E1101 Instance of 'PacketGenerator' has no '_prepare_generator' member; maybe 'prepare_generator'? [pylint] framework/pktgen_base.py:77: [E] E1101 Instance of 'PacketGenerator' has no '_get_port_pci' member [pylint] framework/pktgen_ixia.py:1085: [E] E1306 Not enough arguments for format string [pylint] framework/pktgen_trex.py:194: [E] E0602 Undefined variable 'Ether' [pylint] framework/pktgen_trex.py:195: [E] E0602 Undefined variable 'IP' [pylint] Signed-off-by: Juraj Linkeš --- Lijuan, please add additional people to review if needed. --- framework/pktgen_base.py | 15 ++++++++++++++- framework/pktgen_ixia.py | 2 +- framework/pktgen_trex.py | 3 +++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/framework/pktgen_base.py b/framework/pktgen_base.py index 023652cc..16eae93f 100644 --- a/framework/pktgen_base.py +++ b/framework/pktgen_base.py @@ -64,10 +64,17 @@ class PacketGenerator(object): self.tester = tester self.__streams = [] self._ports_map = [] + self.pktgen_type = None + + def _prepare_generator(self): + raise NotImplementedError def prepare_generator(self): self._prepare_generator() + def _get_port_pci(self, port_id): + raise NotImplementedError + def _convert_pktgen_port(self, port_id): ''' :param port_id: @@ -94,6 +101,9 @@ class PacketGenerator(object): return port + def _get_gen_port(self, tester_pci): + raise NotImplementedError + def _convert_tester_port(self, port_id): ''' :param port_id: @@ -143,6 +153,9 @@ class PacketGenerator(object): def get_streams(self): return self.__streams + def _clear_streams(self): + raise NotImplementedError + def clear_streams(self): ''' clear streams ''' self._clear_streams() @@ -525,7 +538,7 @@ class PacketGenerator(object): break pps = (traffic_pps_max - traffic_pps_min)/2 + traffic_pps_min - self.logger.info("zero loss pps is %f" % last_no_lost_mult) + self.logger.info("zero loss pps is %f" % pps) # use last result as return data to keep the same with dts/etgen format # In fact, multiple link peer have multiple loss rate value, # here only pick one diff --git a/framework/pktgen_ixia.py b/framework/pktgen_ixia.py index 06667047..9a8c9d2e 100644 --- a/framework/pktgen_ixia.py +++ b/framework/pktgen_ixia.py @@ -1082,7 +1082,7 @@ class Ixia(SSHConnection): Tells IXIA to prepare the internal buffers were the frames were captured. """ ixia_port = self.get_ixia_port(port_number) - command = 'capture get {0} {1} {2}'.format(ixia_port) + command = 'capture get {0}'.format(ixia_port) self.send_expect(command, '% ', 30) def stat_get_rate_stat_all_stats(self, port_number): diff --git a/framework/pktgen_trex.py b/framework/pktgen_trex.py index 2ad05fe6..7acbbc2d 100644 --- a/framework/pktgen_trex.py +++ b/framework/pktgen_trex.py @@ -35,6 +35,9 @@ import sys import time from pprint import pformat +from scapy.layers.inet import IP +from scapy.layers.l2 import Ether + from .pktgen_base import ( PKTGEN, PKTGEN_TREX,