Merge pull request #145 from FengYang/sr_iov_netperf

Sr iov netperf

qemu/tests/cfg/device_assignment_netperf_test.cfg

+- device_assignment_netperf_test:
+    only pf_assignable
+    virt_test_type = qemu
+    type = netperf_stress
+    image_snapshot = yes
+    hostpassword = redhat
+    netperf_client = ${main_vm}
+    netperf_server = localhost
+    netperf_link = netperf-2.6.0.tar.bz2
+    server_path = /var/tmp/
+    client_path = /var/tmp/
+    netperf_test_duration = 600
+    netperf_para_sessions = 1
+    test_protocol = TCP_STREAM
+    netperf_package_sizes = 32 64 128 256 512 1024 2048 4096 8192 16834
+    Windows:
+        netperf_server_link_win = "netserver-2.6.0.exe"
+        netperf_client_link_win = "netperf.exe"
+        server_path_win = "c:\\"
+        client_path_win = "c:\\"
+    variants:
+        - vfio-pci:
+            device_driver = vfio-pci
+            no  Host_RHEL.5, Host_RHEL.6
+        - pci-assign:
+            device_driver = pci-assign
+            no Host_RHEL.7

qemu/tests/cfg/sr_iov_netperf_test.cfg

+- sr_iov_netperf_test:
+    only vf_assignable
+    virt_test_type = qemu
+    type = netperf_stress
+    image_snapshot = yes
+    hostpassword = redhat
+    vms += " vm2 vm3"
+    netperf_client = " vm2 vm3"
+    netperf_server = ${main_vm}
+    netperf_link = netperf-2.6.0.tar.bz2
+    server_path = /var/tmp/
+    client_path = /var/tmp/
+    netperf_test_duration = 600
+    netperf_para_sessions = 1
+    test_protocol = TCP_STREAM
+    netperf_package_sizes = 64 256 1024 4096 16384 65535
+    Windows:
+        netperf_server_link_win = "netserver-2.6.0.exe"
+        netperf_client_link_win = "netperf.exe"
+        server_path_win = "c:\\"
+        client_path_win = "c:\\"
+    variants:
+        - vfio-pci:
+            device_driver = vfio-pci
+            no  Host_RHEL.5, Host_RHEL.6
+        - pci-assign:
+            device_driver = pci-assign
+            no Host_RHEL.7

qemu/tests/netperf_stress.py

@@ -170,7 +170,7 @@ def run(test, params, env):
         test_protocol = params.get("test_protocol", "TCP_STREAM")
         netperf_cmd_prefix = params.get("netperf_cmd_prefix", "")
         netperf_output_unit = params.get("netperf_output_unit", " ")
-        netperf_pkg_size = params.get("netperf_pkg_size", "")
+        netperf_package_sizes = params.get("netperf_package_sizes")
         test_option = "-t %s -l %s" % (test_protocol, netperf_test_duration)
         if params.get("netperf_remote_cpu") == "yes":
             test_option += " -C"
@@ -178,8 +178,6 @@ def run(test, params, env):
             test_option += " -c"
         if netperf_output_unit in "GMKgmk":
             test_option += " -f %s" % netperf_output_unit
-        if netperf_pkg_size.isdigit():
-            test_option += " -- -m %s" % netperf_pkg_size
         start_time = time.time()
         stop_time = start_time + netperf_test_duration
         num = 0
@@ -188,7 +186,8 @@ def run(test, params, env):
             index = num % s_len
             server_ip = server_infos[index]["ip"]
             n_client.bg_start(server_ip, test_option,
-                              netperf_para_sess, netperf_cmd_prefix)
+                              netperf_para_sess, netperf_cmd_prefix,
+                              package_sizes=netperf_package_sizes)
             if utils_misc.wait_for(n_client.is_netperf_running, 10, 0, 1,
                                    "Wait netperf test start"):
                 logging.info("Netperf test start successfully.")