Merge pull request #1517 from sitoliu/netperf_vlan

netperf_stress: enable netperf test with vlan ip

qemu/tests/netperf_stress.py

@@ -39,6 +39,10 @@ def run(test, params, env):
     status_test_command = params.get("status_test_command", "echo $?")
     compile_option_client = params.get("compile_option_client", "")
     compile_option_server = params.get("compile_option_server", "")
+    if (params.get("netperf_vlan_test", "no") == "yes" and
+            params.get("host_vlan_ip")):
+        host_ip = params.get("host_vlan_ip")
+    else:
         host_ip = utils_net.get_host_ip_address(params)
 
     vms = params.get("vms")
@@ -52,7 +56,12 @@ def run(test, params, env):
             session = server_vm.wait_for_login(timeout=login_timeout)
             session.cmd("service iptables stop; iptables -F",
                         ignore_all_errors=True)
+            if params.get("netperf_vlan_test", "no") == "yes":
+                vlan_nic = params.get("vlan_nic")
+                server_ip = utils_net.get_linux_ipaddr(session, vlan_nic)[0]
+            else:
                 server_ip = server_vm.get_address()
+
             s_info["ip"] = server_ip
             s_info["os_type"] = params.get("os_type_%s" % server, os_type)
             s_info["username"] = params.get("username_%s" % server,
@@ -101,6 +110,10 @@ def run(test, params, env):
             session = client_vm.wait_for_login(timeout=login_timeout)
             session.cmd("service iptables stop; iptables -F",
                         ignore_all_errors=True)
+            if params.get("netperf_vlan_test", "no") == "yes":
+                vlan_nic = params.get("vlan_nic")
+                client_ip = utils_net.get_linux_ipaddr(session, vlan_nic)[0]
+            else:
                 client_ip = client_vm.get_address()
             c_info["ip"] = client_ip
             c_info["os_type"] = params.get("os_type_%s" % client, os_type)