提交 7e233066 编写于 作者: Y Yiqiao Pu

generic.tests: Add global variable _netserver_started in netperf

Add _netserver_started to judge if need setup netserver during test.
Signed-off-by: NYiqiao Pu <ypu@redhat.com>
上级 c7af8813
......@@ -9,6 +9,9 @@ from autotest.client.shared import error
from virttest import utils_test, utils_misc, utils_net, remote, data_dir
_netserver_started = False
def format_result(result, base="12", fbase="5"):
"""
Format the result to a fixed length string.
......@@ -39,7 +42,7 @@ def netperf_record(results, filter_list, header=False, base="12", fbase="2"):
"""
key_list = []
for key in filter_list:
if results.has_key(key):
if key in results:
key_list.append(key)
record = ""
......@@ -112,7 +115,8 @@ def run(test, params, env):
queues = int(params.get("queues", 1))
if queues > 1:
if params.get("os_type") == "linux":
ethname = utils_net.get_linux_ifname(session, vm.get_mac_address(0))
ethname = utils_net.get_linux_ifname(session,
vm.get_mac_address(0))
session.cmd_status_output("ethtool -L %s combined %s" %
(ethname, queues))
else:
......@@ -401,7 +405,11 @@ def launch_client(sessions, server, server_ctl, host, clients, l, nf_args,
client_path = "/tmp/netperf-%s/src/netperf" % netperf_version
server_path = "/tmp/netperf-%s/src/netserver" % netperf_version
get_status_flag = params.get("get_status_in_guest", "no") == "yes"
global _netserver_started
# Start netserver
if _netserver_started:
logging.debug("Netserver already started.")
else:
error.context("Start Netserver on guest", logging.info)
if params.get("os_type") == "windows":
timeout = float(params.get("timeout", "240"))
......@@ -430,7 +438,6 @@ def launch_client(sessions, server, server_ctl, host, clients, l, nf_args,
err_msg = "Install netserver cygwin failed"
raise error.TestNAError(err_msg)
logging.info("Install netserver in cygwin successfully")
else:
start_session = server_ctl
netserv_start_cmd = params.get("netserv_start_cmd") % cdrom_drv
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册