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 B0FECA04E0; Fri, 29 Nov 2019 10:02:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A92C62B96; Fri, 29 Nov 2019 10:02:10 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 510462B88 for ; Fri, 29 Nov 2019 10:02:08 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Nov 2019 01:01:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,256,1571727600"; d="scan'208";a="384030000" Received: from dpdk-moyufen06.sh.intel.com ([10.67.116.222]) by orsmga005.jf.intel.com with ESMTP; 29 Nov 2019 01:01:25 -0800 From: yufengmx To: dts@dpdk.org, yinan.wang@intel.com, lihongx.ma@intel.com Cc: yufengmx Date: Fri, 29 Nov 2019 17:03:15 +0800 Message-Id: <20191129090315.60124-6-yufengx.mo@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191129090315.60124-1-yufengx.mo@intel.com> References: <20191129090315.60124-1-yufengx.mo@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dts] [PATCH V3 5/5] framework/pktgen_trex: add new features 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" *. remove duration option in trex module, move duration option in testing scenario methods(latency/loss/throughput) in pktgen_base module. *. remove sample_delay option in trex module. *. remove runtim_stat in trex module. Signed-off-by: yufengmx --- framework/pktgen_trex.py | 63 ++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 41 deletions(-) diff --git a/framework/pktgen_trex.py b/framework/pktgen_trex.py index 690d070..6a1b36a 100644 --- a/framework/pktgen_trex.py +++ b/framework/pktgen_trex.py @@ -411,7 +411,6 @@ class TrexPacketGenerator(PacketGenerator): self._ports = [] self._traffic_ports = [] self._rx_ports = [] - self.runtime_stats = {} conf_inst = self._get_generator_conf_instance() self.conf = conf_inst.load_pktgen_config() @@ -450,6 +449,23 @@ class TrexPacketGenerator(PacketGenerator): from trex_stl_lib.api import STLClient # set trex class self.STLClient = STLClient + # get configuration from pktgen config file + self._get_traffic_option() + + def _get_traffic_option(self): + ''' get configuration from pktgen config file ''' + # set trex coremask + _core_mask = self.conf.get("core_mask") + if _core_mask: + if '0x' in _core_mask: + self.core_mask = \ + [int(item[2:], 16) for item in _core_mask.split(',')] + else: + self.core_mask = self.STLClient.CORE_MASK_PIN \ + if _core_mask.upper() == 'CORE_MASK_PIN' else \ + None + else: + self.core_mask = None def _connect(self): self._conn = self.STLClient(server=self.conf["server"]) @@ -652,7 +668,7 @@ class TrexPacketGenerator(PacketGenerator): def _throughput_stats(self, stream, stats): # tx packet tx_port_id = stream["tx_port"] - port_stats = self.runtime_stats.get(tx_port_id) + port_stats = stats.get(tx_port_id) if not port_stats: msg = "failed to get tx_port {0} statistics".format(tx_port_id) raise Exception(msg) @@ -666,7 +682,7 @@ class TrexPacketGenerator(PacketGenerator): 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) + port_stats = stats.get(rx_port_id) if not port_stats: msg = "failed to get rx_port {0} statistics".format(rx_port_id) raise Exception(msg) @@ -768,65 +784,30 @@ class TrexPacketGenerator(PacketGenerator): self._preset_trex_port() def _start_transmission(self, stream_ids, options={}): - ''' - :param sample_delay: - After traffic start ``sample_delay`` seconds, start get runtime statistics - ''' + test_mode = options.get('method') # get rate percentage rate_percent = "{0}%".format(options.get('rate') or self._traffic_opt.get('rate') or '100') - # get duration - duration = options.get("duration") or 20 - duration = int(duration) if isinstance(duration, (str, unicode)) \ - else duration - # get sample interval - _sample_delay = options.get("sample_delay") or duration/2 - sample_delay = int(_sample_delay) \ - if isinstance(_sample_delay, (str, unicode)) \ - else _sample_delay - # get configuration from pktgen config file - warmup = int(self.conf["warmup"]) if self.conf.has_key("warmup") \ - else 25 - # set trex coremask - wait_interval, core_mask = ( - warmup+30, int(self.conf["core_mask"], 16)) \ - if self.conf.has_key("core_mask") \ - else (warmup+5, 0x3) - try: - ########################################### # clear the stats before injecting self._conn.clear_stats() # Start traffic on port(s) run_opt = { 'ports': self._traffic_ports, 'mult': rate_percent, - 'duration': duration, - 'core_mask':core_mask, + 'core_mask': self.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.debug(pformat(self.runtime_stats)) - ########################################### - # Block until traffic on specified port(s) has ended - wait_opt = {'ports': self._traffic_ports} - if duration: - time.sleep(wait_interval + 10) - wait_opt['timeout'] = wait_interval + duration - self._conn.wait_on_traffic(**wait_opt) except Exception as e: self.logger.error(e) def _stop_transmission(self, stream_id): if self._traffic_ports: self._conn.stop(ports=self._traffic_ports, rx_delay_ms=5000) + self.logger.info("traffic completed. ") def _retrieve_port_statistic(self, stream_id, mode): ''' -- 2.21.0