[dts] [PATCH V1 0/8] sync virtual tests to dpdk1705

[dts] [PATCH V1 0/8] sync virtual tests to dpdk1705

[Lijuan Tu]

*** BLURB HERE ***

Lijuan Tu (8):
  tests/vf_packet_rxtx: remove crc-strip parameter
  tests/vf_macfilter: remove crc-strip parameter
  tests/vf_offload: fix variable name typo and remove crc-strip
    parameter
  tests/vf_port_start_stop: make adjustment to dpdk1705
  test/vf_rss: remove crc-strip parameter, and check RSS config command.
  test/vf_to_vf_nic_bridge: remove crc-strip parameter and filter misc
    packets.
  tests/vm_power_manager: adjust to dpdk1705
  tests/vxlan_sample: adjust to dpdk1705

 tests/TestSuite_vf_macfilter.py        | 10 ++-----
 tests/TestSuite_vf_offload.py          | 21 +++++++-------
 tests/TestSuite_vf_packet_rxtx.py      | 15 +++++++---
 tests/TestSuite_vf_port_start_stop.py  | 30 ++++++++++++++++++--
 tests/TestSuite_vf_rss.py              | 13 +++------
 tests/TestSuite_vf_to_vf_nic_bridge.py | 15 ++++------
 tests/TestSuite_vm_power_manager.py    | 14 ---------
 tests/TestSuite_vxlan.py               |  7 ++++-
 tests/TestSuite_vxlan_sample.py        | 52 ++++++++++++++++++++--------------
 9 files changed, 97 insertions(+), 80 deletions(-)

-- 
1.9.3

[dts] [PATCH V1 1/8] tests/vf_packet_rxtx: remove crc-strip parameter

[Lijuan Tu]

Signed-off-by: Lijuan Tu <lijuanx.a.tu@intel.com>
---
 tests/TestSuite_vf_packet_rxtx.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/TestSuite_vf_packet_rxtx.py b/tests/TestSuite_vf_packet_rxtx.py
index 3eb9737..50451f6 100644
--- a/tests/TestSuite_vf_packet_rxtx.py
+++ b/tests/TestSuite_vf_packet_rxtx.py
@@ -52,7 +52,10 @@ class TestVfPacketRxtx(TestCase):
                 self.host_testpmd = PmdOutput(self.dut)
                 eal_param = '-b %(vf0)s -b %(vf1)s' % {'vf0': self.sriov_vfs_port_0[0].pci,
                                                        'vf1': self.sriov_vfs_port_1[0].pci}
-                self.host_testpmd.start_testpmd("1S/2C/2T", "--crc-strip", eal_param=eal_param)
+                if (self.nic in ["niantic", "sageville", "sagepond"]):
+                    self.host_testpmd.start_testpmd("1S/9C/1T", "--txq=4 --rxq=4 ", eal_param=eal_param)
+                else:
+                    self.host_testpmd.start_testpmd("1S/5C/1T", "", eal_param=eal_param)
 
             # set up VM0 ENV
             self.vm0 = QEMUKvm(self.dut, 'vm0', 'vf_packet_rxtx')
@@ -114,7 +117,7 @@ class TestVfPacketRxtx(TestCase):
         self.vm0_dut_ports = self.vm_dut_0.get_ports('any')
         port_id_0 = 0
         self.vm0_testpmd = PmdOutput(self.vm_dut_0)
-        self.vm0_testpmd.start_testpmd(VM_CORES_MASK, '--crc-strip')
+        out = self.vm0_testpmd.start_testpmd(VM_CORES_MASK)
         pmd_vf0_mac = self.vm0_testpmd.get_port_mac(port_id_0)
         self.vm0_testpmd.execute_cmd('set fwd mac')
         self.vm0_testpmd.execute_cmd('start')
@@ -132,6 +135,7 @@ class TestVfPacketRxtx(TestCase):
         pkt_param=[("ether", {'dst': dst_mac, 'src': src_mac})]
 
         result = self.tester.check_random_pkts(tgen_ports, allow_miss=False, params=pkt_param)
+        print self.vm0_testpmd.execute_cmd('show port stats all')
         self.verify(result != False, "VF0 failed to forward packets to VF1")
 
 
@@ -244,7 +248,7 @@ class TestVfPacketRxtx(TestCase):
         port_id_1 = 1
 
         self.vm0_testpmd = PmdOutput(self.vm_dut_0)
-        self.vm0_testpmd.start_testpmd(VM_CORES_MASK, '--crc-strip')
+        self.vm0_testpmd.start_testpmd(VM_CORES_MASK)
         self.vm0_testpmd.execute_cmd('show port info all')
         pmd0_vf0_mac = self.vm0_testpmd.get_port_mac(port_id_0)
         self.vm0_testpmd.execute_cmd('set fwd mac')
@@ -253,7 +257,7 @@ class TestVfPacketRxtx(TestCase):
         time.sleep(2)
 
         self.vm1_testpmd = PmdOutput(self.vm_dut_1)
-        self.vm1_testpmd.start_testpmd(VM_CORES_MASK, '--crc-strip')
+        self.vm1_testpmd.start_testpmd(VM_CORES_MASK)
         self.vm1_testpmd.execute_cmd('show port info all')
 
         tx_port = self.tester.get_local_port(self.dut_ports[0])
@@ -305,6 +309,9 @@ class TestVfPacketRxtx(TestCase):
 
         for port_id in self.dut_ports:
             self.dut.destroy_sriov_vfs_by_port(port_id)
+            # DPDK-1754
+            intf = self.dut.ports_info[port_id]['intf']
+            self.dut.send_expect("ethtool -s %s autoneg on" % intf, "# ")
 
     def tear_down_all(self):
         pass
-- 
1.9.3

[dts] [PATCH V1 2/8] tests/vf_macfilter: remove crc-strip parameter

[Lijuan Tu]

Signed-off-by: Lijuan Tu <lijuanx.a.tu@intel.com>
---
 tests/TestSuite_vf_macfilter.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/tests/TestSuite_vf_macfilter.py b/tests/TestSuite_vf_macfilter.py
index 2eb521e..09611bf 100644
--- a/tests/TestSuite_vf_macfilter.py
+++ b/tests/TestSuite_vf_macfilter.py
@@ -116,10 +116,7 @@ class TestVfMacFilter(TestCase):
 
         self.vm0_dut_ports = self.vm_dut_0.get_ports('any')
         self.vm0_testpmd = PmdOutput(self.vm_dut_0)
-        if self.kdriver == "i40e":
-            self.vm0_testpmd.start_testpmd(VM_CORES_MASK, '--crc-strip')
-        else:
-            self.vm0_testpmd.start_testpmd(VM_CORES_MASK)
+        self.vm0_testpmd.start_testpmd(VM_CORES_MASK)
         # Get VF's MAC
         pmd_vf0_mac = self.vm0_testpmd.get_port_mac(0)
         vf0_wrongmac = "00:11:22:33:48:55"
@@ -163,10 +160,7 @@ class TestVfMacFilter(TestCase):
 
         self.vm0_dut_ports = self.vm_dut_0.get_ports('any')
         self.vm0_testpmd = PmdOutput(self.vm_dut_0)
-        if self.kdriver == "i40e":
-            self.vm0_testpmd.start_testpmd(VM_CORES_MASK, '--crc-strip')
-        else:
-            self.vm0_testpmd.start_testpmd(VM_CORES_MASK)
+        self.vm0_testpmd.start_testpmd(VM_CORES_MASK)
         
         # Get VF0 port MAC address
         pmd_vf0_mac = self.vm0_testpmd.get_port_mac(0)
-- 
1.9.3

[dts] [PATCH V1 3/8] tests/vf_offload: fix variable name typo and remove crc-strip parameter

[Lijuan Tu]

Signed-off-by: Lijuan Tu <lijuanx.a.tu@intel.com>
---
 tests/TestSuite_vf_offload.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/tests/TestSuite_vf_offload.py b/tests/TestSuite_vf_offload.py
index 6a4ab52..ed6d106 100644
--- a/tests/TestSuite_vf_offload.py
+++ b/tests/TestSuite_vf_offload.py
@@ -2,6 +2,7 @@
 
 import re
 import time
+import string
 
 import utils
 from qemu_kvm import QEMUKvm
@@ -10,7 +11,6 @@ from pmd_output import PmdOutput
 from utils import RED, GREEN
 from net_device import NetDevice
 from crb import Crb
-from scapy.all import *
 from settings import HEADER_SIZE
 VM_CORES_MASK = 'all'
 
@@ -77,19 +77,20 @@ class TestVfOffload(TestCase):
             self.vm0_dut_ports = None
             #destroy vm0
             self.vm0.stop()
+            self.dut.virt_exit()
             self.vm0 = None
 
         if getattr(self, 'host_testpmd', None):
             self.host_testpmd.execute_cmd('quit', '# ')
             self.host_testpmd = None
 
-        if getattr(self, 'used_dut_port_0', None):
+        if getattr(self, 'used_dut_port_0', None) != None:
             self.dut.destroy_sriov_vfs_by_port(self.used_dut_port_0)
             port = self.dut.ports_info[self.used_dut_port_0]['port']
             port.bind_driver()
             self.used_dut_port_0 = None
 
-        if getattr(self, 'used_dut_port_1', None):
+        if getattr(self, 'used_dut_port_1', None) != None:
             self.dut.destroy_sriov_vfs_by_port(self.used_dut_port_1)
             port = self.dut.ports_info[self.used_dut_port_1]['port']
             port.bind_driver()
@@ -191,7 +192,7 @@ class TestVfOffload(TestCase):
         """
         self.vm0_testpmd.start_testpmd(VM_CORES_MASK, "--portmask=%s " %
                                       (self.portMask) + "--disable-hw-vlan --enable-rx-cksum " + "--txqflags=0 " +
-                                      "--crc-strip --port-topology=loop")
+                                      "--port-topology=loop")
         self.vm0_testpmd.execute_cmd('set fwd csum')
 
         time.sleep(2)
@@ -206,8 +207,8 @@ class TestVfOffload(TestCase):
                 'IPv6/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="%s")/UDP(chksum=0xf)/("X"*46)' % (mac, sndIPv6),
                 'IPv6/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="%s")/TCP(chksum=0xf)/("X"*46)' % (mac, sndIPv6)}
 
-        expIP = "10.0.0.2"
-        expIPv6 = '::2'
+        expIP = sndIP
+        expIPv6 = sndIPv6
         pkts_ref = {'IP/UDP': 'Ether(dst="02:00:00:00:00:00", src="%s")/IP(src="%s")/UDP()/("X"*46)' % (mac, expIP),
                     'IP/TCP': 'Ether(dst="02:00:00:00:00:00", src="%s")/IP(src="%s")/TCP()/("X"*46)' % (mac, expIP),
                     'IP/SCTP': 'Ether(dst="02:00:00:00:00:00", src="%s")/IP(src="%s")/SCTP()/("X"*48)' % (mac, expIP),
@@ -241,7 +242,7 @@ class TestVfOffload(TestCase):
 
         self.vm0_testpmd.start_testpmd(VM_CORES_MASK, "--portmask=%s " %
                                       (self.portMask) + "--disable-hw-vlan --enable-rx-cksum " +
-                                      "--crc-strip --port-topology=loop")
+                                      "--port-topology=loop")
         self.vm0_testpmd.execute_cmd('set fwd csum')
 
         time.sleep(2)
@@ -254,8 +255,8 @@ class TestVfOffload(TestCase):
                    'IPv6/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="%s")/UDP(chksum=0xf)/("X"*46)' % (mac, sndIPv6),
                    'IPv6/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="%s")/TCP(chksum=0xf)/("X"*46)' % (mac, sndIPv6)}
 
-        expIP = "10.0.0.2"
-        expIPv6 = '::2'
+        expIP = sndIP
+        expIPv6 = sndIPv6
         expPkts = {'IP/UDP': 'Ether(dst="02:00:00:00:00:00", src="%s")/IP(src="%s")/UDP()/("X"*46)' % (mac, expIP),
                    'IP/TCP': 'Ether(dst="02:00:00:00:00:00", src="%s")/IP(src="%s")/TCP()/("X"*46)' % (mac, expIP),
                    'IPv6/UDP': 'Ether(dst="02:00:00:00:00:00", src="%s")/IPv6(src="%s")/UDP()/("X"*46)' % (mac, expIPv6),
@@ -333,7 +334,7 @@ class TestVfOffload(TestCase):
         self.vm0_testpmd.start_testpmd(VM_CORES_MASK, "--portmask=%s " %
                                       (self.portMask) + "--enable-rx-cksum " +
                                       "--txqflags=0 " + 
-                                      "--crc-strip --port-topology=loop")
+                                      "--port-topology=loop")
 
         mac = self.vm0_testpmd.get_port_mac(0)
 
-- 
1.9.3

[dts] [PATCH V1 4/8] tests/vf_port_start_stop: make adjustment to dpdk1705

[Lijuan Tu]

1, check the result always in the testing because of testing may failed any time
2, config the mac before start qemu ,because create 2 vfs from 1 pf ,the auto mac may not invild
3, remove crc-strip parameter

Signed-off-by: Lijuan Tu <lijuanx.a.tu@intel.com>
---
 tests/TestSuite_vf_port_start_stop.py | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/tests/TestSuite_vf_port_start_stop.py b/tests/TestSuite_vf_port_start_stop.py
index a272033..05c4582 100644
--- a/tests/TestSuite_vf_port_start_stop.py
+++ b/tests/TestSuite_vf_port_start_stop.py
@@ -122,6 +122,24 @@ class TestVfPortStartStop(TestCase):
             self.verify("Checking link statuses" in out, "ERROR: port start all")
             testpmd.execute_cmd('start')
             time.sleep(.5)
+
+            # we should check the result always in the testing.
+            port_id_0 = 0
+            port_id_1 = 1
+            vf0_stats = self.vm0_testpmd.get_pmd_stats(port_id_0)
+            vf1_stats = self.vm0_testpmd.get_pmd_stats(port_id_1)
+
+            vf0_rx_cnt = vf0_stats['RX-packets']
+            self.verify(vf0_rx_cnt != 0, "no packet was received by vm0_VF0")
+            if self.kdriver == "i40e":
+                vf0_rx_err = vf0_stats['RX-errors']
+                self.verify(vf0_rx_err == 0, "vm0_VF0 rx-errors")
+
+            vf1_tx_cnt = vf1_stats['TX-packets']
+            self.verify(vf1_tx_cnt != 0, "no packet was transmitted by vm0_VF1")
+
+            vf1_tx_err = vf1_stats['TX-errors']
+            self.verify(vf1_tx_err == 0, "vm0_VF0 tx-errors")
             testpmd.execute_cmd('stop')
             out = testpmd.execute_cmd('port stop all')
             self.verify("Checking link statuses" in out, "ERROR: port stop all")
@@ -134,8 +152,9 @@ class TestVfPortStartStop(TestCase):
         vf0_rx_cnt = vf0_stats['RX-packets']
         self.verify(vf0_rx_cnt != 0, "no packet was received by vm0_VF0")
 
-        vf0_rx_err = vf0_stats['RX-errors']
-        self.verify(vf0_rx_err == 0, "vm0_VF0 rx-errors")
+        if self.kdriver == "i40e":
+            vf0_rx_err = vf0_stats['RX-errors']
+            self.verify(vf0_rx_err == 0, "vm0_VF0 rx-errors")
     
         vf1_tx_cnt = vf1_stats['TX-packets']
         self.verify(vf1_tx_cnt != 0, "no packet was transmitted by vm0_VF1")
@@ -148,6 +167,10 @@ class TestVfPortStartStop(TestCase):
         self.used_dut_port = self.dut_ports[0]
         self.dut.generate_sriov_vfs_by_port(self.used_dut_port, 2, driver=driver)
         self.sriov_vfs_port = self.dut.ports_info[self.used_dut_port]['vfs_port']
+        # create 2 vfs from 0 ,the auto mac may not invild.
+        pf_intf0 = self.dut.ports_info[0]['port'].get_interface_name()
+        self.pf0_vf0_mac = "00:12:34:56:78:01"
+        self.dut.send_expect("ip link set %s vf 0 mac %s" %(pf_intf0, self.pf0_vf0_mac), "#")
 
         try:
 
@@ -189,6 +212,7 @@ class TestVfPortStartStop(TestCase):
             self.vm0_dut_ports = None
             #destroy vm0
             self.vm0.stop()
+            time.sleep(3)
             self.vm0 = None
 
         if getattr(self, 'host_testpmd', None):
@@ -214,7 +238,7 @@ class TestVfPortStartStop(TestCase):
         self.vm0_dut_ports = self.vm_dut_0.get_ports('any')
 
         self.vm0_testpmd = PmdOutput(self.vm_dut_0)
-        self.vm0_testpmd.start_testpmd(VM_CORES_MASK, '--crc-strip')
+        self.vm0_testpmd.start_testpmd(VM_CORES_MASK)
         self.vm0_testpmd.execute_cmd('set fwd mac')
 
         time.sleep(2)
-- 
1.9.3

[dts] [PATCH V1 5/8] test/vf_rss: remove crc-strip parameter, and check RSS config command.

[Lijuan Tu]

Signed-off-by: Lijuan Tu <lijuanx.a.tu@intel.com>
---
 tests/TestSuite_vf_rss.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/tests/TestSuite_vf_rss.py b/tests/TestSuite_vf_rss.py
index a08a79d..92d9009 100644
--- a/tests/TestSuite_vf_rss.py
+++ b/tests/TestSuite_vf_rss.py
@@ -305,10 +305,7 @@ class TestVfRss(TestCase):
         self.vm_dut_0.kill_all()
 
         # test with different rss queues
-        if self.kdriver == "i40e":
-            eal_param = '--crc-strip'
-        else:
-            eal_param = ''
+        eal_param = ''
         for queue in testQueues:
 
             self.vm0_testpmd.start_testpmd(
@@ -354,10 +351,7 @@ class TestVfRss(TestCase):
 
         self.vm_dut_0.kill_all()
 
-        if self.kdriver == "i40e":
-            eal_param = '--crc-strip'
-        else:
-            eal_param = ''
+        eal_param = ''
         # test with different rss queues
         for queue in testQueues:
 
@@ -367,7 +361,8 @@ class TestVfRss(TestCase):
             for iptype,rsstype in iptypes.items():
                 self.vm_dut_0.send_expect("set verbose 8", "testpmd> ")
                 self.vm_dut_0.send_expect("set fwd rxonly", "testpmd> ")
-                self.vm_dut_0.send_expect("port config all rss %s" % rsstype, "testpmd> ")
+                out = self.vm_dut_0.send_expect("port config all rss %s" % rsstype, "testpmd> ")
+                self.verify("Operation not supported" not in out, "Operation not supported")
                 self.vm_dut_0.send_expect(
                     "set nbcore %d" % (queue + 1), "testpmd> ")
 
-- 
1.9.3

[dts] [PATCH V1 6/8] test/vf_to_vf_nic_bridge: remove crc-strip parameter and filter misc packets.

[Lijuan Tu]

Signed-off-by: Lijuan Tu <lijuanx.a.tu@intel.com>
---
 tests/TestSuite_vf_to_vf_nic_bridge.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/tests/TestSuite_vf_to_vf_nic_bridge.py b/tests/TestSuite_vf_to_vf_nic_bridge.py
index 065038a..b890be0 100644
--- a/tests/TestSuite_vf_to_vf_nic_bridge.py
+++ b/tests/TestSuite_vf_to_vf_nic_bridge.py
@@ -100,6 +100,7 @@ class TestVF2VFBridge(TestCase):
         if self.vm1 is not None:
             self.vm1.stop()
             self.vm1 = None
+        self.dut.virt_exit()
         if self.pf_port_for_vfs is not None:
             self.dut.destroy_sriov_vfs_by_port(self.pf_port_for_vfs)
             port = self.dut.ports_info[self.pf_port_for_vfs]['port']
@@ -155,10 +156,7 @@ class TestVF2VFBridge(TestCase):
     def test_2vf_d2d_pktgen_stream(self):
         self.vm0_ports = self.vm0_dut.get_ports('any')
         self.vm0_pmd = PmdOutput(self.vm0_dut)
-        if self.kdriver == "i40e":
-            self.vm0_pmd.start_testpmd('all', '--crc-strip')
-        else:
-            self.vm0_pmd.start_testpmd('all')
+        self.vm0_pmd.start_testpmd('all')
         self.vm0_pmd.execute_cmd('set fwd rxonly')
         self.vm0_pmd.execute_cmd('start')
 
@@ -187,7 +185,6 @@ class TestVF2VFBridge(TestCase):
         self.vm0_dut.restore_interfaces()
         self.vm0_ports = self.vm0_dut.get_ports('any')
         vf0_intf = self.vm0_dut.ports_info[self.vm0_ports[0]]['intf']
-        self.vm0_dut.send_expect('tcpdump -i %s -s 1000 ' % vf0_intf, 'tcpdump', 30)
 
         self.vm1_ports = self.vm1_dut.get_ports('any')
         self.prepare_pktgen(self.vm1_dut)
@@ -201,6 +198,7 @@ class TestVF2VFBridge(TestCase):
         load = {}
         load['content'] = "'X'*46"
         self.generate_pcap_pkt(dst, src, load)
+        self.vm0_dut.send_expect('tcpdump -i %s -s 1000 "ether src %s and ether dst %s"' % (vf0_intf, src['ether'], dst['ether']), 'tcpdump', 30)
         self.send_stream_pktgen(self.vm1_dut)
         self.stop_stream_pktgen(self.vm1_dut)
 
@@ -217,12 +215,11 @@ class TestVF2VFBridge(TestCase):
     def test_2vf_k2d_scapy_stream(self):
         self.vm0_ports = self.vm0_dut.get_ports('any')
         self.vm0_pmd = PmdOutput(self.vm0_dut)
-        if self.kdriver == "i40e":
-            self.vm0_pmd.start_testpmd('all', '--crc-strip')
-        else:
-            self.vm0_pmd.start_testpmd('all')
+        self.vm0_pmd.start_testpmd('all')
         self.vm0_pmd.execute_cmd('set fwd rxonly')
         self.vm0_pmd.execute_cmd('start')
+        # disable promisc to filter misc packets from tester.
+        self.vm0_pmd.execute_cmd('set promisc all off')
         self.vm0_pmd.execute_cmd('clear port stats all')
 
         self.vm1_ports = self.vm1_dut.get_ports('any')
-- 
1.9.3

[dts] [PATCH V1 7/8] tests/vm_power_manager: adjust to dpdk1705

[Lijuan Tu]

the output message of testpmd changed on dpdk1705

Signed-off-by: Lijuan Tu <lijuanx.a.tu@intel.com>
---
 tests/TestSuite_vm_power_manager.py | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/tests/TestSuite_vm_power_manager.py b/tests/TestSuite_vm_power_manager.py
index 26245e6..5e273f4 100644
--- a/tests/TestSuite_vm_power_manager.py
+++ b/tests/TestSuite_vm_power_manager.py
@@ -94,8 +94,6 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
         self.vm_power_dir = "./examples/vm_power_manager/"
         mgr_cmd = self.vm_power_dir + "build/vm_power_mgr -c 0x3 -n 4"
         out = self.dut.send_expect(mgr_cmd, "vmpower>", 120)
-        self.verify("Initialized successfully" in out,
-                    "Power manager failed to initialized")
         self.dut.send_expect("add_vm %s" % self.vm_name, "vmpower>")
         self.dut.send_expect("add_channels %s all" % self.vm_name, "vmpower>")
         vm_info = self.dut.send_expect("show_vm %s" % self.vm_name, "vmpower>")
@@ -119,8 +117,6 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
         guest_cmd = self.vm_power_dir + \
             "guest_cli/build/guest_vm_power_mgr -c 0xf -n 4 -- -i"
         out = self.vm_dut.send_expect(guest_cmd, "vmpower\(guest\)>", 120)
-        self.verify("now connected" in out,
-                    "Power manager guest failed to connect")
         self.vm_dut.send_expect("quit", "# ")
 
     def get_cpu_frequency(self, core_id):
@@ -140,8 +136,6 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
         guest_cmd = self.vm_power_dir + \
             "guest_cli/build/guest_vm_power_mgr -c 0xf -n 4 -- -i"
         out = self.vm_dut.send_expect(guest_cmd, "vmpower\(guest\)>", 120)
-        self.verify("now connected" in out,
-                    "Power manager guest failed to connect")
 
         for vcpu in range(self.core_num):
             self.vm_dut.send_expect(
@@ -172,8 +166,6 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
         guest_cmd = self.vm_power_dir + \
             "guest_cli/build/guest_vm_power_mgr -c 0xf -n 4 -- -i"
         out = self.vm_dut.send_expect(guest_cmd, "vmpower\(guest\)>", 120)
-        self.verify("now connected" in out,
-                    "Power manager guest failed to connect")
 
         for vcpu in range(self.core_num):
             self.vm_dut.send_expect(
@@ -201,8 +193,6 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
         guest_cmd = self.vm_power_dir + \
             "guest_cli/build/guest_vm_power_mgr -c 0xf -n 4 -- -i"
         out = self.vm_dut.send_expect(guest_cmd, "vmpower\(guest\)>", 120)
-        self.verify("now connected" in out,
-                    "Power manager guest failed to connect")
 
         max_freq_path = "cat /sys/devices/system/cpu/cpu%s/cpufreq/" + \
                         "cpuinfo_max_freq"
@@ -226,8 +216,6 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
         guest_cmd = self.vm_power_dir + \
             "guest_cli/build/guest_vm_power_mgr -c 0xf -n 4 -- -i"
         out = self.vm_dut.send_expect(guest_cmd, "vmpower\(guest\)>", 120)
-        self.verify("now connected" in out,
-                    "Power manager guest failed to connect")
 
         min_freq_path = "cat /sys/devices/system/cpu/cpu%s/cpufreq/" + \
                         "cpuinfo_min_freq"
@@ -293,8 +281,6 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
         guest_cmd = self.vm_power_dir + \
             "guest_cli/build/guest_vm_power_mgr -c 0xf -n 4 -- -i"
         out = vm2_dut.send_expect(guest_cmd, "vmpower\(guest\)>", 120)
-        self.verify("now connected" in out,
-                    "Power manager guest failed to connect")
         vm2_dut.send_expect("quit", "# ")
         vm2.stop()
 
-- 
1.9.3

[dts] [PATCH 8/8] tests/vxlan_sample: adjust to dpdk1705

[Lijuan Tu]

Signed-off-by: Lijuan Tu <lijuanx.a.tu@intel.com>
---
 tests/TestSuite_vxlan.py        |  7 +++++-
 tests/TestSuite_vxlan_sample.py | 52 ++++++++++++++++++++++++-----------------
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/tests/TestSuite_vxlan.py b/tests/TestSuite_vxlan.py
index 5fef9d9..73ed3e8 100644
--- a/tests/TestSuite_vxlan.py
+++ b/tests/TestSuite_vxlan.py
@@ -24,7 +24,7 @@ from scapy.config import conf
 from scapy.route import *
 
 from test_case import TestCase
-from settings import HEADER_SIZE
+from settings import HEADER_SIZE, FOLDERS
 from etgen import IxiaPacketGenerator
 
 #
@@ -236,6 +236,11 @@ class VxlanTestConfig(object):
         """
         Send vxlan pcap file by iface
         """
+        # load vxlan module to scapy
+        cwd = os.getcwd()
+        dir_vxlan_module = 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(
             'pcap = rdpcap("%s")' % self.pcap_file)
         self.test_case.tester.scapy_append(
diff --git a/tests/TestSuite_vxlan_sample.py b/tests/TestSuite_vxlan_sample.py
index 1dbb727..aacdd4f 100644
--- a/tests/TestSuite_vxlan_sample.py
+++ b/tests/TestSuite_vxlan_sample.py
@@ -75,15 +75,6 @@ class TestVxlanSample(TestCase):
         """
         Run before each test suite.
         """
-        # Change the config file to support vhost and recompile the package.
-        self.dut.send_expect("sed -i -e 's/RTE_LIBRTE_VHOST=n$/"
-                             + "RTE_LIBRTE_VHOST=y/' config/"
-                             + "common_base", "# ", 30)
-        # temporary disable skip_setup
-        skip_setup = self.dut.skip_setup
-        self.dut.skip_setup = False
-        self.dut.build_install_dpdk(self.target)
-        self.dut.skip_setup = skip_setup
 
         # this feature only enable in FVL now
         self.verify(self.nic in ["fortville_eagle", "fortville_spirit",
@@ -106,15 +97,6 @@ class TestVxlanSample(TestCase):
         self.verify("Error" not in out, "compilation error 1")
         self.verify("No such file" not in out, "compilation error 2")
 
-        # build for vhost user environment
-        self.dut.send_expect("cd lib/librte_vhost/eventfd_link", "# ")
-        self.dut.send_expect("make", "# ")
-        self.dut.send_expect("insmod ./eventfd_link.ko", "# ")
-        self.dut.send_expect("cd ../../..", "# ")
-        out = self.dut.send_expect("lsmod |grep eventfd_link", "# ")
-        self.verify("eventfd_link" in out,
-                    "Failed to insmod eventfd_link driver")
-
         self.def_mac = "00:00:20:00:00:20"
         self.vm_dut = None
         self.tep_app = "./examples/tep_termination/build/tep_termination"
@@ -163,10 +145,11 @@ class TestVxlanSample(TestCase):
 
         encap = self.FEAT_ENABLE
         decap = self.FEAT_ENABLE
-        chksum = self.FEAT_DISABLE
+        chksum = self.FEAT_ENABLE
         if self.running_case == "test_vxlan_sample_encap":
             encap = self.FEAT_ENABLE
             decap = self.FEAT_DISABLE
+            chksum = self.FEAT_ENABLE
         elif self.running_case == "test_vxlan_sample_decap":
             encap = self.FEAT_DISABLE
             decap = self.FEAT_ENABLE
@@ -201,7 +184,7 @@ class TestVxlanSample(TestCase):
         self.dut.send_expect("rm -rf vhost-net", "# ")
 
         # start tep_termination first
-        self.dut.send_expect(tep_cmd, "VHOST_CONFIG: bind to vhost-net")
+        self.dut.send_expect(tep_cmd, "EAL")
 
         # start one vm
         self.vm = QEMUKvm(self.dut, 'vm0', 'vxlan_sample')
@@ -237,6 +220,8 @@ class TestVxlanSample(TestCase):
             self.vm.stop()
             self.vm = None
 
+        self.dut.virt_exit()
+
     def mac_address_add(self, number):
         if number > 15:
             return ''
@@ -302,6 +287,7 @@ class TestVxlanSample(TestCase):
         self.tester.session.copy_file_from(self.capture_file)
 
         if os.path.isfile('vxlan_cap.pcap'):
+            self.verify(os.path.getsize('vxlan_cap.pcap') != 0, "Packets receive error")
             pkts = rdpcap('vxlan_cap.pcap')
         else:
             pkts = []
@@ -312,12 +298,13 @@ class TestVxlanSample(TestCase):
         case_pass = True
         tester_recv_port = self.tester.get_local_port(self.pf)
         tester_iface = self.tester.get_interface(tester_recv_port)
+        tester_smac = self.tester.get_mac(tester_recv_port)
 
         if pkt_type == "normal_udp":
             self.start_capture(tester_iface, pkt_smac=self.pf_mac)
             self.tester.scapy_append(
-                'sendp([Ether(dst="%s")/IP()/UDP()/Raw("X"*18)], iface="%s")'
-                % (self.pf_mac, tester_iface))
+                'sendp([Ether(dst="%s",src="%s")/IP()/UDP()/Raw("X"*18)], iface="%s")'
+                % (self.pf_mac, tester_smac, tester_iface))
             self.tester.scapy_execute()
             time.sleep(5)
 
@@ -390,6 +377,7 @@ class TestVxlanSample(TestCase):
 
             # transfer capture pcap to server
             pkts = self.transfer_capture_file()
+
             # check packet number and payload
             self.verify(len(pkts) >= 1, "Failed to capture packets")
             self.verify(pkts[0].haslayer(Vxlan) == 1,
@@ -461,6 +449,7 @@ class TestVxlanSample(TestCase):
             mac_incr = 2 * vm_id + vf_id
             params['inner_mac_dst'] = self.mac_address_add(mac_incr)
             params['payload_size'] = 892  # 256 + 256 + 256 + 124
+
             # extract reference chksum value
             vxlan_pkt = VxlanTestConfig(self, **params)
             vxlan_pkt.create_pcap()
@@ -474,6 +463,25 @@ class TestVxlanSample(TestCase):
             pkts = self.transfer_capture_file()
             # check packet number and payload
             self.verify(len(pkts) == 4, "Failed to capture tso packets")
+
+            # calculation  checksum, and checkt it
+            for pkt in pkts:
+                inner = pkt[Vxlan]
+                inner_ip_chksum = inner[IP].chksum
+                del inner.chksum
+                inner[IP] = inner[IP].__class__(str(inner[IP]))
+                inner_ip_chksum_ref = inner[IP].chksum
+                print utils.GREEN("inner ip checksum reference: %x" % inner_ip_chksum_ref)
+                print utils.GREEN("inner ip checksum: %x" % inner_ip_chksum)
+                self.verify(inner_ip_chksum == inner_ip_chksum_ref, "inner ip checksum error")
+                inner_l4_chksum = inner[params['inner_l4_type']].chksum
+                del inner[params['inner_l4_type']].chksum
+                inner[params['inner_l4_type']] = inner[params['inner_l4_type']].__class__(str(inner[params['inner_l4_type']]))
+                inner_l4_chksum_ref =  inner[params['inner_l4_type']].chksum
+                print utils.GREEN("inner l4 checksum reference: %x" % inner_l4_chksum_ref)
+                print utils.GREEN("inner l4 checksum: %x" % inner_l4_chksum)
+                self.verify(inner_l4_chksum == inner_l4_chksum_ref, "inner %s checksum error" % params['inner_l4_type'])
+
             length = 0
             for pkt in pkts:
                 self.verify(pkt.haslayer(Vxlan) == 1,
-- 
1.9.3

Re: [dts] [PATCH V1 1/8] tests/vf_packet_rxtx: remove crc-strip parameter

[Liu, Yong]

Thanks, applied.

On 05/12/2017 04:18 PM, Lijuan Tu wrote:
> Signed-off-by: Lijuan Tu<lijuanx.a.tu@intel.com>
> ---
>   tests/TestSuite_vf_packet_rxtx.py | 15 +++++++++++----
>   1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/tests/TestSuite_vf_packet_rxtx.py b/tests/TestSuite_vf_packet_rxtx.py
> index 3eb9737..50451f6 100644
> --- a/tests/TestSuite_vf_packet_rxtx.py
> +++ b/tests/TestSuite_vf_packet_rxtx.py

Re: [dts] [PATCH V1 2/8] tests/vf_macfilter: remove crc-strip parameter

[Liu, Yong]

Thanks, applied.

On 05/12/2017 04:18 PM, Lijuan Tu wrote:
> Signed-off-by: Lijuan Tu<lijuanx.a.tu@intel.com>
> ---
>   tests/TestSuite_vf_macfilter.py | 10 ++--------
>   1 file changed, 2 insertions(+), 8 deletions(-)

Re: [dts] [PATCH V1 3/8] tests/vf_offload: fix variable name typo and remove crc-strip parameter

[Liu, Yong]

Thanks, applied.

On 05/12/2017 04:18 PM, Lijuan Tu wrote:
> Signed-off-by: Lijuan Tu<lijuanx.a.tu@intel.com>
> ---
>   tests/TestSuite_vf_offload.py | 21 +++++++++++----------
>   1 file changed, 11 insertions(+), 10 deletions(-)

Re: [dts] [PATCH V1 4/8] tests/vf_port_start_stop: make adjustment to dpdk1705

[Liu, Yong]

Lijuan, please add comments for why i40e driver behavior is different 
than others.

On 05/12/2017 04:18 PM, Lijuan Tu wrote:
> +            if self.kdriver == "i40e":
> +                vf0_rx_err = vf0_stats['RX-errors']
> +                self.verify(vf0_rx_err == 0, "vm0_VF0 rx-errors")

Re: [dts] [PATCH V1 5/8] test/vf_rss: remove crc-strip parameter, and check RSS config command.

[Liu, Yong]

Thanks, applied.

On 05/12/2017 04:18 PM, Lijuan Tu wrote:
> Signed-off-by: Lijuan Tu<lijuanx.a.tu@intel.com>
> ---
>   tests/TestSuite_vf_rss.py | 13 ++++---------
>   1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/tests/TestSuite_vf_rss.py b/tests/TestSuite_vf_rss.py

Re: [dts] [PATCH V1 6/8] test/vf_to_vf_nic_bridge: remove crc-strip parameter and filter misc packets.

[Liu, Yong]

Thanks, applied.

On 05/12/2017 04:18 PM, Lijuan Tu wrote:
> Signed-off-by: Lijuan Tu<lijuanx.a.tu@intel.com>
> ---
>   tests/TestSuite_vf_to_vf_nic_bridge.py | 15 ++++++---------
>   1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/tests/TestSuite_vf_to_vf_nic_bridge.py b/tests/TestSuite_vf_to_vf_nic_bridge.py
> index 065038a..b890be0 100644
> --- a/tests/TestSuite_vf_to_vf_nic_bridge.py
> +++ b/tests/TestSuite_vf_to_vf_nic_bridge.py

Re: [dts] [PATCH V1 7/8] tests/vm_power_manager: adjust to dpdk1705

[Liu, Yong]

Thanks, applied.

On 05/12/2017 04:18 PM, Lijuan Tu wrote:
> the output message of testpmd changed on dpdk1705
>
> Signed-off-by: Lijuan Tu<lijuanx.a.tu@intel.com>
> ---
>   tests/TestSuite_vm_power_manager.py | 14 --------------
>   1 file changed, 14 deletions(-)

Re: [dts] [PATCH 8/8] tests/vxlan_sample: adjust to dpdk1705

[Liu, Yong]

Lijuan, look like you added new case for checksum. Please send out 
separated patch set with test plan for this new case.

Thanks,
Marvin

On 05/12/2017 04:18 PM, Lijuan Tu wrote:
> Signed-off-by: Lijuan Tu<lijuanx.a.tu@intel.com>
> ---
>   tests/TestSuite_vxlan.py        |  7 +++++-
>   tests/TestSuite_vxlan_sample.py | 52 ++++++++++++++++++++++++-----------------
>   2 files changed, 36 insertions(+), 23 deletions(-)