From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 7D1772B96 for ; Wed, 20 Apr 2016 07:31:15 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP; 19 Apr 2016 22:31:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,508,1455004800"; d="scan'208";a="958744638" Received: from unknown (HELO dpdk-fedora20.icx.intel.com) ([10.238.55.12]) by orsmga002.jf.intel.com with ESMTP; 19 Apr 2016 22:31:13 -0700 From: Lijuan Tu To: dts@dpdk.org, yong.liu@intel.com Cc: Lijuan Tu Date: Wed, 20 Apr 2016 13:26:52 +0800 Message-Id: <1461130012-17041-1-git-send-email-lijuanx.a.tu@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH]tests vxlan_sample(tep_termination): Import vxlan layer from dep folder 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: , X-List-Received-Date: Wed, 20 Apr 2016 05:31:17 -0000 Signed-off-by: Lijuan Tu --- tests/TestSuite_vxlan_sample.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/TestSuite_vxlan_sample.py b/tests/TestSuite_vxlan_sample.py index c7e0701..13e63c5 100644 --- a/tests/TestSuite_vxlan_sample.py +++ b/tests/TestSuite_vxlan_sample.py @@ -48,12 +48,13 @@ from etgen import IxiaPacketGenerator from qemu_kvm import QEMUKvm from TestSuite_vxlan import VxlanTestConfig from pmd_output import PmdOutput +from packet import IncreaseIP, IncreaseIPv6 -from scapy.utils import struct, socket, wrpcap, rdpcap +from scapy.utils import wrpcap, rdpcap from scapy.layers.inet import Ether, IP, TCP, UDP from scapy.layers.inet6 import IPv6 from scapy.layers.l2 import Dot1Q -from scapy.layers.vxlan import Vxlan +from vxlan import Vxlan from scapy.layers.sctp import SCTP, SCTPChunkData from scapy.sendrecv import sniff from scapy.config import conf @@ -345,7 +346,7 @@ class TestVxlanSample(TestCase): # create vxlan pcap file and tranfer it to tester vxlan_pkt = VxlanTestConfig(self, **params) - vxlan_pkt.create_pcap(scp=True) + vxlan_pkt.create_pcap() # start capture self.start_capture(tester_iface, pkt_dmac=params['inner_mac_dst']) @@ -380,7 +381,7 @@ class TestVxlanSample(TestCase): # create vxlan pcap file and tranfer it to tester vxlan_pkt = VxlanTestConfig(self, **params) - vxlan_pkt.create_pcap(scp=True) + vxlan_pkt.create_pcap() # start capture self.start_capture(tester_iface, pkt_smac=self.pf_mac) @@ -422,19 +423,19 @@ class TestVxlanSample(TestCase): vxlan_pkt = VxlanTestConfig(self, **params) vxlan_pkt.create_pcap() chksums_ref = vxlan_pkt.get_chksums() + print dts.GREEN("Checksum reference: %s" % chksums_ref) params['inner_ip_invalid'] = 1 params['inner_l4_invalid'] = 1 # create vxlan pcap file and tranfer it to tester vxlan_pkt = VxlanTestConfig(self, **params) - vxlan_pkt.create_pcap(scp=True) + vxlan_pkt.create_pcap() # start capture self.start_capture(tester_iface, pkt_smac=self.pf_mac) vxlan_pkt.send_pcap(tester_iface) time.sleep(5) - # transfer capture pcap to dts server pkts = self.transfer_capture_file() # check packet number and payload @@ -442,6 +443,7 @@ class TestVxlanSample(TestCase): self.verify(pkts[0].haslayer(Vxlan) == 1, "Packet not encapsulated") chksums = vxlan_pkt.get_chksums(pcap='vxlan_cap.pcap') + print dts.GREEN("Checksum : %s" % chksums) for key in chksums_ref: if 'inner' in key: # only check inner packet chksum self.verify(chksums[key] == chksums_ref[key], @@ -551,7 +553,7 @@ class TestVxlanSample(TestCase): # create vxlan pcap file and tranfer it to tester vxlan_pkt = VxlanTestConfig(self, **params) - vxlan_pkt.create_pcap(scp=False) + vxlan_pkt.create_pcap() if perf_cfg['VirtIO'] == "Two Ports": # create vxlan packet pf mac + vni=1000 + inner virtIO port0 -- 1.9.3