Change the netperf test version source path

1.Change the netperf test version 2.Change the path to get netperf Signed-off-by: Lei Yang <[email protected]>
autotest · Mar 4, 2021 · 40af15b · 40af15b
1 parent 19a88d0
commit 40af15b
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 13 deletions.
diff --git a/generic/tests/cfg/multi_queues_test.cfg b/generic/tests/cfg/multi_queues_test.cfg
@@ -16,7 +16,7 @@
         - with_netperf:
             disable_pci_msi = no
             hostpassword = redhat
-            netperf_link = netperf-2.6.0.tar.bz2
+            netperf_link = netperf-2.7.1.tar.bz2
             RHEL.4:
                 netperf_link = netperf-2.4.5.tar.bz2
             server_path = /var/tmp/

diff --git a/qemu/tests/cfg/boot_with_different_vectors.cfg b/qemu/tests/cfg/boot_with_different_vectors.cfg
@@ -18,7 +18,7 @@
             hostpassword = redhat
             netperf_client = ${vms}
             netperf_server = localhost
-            netperf_link = netperf-2.6.0.tar.bz2
+            netperf_link = netperf-2.7.1.tar.bz2
             server_path = /var/tmp/
             client_path = /var/tmp/
             netperf_test_duration = 300

diff --git a/qemu/tests/cfg/bridge_vlan.cfg b/qemu/tests/cfg/bridge_vlan.cfg
@@ -15,7 +15,7 @@
     add_vlan_cmd = "ip link add link %s name %s type vlan id %s"
     rm_host_vlan_cmd = "ip link delete %s type vlan"
     # netperf stress config
-    netperf_link = netperf-2.6.0.tar.bz2
+    netperf_link = netperf-2.7.1.tar.bz2
     server_path = /var/tmp/
     client_path = /var/tmp/
     netperf_test_duration = 120

diff --git a/qemu/tests/cfg/flow_caches_stress_test.cfg b/qemu/tests/cfg/flow_caches_stress_test.cfg
@@ -6,7 +6,7 @@
     start_vm = no
     #netperf server is main vm, the netperf client is the host or another vm
     #Set the netperf client via dsthost
-    netperf_link = netperf-2.6.0.tar.bz2
+    netperf_link = netperf-2.7.1.tar.bz2
     RHEL.4:
         netperf_link = netperf-2.4.5.tar.bz2
     server_path = /var/tmp/

diff --git a/qemu/tests/cfg/migrate.cfg b/qemu/tests/cfg/migrate.cfg
@@ -210,7 +210,7 @@
             # when using the relative path, the base dir is "shared/deps/".
             #netperf_download_link = ftp://ftp.netperf.org/netperf/netperf-2.7.1.tar.bz2
             #pkg_md5sum = 9654ffdfd4c4f2c93ce3733cd9ed9236
-            netperf_link = netperf-2.7.1.tar.bz2
+            netperf_link = netperf-2.7.1-1.tar.bz2
             RHEL.4:
                 netperf_link = netperf-2.4.5.tar.bz2
             server_path = /var/tmp

diff --git a/qemu/tests/cfg/mq_change_qnum.cfg b/qemu/tests/cfg/mq_change_qnum.cfg
@@ -55,7 +55,7 @@
             hostpassword = redhat
             netperf_client = ${vms}
             netperf_server = localhost
-            netperf_link = netperf-2.6.0.tar.bz2
+            netperf_link = netperf-2.7.1.tar.bz2
             RHEL.4:
                 netperf_link = netperf-2.4.5.tar.bz2
             server_path = /var/tmp/

diff --git a/qemu/tests/cfg/netkvm_in_use.cfg b/qemu/tests/cfg/netkvm_in_use.cfg
@@ -10,7 +10,7 @@
     driver_name = "netkvm"
     run_bgstress = netperf_stress
     bg_stress_run_flag = netperf_run
-    netperf_link = netperf-2.6.0.tar.bz2
+    netperf_link = netperf-2.7.1.tar.bz2
     server_path = /var/tmp/
     client_path = /var/tmp/
     test_protocols = TCP_STREAM

diff --git a/qemu/tests/cfg/netperf_stress_test.cfg b/qemu/tests/cfg/netperf_stress_test.cfg
@@ -5,7 +5,7 @@
     hostpassword = redhat
     #netperf server is main vm, the netperf client is the host or another vm
     #Set the netperf client via dsthost
-    netperf_link = netperf-2.6.0.tar.bz2
+    netperf_link = netperf-2.7.1.tar.bz2
     server_path = /var/tmp/
     client_path = /var/tmp/
     netperf_test_duration = 120

diff --git a/qemu/tests/cfg/nic_opt.cfg b/qemu/tests/cfg/nic_opt.cfg
@@ -4,7 +4,7 @@
     only x86_64 i386 ppc64 ppc64le
     variants:
         - opt_test_netperf:
-            netperf_server_link = netperf-2.6.0.tar.bz2
+            netperf_server_link = netperf-2.7.1.tar.bz2
             netperf_client_link = ${netperf_server_link}
             server_path = /var/tmp/
             client_path = ${server_path}

diff --git a/qemu/tests/cfg/ovs_qos.cfg b/qemu/tests/cfg/ovs_qos.cfg
@@ -6,7 +6,7 @@
     netperf_server = vm2
     vms = ${netperf_client} ${netperf_server}
     netperf_client_options = " -l 60"
-    netperf_link = netperf-2.6.0.tar.bz2
+    netperf_link = netperf-2.7.1.tar.bz2 
     RHEL.4:
         netperf_link = netperf-2.4.5.tar.bz
     server_path = /var/tmp/

diff --git a/qemu/tests/cfg/virtual_nic.cfg b/qemu/tests/cfg/virtual_nic.cfg
@@ -35,7 +35,7 @@
             netperf_server = localhost
             hostpassword = redhat
             background_stress_test = netperf_stress
-            netperf_link = netperf-2.6.0.tar.bz2
+            netperf_link = netperf-2.7.1.tar.bz2
             server_path = /var/tmp/
             client_path = /var/tmp/
             RHEL.4:

diff --git a/qemu/tests/flow_caches_stress_test.py b/qemu/tests/flow_caches_stress_test.py
@@ -1,4 +1,5 @@
 import logging
+import os
 
 from avocado.utils import process
 
@@ -75,8 +76,8 @@ def get_if_queues(ifname):
             error_context.context(err, logging.info)
             session.cmd(nf_conntrack_max_set_cmd)
 
-    netperf_link = utils_misc.get_path(data_dir.get_deps_dir("netperf"),
-                                       params["netperf_link"])
+    netperf_link = os.path.join(data_dir.get_deps_dir("netperf"),
+                                params.get("netperf_link"))
     md5sum = params.get("pkg_md5sum")
     client_num = params.get("netperf_client_num", 520)
     netperf_timeout = int(params.get("netperf_timeout", 600))