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 A87BBA0545; Thu, 12 Nov 2020 04:01:31 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 99888592C; Thu, 12 Nov 2020 04:01:30 +0100 (CET) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id C952E569B for ; Thu, 12 Nov 2020 04:01:27 +0100 (CET) IronPort-SDR: xNNGaDYVHJjHpkYDxXdkv40LXzzpN0jiBUSX1dHD4avxTvZP6hORewnsx/ZDIalSIj4vuA+6M5 2Hz+FjikMyNw== X-IronPort-AV: E=McAfee;i="6000,8403,9802"; a="158030427" X-IronPort-AV: E=Sophos;i="5.77,471,1596524400"; d="scan'208";a="158030427" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2020 19:01:25 -0800 IronPort-SDR: UZi0g26SM3OQlUiPTEV0NJWvq1/CNewNLuSTJyylXEk4B11lTvJR593//2yBzsrjakWHhUpeou HU81vtTYNZdw== X-IronPort-AV: E=Sophos;i="5.77,471,1596524400"; d="scan'208";a="542067278" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2020 19:01:24 -0800 From: Zhou Jun To: dts@dpdk.org Cc: Zhou Jun Date: Thu, 12 Nov 2020 11:04:20 +0800 Message-Id: <20201112030420.21699-1-junx.w.zhou@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH V1] modify dts adapt for scapy update to 2.4.4 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" modify dts adapt for scapy update to 2.4.4 Signed-off-by: Zhou Jun --- tests/TestSuite_ddp_ppp_l2tp.py | 4 ++-- tests/TestSuite_vxlan_gpe_support_in_i40e.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/TestSuite_ddp_ppp_l2tp.py b/tests/TestSuite_ddp_ppp_l2tp.py index 8017a309..57b8c352 100644 --- a/tests/TestSuite_ddp_ppp_l2tp.py +++ b/tests/TestSuite_ddp_ppp_l2tp.py @@ -157,9 +157,9 @@ class TestDdpPppL2tp(TestCase): if flowtype == 26: a = Ether(dst="3C:FD:FE:A3:A0:01", src="4C:FD:FE:A3:A0:01")/IP()/UDP(dport=1701, sport=1701)/L2TP(session_id=0x7)/Raw("X"*20) if flowtype == 28: - a = Ether()/PPPoE(sessionid=0x7)/PPP(proto=0x21)/IP(dst="1.1.1.1", src="2.2.2.2")/UDP(dport=4000, sport=8000)/Raw("X"*20) + a = Ether()/PPPoE(sessionid=0x7)/PPP(b"\x00\x21")/IP(dst="1.1.1.1", src="2.2.2.2")/UDP(dport=4000, sport=8000)/Raw("X"*20) if flowtype == 29: - a = Ether()/PPPoE(sessionid=0x7)/PPP(proto=0x57)/IPv6(dst="1001:0db8:85a3:0000:0000:8a2e:0370:0001", src="2001:0db8:85a3:0000:0000:8a2e:0370:0001")/UDP(dport=4000, sport=8000)/Raw("X"*20) + a = Ether()/PPPoE(sessionid=0x7)/PPP(b"\x00\x57")/IPv6(dst="1001:0db8:85a3:0000:0000:8a2e:0370:0001", src="2001:0db8:85a3:0000:0000:8a2e:0370:0001")/UDP(dport=4000, sport=8000)/Raw("X"*20) if flowtype == 30: a = Ether(dst="3C:FD:FE:A3:A0:01", src="4C:FD:FE:A3:A0:01")/PPPoE(sessionid=0x7) ba = bytearray(bytes(a)) diff --git a/tests/TestSuite_vxlan_gpe_support_in_i40e.py b/tests/TestSuite_vxlan_gpe_support_in_i40e.py index 8b781e37..b5022540 100644 --- a/tests/TestSuite_vxlan_gpe_support_in_i40e.py +++ b/tests/TestSuite_vxlan_gpe_support_in_i40e.py @@ -43,7 +43,7 @@ from pmd_output import PmdOutput from scapy.utils import wrpcap, rdpcap from scapy.layers.inet import Ether, IP, UDP from scapy.layers.l2 import Dot1Q -from vxlan import VXLAN +from scapy.layers.vxlan import VXLAN from scapy.config import conf from test_case import TestCase from settings import FOLDERS @@ -124,7 +124,7 @@ class VxlanGpeTestConfig(object): 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 vxlan import VXLAN") + 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( -- 2.17.1