From patchwork Wed Jan 13 05:33:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, HaiyangX" X-Patchwork-Id: 86449 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 D3187A04B5; Wed, 13 Jan 2021 06:40:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 02B79140E25; Wed, 13 Jan 2021 06:40:28 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 788C4140E04 for ; Wed, 13 Jan 2021 06:40:24 +0100 (CET) IronPort-SDR: SA/0eghavIW62jp3dFF4a/5AjDzAN3GP8DuosAHV81XqRKtbS2RyP3dC+hlJUWf+kHmEMJLiMo V6g4VSKRYOgA== X-IronPort-AV: E=McAfee;i="6000,8403,9862"; a="157930140" X-IronPort-AV: E=Sophos;i="5.79,343,1602572400"; d="scan'208";a="157930140" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2021 21:40:20 -0800 IronPort-SDR: nicj3nsdbK6+zurv5i0cSlsDz2UHFeg1WK4WksOQ4VFri2eED0FNUFxvleKgatYYehEb5NfwBw BV+J75ALMEsg== X-IronPort-AV: E=Sophos;i="5.79,343,1602572400"; d="scan'208";a="571920588" Received: from unknown (HELO localhost.localdomain) ([10.240.183.57]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2021 21:40:18 -0800 From: Haiyang Zhao To: dts@dpdk.org, Lijuan.Tu@intel.com Cc: Haiyang Zhao Date: Wed, 13 Jan 2021 13:33:21 +0800 Message-Id: <20210113053321.4580-1-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH V1] framework/packet: remove sctp in required scapy module 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" sctp is in scapy.layers and is been imported by default, so remove the importing sctp code. Signed-off-by: Haiyang Zhao Tested-by: Haiyang Zhao --- framework/packet.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/framework/packet.py b/framework/packet.py index 2cd64d02..6d9bf246 100644 --- a/framework/packet.py +++ b/framework/packet.py @@ -52,8 +52,13 @@ from utils import convert_ip2int from utils import convert_int2ip scapy_modules_required = {'gtp': ['GTP_U_Header', 'GTPPDUSessionContainer'], - 'lldp': ['LLDPDU', 'LLDPDUManagementAddress'], 'Dot1BR': ['Dot1BR'], 'pfcp': ['PFCP'], - 'nsh': ['NSH'], 'igmp': ['IGMP'], 'mpls': ['MPLS'], 'sctp': ['SCTP', 'SCTPChunkData']} + 'lldp': ['LLDPDU', 'LLDPDUManagementAddress'], + 'Dot1BR': ['Dot1BR'], + 'pfcp': ['PFCP'], + 'nsh': ['NSH'], + 'igmp': ['IGMP'], + 'mpls': ['MPLS'], + } local_modules = [m[:-3] for m in os.listdir(DEP_FOLDER + '/scapy_modules') if (m.endswith('.py') and not m.startswith('__'))] for m in scapy_modules_required: @@ -63,14 +68,9 @@ for m in scapy_modules_required: for clazz in scapy_modules_required[m]: locals().update({clazz: getattr(module, clazz)}) else: - if m == 'sctp': - module = import_module(f'scapy.layers.{m}') - for clazz in scapy_modules_required[m]: - locals().update({clazz: getattr(module, clazz)}) - else: - module = import_module(f'scapy.contrib.{m}') - for clazz in scapy_modules_required[m]: - locals().update({clazz: getattr(module, clazz)}) + module = import_module(f'scapy.contrib.{m}') + for clazz in scapy_modules_required[m]: + locals().update({clazz: getattr(module, clazz)}) except Exception as e: print(e)