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 99F17A046B for ; Tue, 23 Jul 2019 11:14:19 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 905D91BFDA; Tue, 23 Jul 2019 11:14:19 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id D1A631BFB6 for ; Tue, 23 Jul 2019 11:14:17 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Jul 2019 02:14:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,298,1559545200"; d="scan'208";a="177240807" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by FMSMGA003.fm.intel.com with ESMTP; 23 Jul 2019 02:14:16 -0700 Received: from fmsmsx162.amr.corp.intel.com (10.18.125.71) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 23 Jul 2019 02:14:16 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx162.amr.corp.intel.com (10.18.125.71) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 23 Jul 2019 02:14:15 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.22]) with mapi id 14.03.0439.000; Tue, 23 Jul 2019 17:14:13 +0800 From: "Zhu, ShuaiX" To: "Ma, LihongX" , "dts@dpdk.org" CC: "Ma, LihongX" , "Zhu, ShuaiX" Thread-Topic: [dts] [PATCH V1 3/3][scapy vxlan] tests: update vxlan name from Vxlan to VXLAN Thread-Index: AQHVQS6RmjxJqpcCNEujY5l9NqwP46bX64Tw Date: Tue, 23 Jul 2019 09:14:12 +0000 Message-ID: <4DC48DF9BDA3E54A836D2D3C057DEC6F0B1C4449@SHSMSX101.ccr.corp.intel.com> References: <1563843053-30184-1-git-send-email-lihongx.ma@intel.com> <1563843053-30184-3-git-send-email-lihongx.ma@intel.com> In-Reply-To: <1563843053-30184-3-git-send-email-lihongx.ma@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH V1 3/3][scapy vxlan] tests: update vxlan name from Vxlan to VXLAN 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" Tested-by: Zhu, ShuaiX > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of lihong > Sent: Tuesday, July 23, 2019 8:51 AM > To: dts@dpdk.org > Cc: Ma, LihongX > Subject: [dts] [PATCH V1 3/3][scapy vxlan] tests: update vxlan name from = Vxlan > to VXLAN >=20 > depend on dep/vxlan.py, update Vxlan to VXLAN >=20 > Signed-off-by: lihong > --- > tests/TestSuite_cloud_filter.py | 8 +++---- > tests/TestSuite_generic_flow_api.py | 16 ++++++------- > tests/TestSuite_tso.py | 4 ++-- > tests/TestSuite_vxlan.py | 34 > ++++++++++++++-------------- > tests/TestSuite_vxlan_gpe_support_in_i40e.py | 12 +++++++--- > tests/TestSuite_vxlan_sample.py | 20 ++++++++-------- > 6 files changed, 50 insertions(+), 44 deletions(-) >=20 > diff --git a/tests/TestSuite_cloud_filter.py b/tests/TestSuite_cloud_filt= er.py > index d4fe129..74b3be7 100644 > --- a/tests/TestSuite_cloud_filter.py > +++ b/tests/TestSuite_cloud_filter.py > @@ -17,12 +17,12 @@ from packet import Packet, load_pcapfile from > scapy.layers.inet import UDP, IP from scapy.packet import split_layers, > bind_layers >=20 > -from vxlan import Vxlan > +from vxlan import VXLAN > from vxlan import VXLAN_PORT >=20 > CLOUD_PORT =3D 8472 > -split_layers(UDP, Vxlan, dport=3DVXLAN_PORT) -bind_layers(UDP, Vxlan, > dport=3DCLOUD_PORT) > +split_layers(UDP, VXLAN, dport=3DVXLAN_PORT) bind_layers(UDP, VXLAN, > +dport=3DCLOUD_PORT) >=20 > # > # > @@ -350,7 +350,7 @@ class TestCloudFilter(TestCase): > dport =3D cap_pkt[UDP].dport > self.verify(dport =3D=3D CLOUD_PORT, > "Captured packet is not vxlan packet") > - inner_ip =3D cap_pkt[Vxlan][IP].dst > + inner_ip =3D cap_pkt['VXLAN'][IP].dst > self.verify(inner_ip =3D=3D cloud_cfg.cf_rule['iip'], > "Inner ip not matched") > except: > diff --git a/tests/TestSuite_generic_flow_api.py > b/tests/TestSuite_generic_flow_api.py > index a7810fd..3daf77f 100644 > --- a/tests/TestSuite_generic_flow_api.py > +++ b/tests/TestSuite_generic_flow_api.py > @@ -154,7 +154,7 @@ class TestGeneric_flow_api(TestCase): > dir_module =3D cwd + r'/' + 'dep' > self.tester.scapy_append('sys.path.append("%s")' % dir_module) > if module =3D=3D "vxlan": > - self.tester.scapy_append("from vxlan import Vxlan") > + self.tester.scapy_append("from vxlan import VXLAN") > elif module =3D=3D "nvgre": > self.tester.scapy_append('from nvgre import NVGRE') >=20 > @@ -312,7 +312,7 @@ class TestGeneric_flow_api(TestCase): > rule_created =3D 1 >=20 > # Enable vxlan packet sending > - if "Vxlan" in flow_pkt: > + if "VXLAN" in flow_pkt: > self.load_module("vxlan") > elif "NVGRE" in flow_pkt: > self.load_module("nvgre") @@ -569,10 +569,10 @@ > class TestGeneric_flow_api(TestCase): > if 'vni' in flows: > vni =3D self.generate_random_int(0, MAX_VLAN) > flow_str +=3D "vni is %d " % vni > - pkt +=3D "/Vxlan(vni=3D%d)" % vni > + pkt +=3D "/VXLAN(vni=3D%d)" % vni > extrapacket['vni'] =3D str(vni) > else: > - pkt +=3D "/Vxlan()" > + pkt +=3D "/VXLAN()" > elif flow_type =3D=3D "nvgre": > flow_str +=3D "/ nvgre " > if 'tni' in flows: > @@ -1515,22 +1515,22 @@ class TestGeneric_flow_api(TestCase): >=20 > self.load_module("vxlan") > self.tester.scapy_append( > - > 'sendp([Ether(dst=3D"%s")/IP()/UDP()/Vxlan()/Ether(dst=3D"%s")/Dot1Q(vlan= =3D11)/I > P()/TCP()/Raw("x" * 20)], iface=3D"%s")' % (self.outer_mac, self.inner_ma= c, > self.tester_itf)) > + > + 'sendp([Ether(dst=3D"%s")/IP()/UDP()/VXLAN()/Ether(dst=3D"%s")/Dot1Q(vl= an=3D > + 11)/IP()/TCP()/Raw("x" * 20)], iface=3D"%s")' % (self.outer_mac, > + self.inner_mac, self.tester_itf)) > self.verify_result("pf", expect_rxpkts=3D"1", > expect_queue=3Dextrapkt_rulenum['queue'][0], verify_mac=3Dself.outer_mac) >=20 > self.load_module("vxlan") > self.tester.scapy_append( > - > 'sendp([Ether(dst=3D"%s")/IP()/UDP()/Vxlan(vni=3D5)/Ether(dst=3D"%s")/IP(= )/TCP()/R > aw("x" * 20)], iface=3D"%s")' % (self.outer_mac, self.wrong_mac, self.tes= ter_itf)) > + > + 'sendp([Ether(dst=3D"%s")/IP()/UDP()/VXLAN(vni=3D5)/Ether(dst=3D"%s")/I= P()/T > + CP()/Raw("x" * 20)], iface=3D"%s")' % (self.outer_mac, self.wrong_mac, > + self.tester_itf)) > self.verify_result("pf", expect_rxpkts=3D"1", expect_queue=3D"0"= , > verify_mac=3Dself.outer_mac) >=20 > self.load_module("vxlan") > self.tester.scapy_append( > - > 'sendp([Ether(dst=3D"%s")/IP()/UDP()/Vxlan(vni=3D%s)/Ether(dst=3D"%s")/Do= t1Q(vlan > =3D%s)/IP()/TCP()/Raw("x" * 20)], iface=3D"%s")' % (self.outer_mac, > extra_packet[5]['vni'], self.wrong_mac, extra_packet[5]['invlan'], self.t= ester_itf)) > + > + 'sendp([Ether(dst=3D"%s")/IP()/UDP()/VXLAN(vni=3D%s)/Ether(dst=3D"%s")/= Dot1Q > + (vlan=3D%s)/IP()/TCP()/Raw("x" * 20)], iface=3D"%s")' % (self.outer_mac= , > + extra_packet[5]['vni'], self.wrong_mac, extra_packet[5]['invlan'], > + self.tester_itf)) > self.verify_result("vf0", expect_rxpkts=3D"1", expect_queue=3D"0= ", > verify_mac=3Dself.outer_mac) >=20 > self.load_module("vxlan") > self.tester.scapy_append( > - > 'sendp([Ether(dst=3D"%s")/IP()/UDP()/Vxlan(vni=3D%s)/Ether(dst=3D"%s")/IP= ()/TCP()/ > Raw("x" * 20)], iface=3D"%s")' % (self.wrong_mac, extra_packet[6]['vni'], > self.inner_mac, self.tester_itf)) > + > + 'sendp([Ether(dst=3D"%s")/IP()/UDP()/VXLAN(vni=3D%s)/Ether(dst=3D"%s")/= IP()/ > + TCP()/Raw("x" * 20)], iface=3D"%s")' % (self.wrong_mac, > + extra_packet[6]['vni'], self.inner_mac, self.tester_itf)) > self.verify_result("vf1", expect_rxpkts=3D"0", expect_queue=3D"N= ULL", > verify_mac=3Dself.wrong_mac) > rule_num =3D extrapkt_rulenum['rulenum'] > self.verify_rulenum(rule_num) > diff --git a/tests/TestSuite_tso.py b/tests/TestSuite_tso.py index > 34294cc..36e00fe 100644 > --- a/tests/TestSuite_tso.py > +++ b/tests/TestSuite_tso.py > @@ -104,7 +104,7 @@ class TestTSO(TestCase): > cwd =3D os.getcwd() > dir_module =3D cwd + r'/' + 'dep' > self.tester.scapy_append('sys.path.append("%s")' % dir_module) > - self.tester.scapy_append("from vxlan import Vxlan") > + self.tester.scapy_append("from vxlan import VXLAN") > self.tester.scapy_append('from nvgre import NVGRE') >=20 > def tcpdump_start_sniffing(self, ifaces=3D[]): > @@ -300,7 +300,7 @@ class TestTSO(TestCase): > self.tcpdump_start_sniffing([tx_interface, rx_interface]) > self.load_module() > out =3D self.dut.send_expect("clear port info all", "testpmd= > ", 120) > - > self.tester.scapy_append('sendp([Ether(dst=3D"%s",src=3D"52:00:00:00:00:0= 0")/IP(sr > c=3D"192.168.1.1",dst=3D"192.168.1.2")/UDP(sport=3D1021,dport=3D4789)/Vxl= an()/Ether( > dst=3D"%s",src=3D"52:00:00:00:00:00")/IP(src=3D"192.168.1.1",dst=3D"192.1= 68.1.2")/TCP(s > port=3D1021,dport=3D1021)/("X"*%s)], iface=3D"%s")' % (mac, mac, loading_= size, > tx_interface)) > + > + self.tester.scapy_append('sendp([Ether(dst=3D"%s",src=3D"52:00:00:00:00= :00 > + ")/IP(src=3D"192.168.1.1",dst=3D"192.168.1.2")/UDP(sport=3D1021,dport= =3D4789)/ > + VXLAN()/Ether(dst=3D"%s",src=3D"52:00:00:00:00:00")/IP(src=3D"192.168.1= .1",d > + st=3D"192.168.1.2")/TCP(sport=3D1021,dport=3D1021)/("X"*%s)], iface=3D"= %s")' % > + (mac, mac, loading_size, tx_interface)) > out =3D self.tester.scapy_execute() > out =3D self.dut.send_expect("show port stats all", "testpmd= > ", > 120) > print out > diff --git a/tests/TestSuite_vxlan.py b/tests/TestSuite_vxlan.py index > 12ab458..4183169 100644 > --- a/tests/TestSuite_vxlan.py > +++ b/tests/TestSuite_vxlan.py > @@ -17,7 +17,7 @@ from scapy.utils import wrpcap, rdpcap from > scapy.layers.inet import Ether, IP, TCP, UDP from scapy.layers.inet6 imp= ort IPv6 > from scapy.layers.l2 import Dot1Q -from vxlan import Vxlan > +from vxlan import VXLAN > from scapy.layers.sctp import SCTP, SCTPChunkData from scapy.sendrecv > import sniff from scapy.config import conf @@ -178,7 +178,7 @@ class > VxlanTestConfig(object): > outer[UDP].chksum =3D 1 >=20 > if self.outer_udp_dst =3D=3D VXLAN_PORT: > - self.pkt =3D outer / Vxlan(vni=3Dself.vni) / inner > + self.pkt =3D outer / VXLAN(vni=3Dself.vni) / inner > else: > self.pkt =3D outer / ("X" * self.payload_size) >=20 > @@ -207,8 +207,8 @@ class VxlanTestConfig(object): > if payload.guess_payload_class(payload).name =3D=3D "IP": > chk_sums['outer_ip'] =3D hex(payload[IP].chksum) >=20 > - if pkts[0].haslayer(Vxlan) =3D=3D 1: > - inner =3D pkts[0][Vxlan] > + if pkts[0].haslayer('VXLAN') =3D=3D 1: > + inner =3D pkts[0]['VXLAN'] > if inner.haslayer(IP) =3D=3D 1: > chk_sums['inner_ip'] =3D hex(inner[IP].chksum) > if inner[IP].proto =3D=3D 6: > @@ -240,7 +240,7 @@ class VxlanTestConfig(object): > cwd =3D os.getcwd() > dir_vxlan_module =3D cwd + r'/' + FOLDERS['Depends'] > 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 vxlan import VXLAN") > self.test_case.tester.scapy_append( > 'pcap =3D rdpcap("%s")' % self.pcap_file) > self.test_case.tester.scapy_append( > @@ -341,29 +341,29 @@ class TestVxlan(TestCase, IxiaPacketGenerator): > self.tunnel_perf =3D [ > {'Packet': 'Normal', 'tunnel_filter': 'None', > 'recvqueue': 'Single', 'Mpps': {}, 'pct': {}}, > - {'Packet': 'Vxlan', 'tunnel_filter': 'None', > + {'Packet': 'VXLAN', 'tunnel_filter': 'None', > 'recvqueue': 'Single', 'Mpps': {}, 'pct': {}}, > - {'Packet': 'Vxlan', 'tunnel_filter': 'imac-ivlan', > + {'Packet': 'VXLAN', 'tunnel_filter': 'imac-ivlan', > 'recvqueue': 'Single', 'Mpps': {}, 'pct': {}}, > - {'Packet': 'Vxlan', 'tunnel_filter': 'imac-ivlan-tenid', > + {'Packet': 'VXLAN', 'tunnel_filter': 'imac-ivlan-tenid', > 'recvqueue': 'Single', 'Mpps': {}, 'pct': {}}, > - {'Packet': 'Vxlan', 'tunnel_filter': 'imac-tenid', > + {'Packet': 'VXLAN', 'tunnel_filter': 'imac-tenid', > 'recvqueue': 'Single', 'Mpps': {}, 'pct': {}}, > - {'Packet': 'Vxlan', 'tunnel_filter': 'imac', > + {'Packet': 'VXLAN', 'tunnel_filter': 'imac', > 'recvqueue': 'Single', 'Mpps': {}, 'pct': {}}, > - {'Packet': 'Vxlan', 'tunnel_filter': 'omac-imac-tenid', > + {'Packet': 'VXLAN', 'tunnel_filter': 'omac-imac-tenid', > 'recvqueue': 'Single', 'Mpps': {}, 'pct': {}}, > - {'Packet': 'Vxlan', 'tunnel_filter': 'None', > + {'Packet': 'VXLAN', 'tunnel_filter': 'None', > 'recvqueue': 'Multi', 'Mpps': {}, 'pct': {}}, > - {'Packet': 'Vxlan', 'tunnel_filter': 'imac-ivlan', > + {'Packet': 'VXLAN', 'tunnel_filter': 'imac-ivlan', > 'recvqueue': 'Multi', 'Mpps': {}, 'pct': {}}, > - {'Packet': 'Vxlan', 'tunnel_filter': 'imac-ivlan-tenid', > + {'Packet': 'VXLAN', 'tunnel_filter': 'imac-ivlan-tenid', > 'recvqueue': 'Multi', 'Mpps': {}, 'pct': {}}, > - {'Packet': 'Vxlan', 'tunnel_filter': 'imac-tenid', > + {'Packet': 'VXLAN', 'tunnel_filter': 'imac-tenid', > 'recvqueue': 'Multi', 'Mpps': {}, 'pct': {}}, > - {'Packet': 'Vxlan', 'tunnel_filter': 'imac', > + {'Packet': 'VXLAN', 'tunnel_filter': 'imac', > 'recvqueue': 'Multi', 'Mpps': {}, 'pct': {}}, > - {'Packet': 'Vxlan', 'tunnel_filter': > + {'Packet': 'VXLAN', 'tunnel_filter': > 'omac-imac-tenid', 'recvqueue': 'Multi'} > ] >=20 > diff --git a/tests/TestSuite_vxlan_gpe_support_in_i40e.py > b/tests/TestSuite_vxlan_gpe_support_in_i40e.py > index f87c541..aa3ee82 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 vxlan import VXLAN > from scapy.config import conf > from test_case import TestCase > from settings import FOLDERS > @@ -110,7 +110,7 @@ class VxlanGpeTestConfig(object): > outer[UDP].dport =3D self.outer_udp_dst >=20 > if self.outer_udp_dst =3D=3D VXLAN_GPE_PORT: > - self.pkt =3D outer / Vxlan(vni=3Dself.vni) / inner > + self.pkt =3D outer / VXLAN(vni=3Dself.vni) / inner > else: > self.pkt =3D outer / ("X" * self.payload_size) >=20 > @@ -124,7 +124,7 @@ class VxlanGpeTestConfig(object): > cwd =3D os.getcwd() > dir_vxlan_module =3D cwd + r'/' + FOLDERS['Depends'] > 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 vxlan import VXLAN") > self.test_case.tester.scapy_append( > 'pcap =3D rdpcap("%s")' % self.pcap_file) > self.test_case.tester.scapy_append( > @@ -231,6 +231,10 @@ class TestVxlanGpeSupportInI40e(TestCase): > # send one VXLAN-GPE type packet > packet =3D 'sendp([Ether(dst=3D"%s")/IP(src=3D"18.0.0.1")/UDP(dp= ort=3D%d, > sport=3D43)/' % (mac, VXLAN_GPE_PORT) + \ > 'VXLAN(flags=3D12)/IP(src=3D"10.0.0.1")], iface=3D"%s",= count=3D1)' % > self.tester_iface > + cwd =3D os.getcwd() > + dir_vxlan_module =3D cwd + r'/' + FOLDERS['Depends'] > + self.tester.scapy_append("sys.path.append('%s')" % > dir_vxlan_module) > + self.tester.scapy_append("from vxlan import VXLAN") > self.tester.scapy_append(packet) > self.tester.scapy_execute() > out =3D self.dut.get_session_output(timeout=3D5) > @@ -239,6 +243,8 @@ class TestVxlanGpeSupportInI40e(TestCase): >=20 > # delete the VXLAN-GPE packet type, testpmd should treat the pac= ket > as a normal UDP packet > self.pmdout.execute_cmd('port config 0 udp_tunnel_port rm > vxlan-gpe %s' % VXLAN_GPE_PORT) > + self.tester.scapy_append("sys.path.append('%s')" % > dir_vxlan_module) > + self.tester.scapy_append("from vxlan import VXLAN") > self.tester.scapy_append(packet) > self.tester.scapy_execute() > out =3D self.dut.get_session_output(timeout=3D5) > diff --git a/tests/TestSuite_vxlan_sample.py b/tests/TestSuite_vxlan_samp= le.py > index 2033866..5bc9269 100644 > --- a/tests/TestSuite_vxlan_sample.py > +++ b/tests/TestSuite_vxlan_sample.py > @@ -54,7 +54,7 @@ from scapy.utils import wrpcap, rdpcap from > scapy.layers.inet import Ether, IP, TCP, UDP from scapy.layers.inet6 imp= ort IPv6 > from scapy.layers.l2 import Dot1Q -from vxlan import Vxlan > +from vxlan import VXLAN > from scapy.layers.sctp import SCTP, SCTPChunkData from scapy.sendrecv > import sniff from scapy.config import conf @@ -310,10 +310,10 @@ class > TestVxlanSample(TestCase): >=20 > pkts =3D self.transfer_capture_file() > self.verify(len(pkts) >=3D 1, "Failed to capture packets") > - self.verify(pkts[0].haslayer(Vxlan) =3D=3D 1, > + self.verify(pkts[0].haslayer('VXLAN') =3D=3D 1, > "Packet not encapsulated") > try: > - payload =3D str(pkts[0][UDP][Vxlan][UDP].payload) > + payload =3D str(pkts[0][UDP]['VXLAN'][UDP].payload) > for i in range(18): > self.verify(ord(payload[i]) =3D=3D 88, "Check udp da= ta > failed") > except: > @@ -344,7 +344,7 @@ class TestVxlanSample(TestCase): > pkts =3D self.transfer_capture_file() > # check packet number and payload > self.verify(len(pkts) >=3D 1, "Failed to capture packets") > - self.verify(pkts[0].haslayer(Vxlan) =3D=3D 0, > + self.verify(pkts[0].haslayer('VXLAN') =3D=3D 0, > "Packet not de-encapsulated") >=20 > try: > @@ -380,10 +380,10 @@ class TestVxlanSample(TestCase): >=20 > # check packet number and payload > self.verify(len(pkts) >=3D 1, "Failed to capture packets") > - self.verify(pkts[0].haslayer(Vxlan) =3D=3D 1, > + self.verify(pkts[0].haslayer('VXLAN') =3D=3D 1, > "Packet not encapsulated") > try: > - payload =3D str(pkts[0][UDP][Vxlan][UDP].payload) > + payload =3D str(pkts[0][UDP]['VXLAN'][UDP].payload) > for i in range(18): > self.verify(ord(payload[i]) =3D=3D 88, "Check udp da= ta > failed") > except: > @@ -428,7 +428,7 @@ class TestVxlanSample(TestCase): > pkts =3D self.transfer_capture_file() > # check packet number and payload > self.verify(len(pkts) >=3D 1, "Failed to capture packets") > - self.verify(pkts[0].haslayer(Vxlan) =3D=3D 1, > + self.verify(pkts[0].haslayer('VXLAN') =3D=3D 1, > "Packet not encapsulated") > chksums =3D vxlan_pkt.get_chksums(pcap=3D'vxlan_cap.pcap') > print utils.GREEN("Checksum : %s" % chksums) @@ -466,7 +466,= 7 > @@ class TestVxlanSample(TestCase): >=20 > # calculation checksum, and check it > for pkt in pkts: > - inner =3D pkt[Vxlan] > + inner =3D pkt['VXLAN'] > inner_ip_chksum =3D inner[IP].chksum > del inner.chksum > inner[IP] =3D inner[IP].__class__(str(inner[IP])) > @@ -484,10 +484,10 @@ class TestVxlanSample(TestCase): >=20 > length =3D 0 > for pkt in pkts: > - self.verify(pkt.haslayer(Vxlan) =3D=3D 1, > + self.verify(pkt.haslayer('VXLAN') =3D=3D 1, > "Packet not encapsulated") > try: > - payload =3D str(pkt[UDP][Vxlan][TCP].payload) > + payload =3D str(pkt[UDP]['VXLAN'][TCP].payload) > self.verify(len(payload) <=3D self.def_mss, > "TCP payload oversized") > length +=3D len(payload) > -- > 2.7.4