Merge branch 'v16.11'

4 files changed, 10 insertions, 17 deletions

diff --git a/framework/packet.py b/framework/packet.py
index f19a638..fb99d35 100755
--- a/framework/packet.py
+++ b/framework/packet.py
@@ -345,7 +345,8 @@ class scapy(object):
         self.print_summary()
         if intf != '':
             # fix fortville can't receive packets with 00:00:00:00:00:00
-            self.pkt.getlayer(0).src = get_if_hwaddr(intf)
+            if self.pkt.getlayer(0).src == "00:00:00:00:00:00":
+                self.pkt.getlayer(0).src = get_if_hwaddr(intf)
             sendp(self.pkt, iface=intf, count=count)
 
 
diff --git a/test_plans/sriov_kvm_test_plan.rst b/test_plans/sriov_kvm_test_plan.rst
index 5317d10..713c217 100644
--- a/test_plans/sriov_kvm_test_plan.rst
+++ b/test_plans/sriov_kvm_test_plan.rst
@@ -465,7 +465,7 @@ them to VM0, VM1, VM2 and VM3.Start PF driver on the Host and skip the VF
 driver will has been already attached to VMs::
     
     On PF ./tools/pci_unbind.py --bind=igb_uio 0000:08:00.0
-    echo 2 > /sys/bus/pci/devices/0000\:08\:00.0/max_vfs
+    echo 4 > /sys/bus/pci/devices/0000\:08\:00.0/max_vfs
     ./x86_64-default-linuxapp-gcc/app/testpmd -c f -n 4 -b 0000:08:10.0 -b 0000:08:10.2 -b 0000:08:10.4 -b 0000:08:10.6 --  -i
  
 If you want to run all common 4VM cases, please run testpmd on VM0, VM1, VM2
diff --git a/tests/TestSuite_kni.py b/tests/TestSuite_kni.py
index 00f1e25..0825903 100644
--- a/tests/TestSuite_kni.py
+++ b/tests/TestSuite_kni.py
@@ -469,17 +469,14 @@ class TestKni(TestCase):
         for port in self.config['ports']:
             virtual_interface = self.virtual_interface_name(port)
 
-            # Set up
+            # some time, the virtual interface stats is up when it create
+            # so should set down before set up.
+            self.dut.send_expect(
+                "ifconfig %s down" % virtual_interface, "# ")
             out = self.dut.send_expect(
                 "ifconfig %s up" % virtual_interface, "# ")
             self.verify("Configure network interface of %d up" %
                         port in out, "ifconfig up not supported")
-
-            out = self.dut.send_expect(
-                "ip -family inet6 address show dev %s" % virtual_interface, "# ")
-            self.verify(
-                "inet6 " in out, "ifconfig up the port_virtual_interaces not support")
-
             # Add an IPv6 address
             out = self.dut.send_expect(
                 "ifconfig %s add fe80::%d" % (virtual_interface, port + 1), "# ")
@@ -549,11 +546,6 @@ class TestKni(TestCase):
             virtual_interface = self.virtual_interface_name(port)
 
             out = self.dut.send_expect(
-                "ping -w 2 -I %s 192.168.%d.1" % (virtual_interface, port), "# ", 10)
-            self.verify("64 bytes from 192.168.%d.1:" %
-                        port in out, "ping not supported")
-
-            out = self.dut.send_expect(
                 "ping -w 2 -I %s 192.168.%d.2" % (virtual_interface, port), "# ", 10)
             self.verify("64 bytes from 192.168.%d.2:" %
                         port in out, "ping not supported")
diff --git a/tests/TestSuite_sriov_kvm.py b/tests/TestSuite_sriov_kvm.py
index 41af4dd..b74da5e 100644
--- a/tests/TestSuite_sriov_kvm.py
+++ b/tests/TestSuite_sriov_kvm.py
@@ -469,7 +469,7 @@ class TestSriovKvm(TestCase):
             self.vm2.stop()
             self.vm2 = None
 
-        if getattr(slef, 'vm3', None):
+        if getattr(self, 'vm3', None):
             self.vm3.stop()
             self.vm3 = None
 
@@ -482,7 +482,7 @@ class TestSriovKvm(TestCase):
             self.dut.destroy_sriov_vfs_by_port(self.used_dut_port)
             port = self.ports_info[self.used_dut_port]['port']
             port.bind_driver('igb_uio')
-            slef.used_dut_port = None
+            self.used_dut_port = None
 
         for port_id in self.dut_ports:
             port = self.dut.ports_info[port_id]['port']
@@ -1247,7 +1247,7 @@ class TestSriovKvm(TestCase):
             self.destroy_2vm_2vf_env()
 
         if self.setup_2vm_2pf_env_flag == 1:
-            slef.destroy_2vm_2pf_env()
+            self.destroy_2vm_2pf_env()
 
         if self.setup_4vm_prerequisite_flag == 1:
             self.destroy_four_vm_common_prerequisite()