From patchwork Wed Oct 27 10:19:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Dong X-Patchwork-Id: 103031 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 75250A0C4B; Wed, 27 Oct 2021 12:20:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 66572407FF; Wed, 27 Oct 2021 12:20:16 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id 5D2544068C for ; Wed, 27 Oct 2021 12:20:14 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10149"; a="230076793" X-IronPort-AV: E=Sophos;i="5.87,186,1631602800"; d="scan'208";a="230076793" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2021 03:20:12 -0700 X-IronPort-AV: E=Sophos;i="5.87,186,1631602800"; d="scan'208";a="447155629" Received: from unknown (HELO dpdk-zhaohy-t.sh.intel.com) ([10.240.183.68]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2021 03:20:10 -0700 From: "Dong, JunX" To: dts@dpdk.org Cc: PingX.Yu@intel.com, weix.ling@intel.com, junx.dong@intel.com Date: Wed, 27 Oct 2021 18:19:53 +0800 Message-Id: <1635329993-169002-1-git-send-email-junx.dong@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dts] [PATCH V1] framework/packet: add Dot1BR module to sys search path 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" From: "Dong, JunX" Signed-off-by: Dong, JunX --- framework/packet.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/framework/packet.py b/framework/packet.py index e6fd74a0..633dd36f 100644 --- a/framework/packet.py +++ b/framework/packet.py @@ -35,22 +35,24 @@ Base on scapy(python program for packet manipulation) from importlib import import_module from socket import AF_INET6 - from scapy.all import * - from .utils import convert_int2ip, convert_ip2int # load extension layers exec_file = os.path.realpath(__file__) DTS_PATH = exec_file.replace('/framework/packet.py', '') + # exec_file might be .pyc file, if so, remove 'c'. TMP_PATH = DTS_PATH[:-1] + '/output/tmp/pcap/' if exec_file.endswith('.pyc') else DTS_PATH + '/output/tmp/pcap/' if not os.path.exists(TMP_PATH): os.system('mkdir -p %s' % TMP_PATH) +# add /tmp/dep to sys.path +sys.path.append('/tmp/dep') + scapy_modules_required = {'scapy.contrib.gtp': ['GTP_U_Header', 'GTPPDUSessionContainer'], 'scapy.contrib.lldp': ['LLDPDU', 'LLDPDUManagementAddress'], - 'dep.scapy_modules.Dot1BR': ['Dot1BR'], + 'Dot1BR': ['Dot1BR'], 'scapy.contrib.pfcp': ['PFCP'], 'scapy.contrib.nsh': ['NSH'], 'scapy.contrib.igmp': ['IGMP'],