From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F0E05A052A; Mon, 25 Jan 2021 09:51:47 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EA6AE140DED; Mon, 25 Jan 2021 09:51:47 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 26A05140DBB for ; Mon, 25 Jan 2021 09:51:44 +0100 (CET) IronPort-SDR: +V/dk7hAXROur2tcjonI5Y0ID7KNVEkUBu0BvPZ3ttSLxaq9RFSEqI87y+ckhl+fHxZBzo5gCJ /n8WuZ+IE7Cg== X-IronPort-AV: E=McAfee;i="6000,8403,9874"; a="241224434" X-IronPort-AV: E=Sophos;i="5.79,373,1602572400"; d="scan'208";a="241224434" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jan 2021 00:51:44 -0800 IronPort-SDR: RtkhaFfo7ZCbKlEsESi0yG8f9cyUJKm7dT2PKQI9KGPgQQzIbR5j8QdjgqxFr6ZgGBuSJPG23e vbuKmNWl5DKg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,373,1602572400"; d="scan'208";a="471978475" Received: from dpdk-moyufen06.sh.intel.com ([10.67.116.208]) by fmsmga001.fm.intel.com with ESMTP; 25 Jan 2021 00:51:43 -0800 From: yufengmx To: dts@dpdk.org, lijuan.tu@intel.com Cc: yufengmx Date: Mon, 25 Jan 2021 16:44:00 +0800 Message-Id: <20210125084414.8503-14-yufengx.mo@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20210125084414.8503-1-yufengx.mo@intel.com> References: <20210125084414.8503-1-yufengx.mo@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dts] [PATCH V1 13/27] conf/pktgen: enable ixNetwork 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 Sender: "dts" support ixNetwork configuration content parsing process. Signed-off-by: yufengmx --- framework/config.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/framework/config.py b/framework/config.py index dd3bf306..30604773 100644 --- a/framework/config.py +++ b/framework/config.py @@ -1,6 +1,6 @@ # BSD LICENSE # -# Copyright(c) 2010-2019 Intel Corporation. All rights reserved. +# Copyright(c) 2010-2021 Intel Corporation. All rights reserved. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -36,7 +36,7 @@ import os import re import configparser # config parse module import argparse # parse arguments module -from settings import (IXIA, PKTGEN, PKTGEN_DPDK, PKTGEN_TREX, PKTGEN_IXIA, +from settings import (IXIA, PKTGEN, PKTGEN_DPDK, PKTGEN_TREX, PKTGEN_IXIA, PKTGEN_IXIA_NETWORK, CONFIG_ROOT_PATH, SUITE_SECTION_NAME) from settings import load_global_setting, DTS_CFG_FOLDER from exception import ConfigParseException, VirtConfigParseException, PortConfigParseException @@ -429,6 +429,8 @@ class PktgenConf(UserConf): ixia_group['Ports'] = ixia_ports elif key == 'ixia_enable_rsfec': ixia_group['enable_rsfec'] = value + else: + ixia_group[key] = value if 'Version' not in ixia_group: print('ixia configuration file request ixia_version option!!!') @@ -466,7 +468,8 @@ class PktgenConf(UserConf): for conf in pktgen_confs: key, value = conf self.pktgen_cfg[key] = value - elif self.pktgen_type == PKTGEN_IXIA and section.lower() == PKTGEN_IXIA: + elif (self.pktgen_type == PKTGEN_IXIA and section.lower() == PKTGEN_IXIA) or \ + (self.pktgen_type == PKTGEN_IXIA_NETWORK and section.lower() == PKTGEN_IXIA_NETWORK): # covert file configuration to dts pktgen cfg self.load_pktgen_ixia_config(section) -- 2.21.0