From patchwork Fri Mar 11 13:29:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tu, Lijuan" X-Patchwork-Id: 108685 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 49F18A00C2; Fri, 11 Mar 2022 14:29:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 11B6240140; Fri, 11 Mar 2022 14:29:28 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id ED52440042 for ; Fri, 11 Mar 2022 14:29:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647005367; x=1678541367; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=b/pDbI5WGqvkdZ6ZqSeBD8gJxE/2xu9cUqAzIgcdv48=; b=MfYaV0lsyc5BpFFqtPvTthw+REpH8VLw336+6zIu+3+q/Kiz2eEW1FQ1 Sst+YUXPI+tCfbBYUp6Bw0AmbM9bbRN9Q58pNM54llYU18vXdy0o/vALU Vt+K6vXDdRx1gsJa9s8C24auzPRz/byQ+Ocq8qxTNehJr/udM5byvoP0e PHt5LLIPXhng9zvZC8MPY5QNsYbmoPaMy833zEfr0Y9R9o4wZ+HsmYiGn YjT8bvUQEPLpGwNQD1gotQGXevez7MzvIXggCHSTXqGY6gVkmO97eU5Ci VjUEB8WMZps7KFRhIL2I8Mc8PrGeTa192AShfD0Qh+6PsmGa6fofm8L7u A==; X-IronPort-AV: E=McAfee;i="6200,9189,10282"; a="318793645" X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="318793645" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2022 05:29:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="555309864" Received: from dpdk-lijuan-1.sh.intel.com ([10.67.119.208]) by orsmga008.jf.intel.com with ESMTP; 11 Mar 2022 05:29:24 -0800 From: Lijuan Tu To: junx.dong@intel.com Cc: dts@dpdk.org, Lijuan Tu Subject: [PATCH] remove dep/scapy_modules Date: Fri, 11 Mar 2022 21:29:18 +0800 Message-Id: <20220311132918.1272571-1-lijuan.tu@intel.com> X-Mailer: git-send-email 2.25.1 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 As dot1br removed, the scapy_modules is retired. Fixes: 5bdc6eee4cc7 ("framework/*: Remove Dot1BR related code") Signed-off-by: Lijuan Tu --- dep/scapy_modules/Dot1BR.py | 34 -------------------- dep/scapy_modules/__init__.py | 30 ----------------- framework/settings.py | 1 - framework/tester.py | 12 ------- tests/TestSuite_vxlan_gpe_support_in_i40e.py | 5 --- 5 files changed, 82 deletions(-) delete mode 100644 dep/scapy_modules/Dot1BR.py delete mode 100644 dep/scapy_modules/__init__.py diff --git a/dep/scapy_modules/Dot1BR.py b/dep/scapy_modules/Dot1BR.py deleted file mode 100644 index 162ac7dc..00000000 --- a/dep/scapy_modules/Dot1BR.py +++ /dev/null @@ -1,34 +0,0 @@ -## This file is part of Scapy -## See http://www.secdev.org/projects/scapy for more informations -## Copyright (C) Philippe Biondi -## This program is published under a GPLv2 license - -## Copyright (c) 2016 Marvin liu - -""" -VBPE (virtual brige port extenstion) -""" - -from scapy.data import ETHER_TYPES -from scapy.fields import * -from scapy.layers.l2 import Ether -from scapy.packet import * - - -class Dot1BR(Packet): - name = "802.1BR" - aliastypes = [ Ether ] - fields_desc = [ - BitField("EPCP", 0, 3), - BitField("EEDI", 0, 1), - BitField("IngressECIDbase", 0, 12), - BitField("Reserverd", 0, 2), - BitField("GRP", 0, 2), - BitField("ECIDbase", 0, 12), - BitField("IngressECIDext", 0, 8), - BitField("ECIDext", 0, 8), - XShortEnumField("type", 0x0000, ETHER_TYPES) ] - def mysummary(self): - return self.sprintf("802.1BR E-CID %Ingress_E-CID_base%") - -bind_layers(Ether, Dot1BR, type=0x893F) diff --git a/dep/scapy_modules/__init__.py b/dep/scapy_modules/__init__.py deleted file mode 100644 index ae0043b7..00000000 --- a/dep/scapy_modules/__init__.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/python3 -# BSD LICENSE -# -# Copyright (c) 2021 PANTHEON.tech s.r.o. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of PANTHEON.tech s.r.o. nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/framework/settings.py b/framework/settings.py index 8b06ffac..7399a774 100644 --- a/framework/settings.py +++ b/framework/settings.py @@ -43,7 +43,6 @@ FOLDERS = { 'Depends': 'dep', 'Output': 'output', 'NicDriver': 'nics', - 'scapy_modules': 'scapy_modules' } """ diff --git a/framework/tester.py b/framework/tester.py index 636129cf..bd903ce6 100644 --- a/framework/tester.py +++ b/framework/tester.py @@ -106,18 +106,6 @@ class Tester(Crb): session = self.create_session(session_name) self.scapy_sessions_li.append(session) session.send_expect('scapy', '>>> ') - file_dir = os.path.dirname(__file__).split(os.path.sep) - lib_path = os.path.sep.join(file_dir[:-1]) + '/dep/scapy_modules/' - - # get contrib module path on tester - scapy_module_path = session.session.send_expect("os.path.dirname(sys.modules['scapy'].__file__)", '>>>') - contrib_module_path = scapy_module_path.replace("'", "") + '/contrib' - - # import scapy moudle to scapy APP - out = session.session.send_expect(get_scapy_module_impcmd(), '>>> ') - if 'ImportError' in out: - session.logger.warning(f'entering import error: {out}') - return session def check_scapy_version(self): diff --git a/tests/TestSuite_vxlan_gpe_support_in_i40e.py b/tests/TestSuite_vxlan_gpe_support_in_i40e.py index a2002247..fe0a809c 100644 --- a/tests/TestSuite_vxlan_gpe_support_in_i40e.py +++ b/tests/TestSuite_vxlan_gpe_support_in_i40e.py @@ -122,11 +122,6 @@ class VxlanGpeTestConfig(object): """ Send vxlan pcap file by iface """ - # load vxlan module to scapy - cwd = os.getcwd() - dir_vxlan_module = cwd + r'/' + FOLDERS['Depends'] + r'/' + FOLDERS['scapy_modules'] - self.test_case.tester.scapy_append("sys.path.append('%s')" % dir_vxlan_module) - self.test_case.tester.scapy_append("from scapy.layers.vxlan import VXLAN") self.test_case.tester.scapy_append( 'pcap = rdpcap("%s")' % self.pcap_file) self.test_case.tester.scapy_append(