Merge autotest upstream from @5318 ~ @5336

client/virt/tests/whql_client_install.py

Index: client/virt/tests/whql_client_install.py
diff --git a/client/tests/kvm/tests/whql_client_install.py b/client/virt/tests/whql_client_install.py
similarity index 93%
rename from client/tests/kvm/tests/whql_client_install.py
rename to client/virt/tests/whql_client_install.py
index f5d725d4240593461cb1cac395f5c00a0d8785a3..2d72a5ec9562e2582692a3836848ffbd0b12ae55 100644
--- a/client/tests/kvm/tests/whql_client_install.py
+++ b/client/virt/tests/whql_client_install.py
@@ -1,6 +1,6 @@
 import logging, time, os
 from autotest_lib.client.common_lib import error
-import kvm_test_utils, kvm_utils, rss_file_transfer
+from autotest_lib.client.virt import virt_utils, virt_test_utils, rss_client
 
 
 def run_whql_client_install(test, params, env):
@@ -37,7 +37,7 @@ def run_whql_client_install(test, params, env):
     client_password = params.get("client_password")
     dsso_delete_machine_binary = params.get("dsso_delete_machine_binary",
                                             "deps/whql_delete_machine_15.exe")
-    dsso_delete_machine_binary = kvm_utils.get_path(test.bindir,
+    dsso_delete_machine_binary = virt_utils.get_path(test.bindir,
                                                     dsso_delete_machine_binary)
     install_timeout = float(params.get("install_timeout", 600))
     install_cmd = params.get("install_cmd")
@@ -45,15 +45,15 @@ def run_whql_client_install(test, params, env):
 
     # Stop WTT service(s) on client
     for svc in wtt_services.split():
-        kvm_test_utils.stop_windows_service(session, svc)
+        virt_test_utils.stop_windows_service(session, svc)
 
     # Copy dsso_delete_machine_binary to server
-    rss_file_transfer.upload(server_address, server_file_transfer_port,
+    rss_client.upload(server_address, server_file_transfer_port,
                              dsso_delete_machine_binary, server_studio_path,
                              timeout=60)
 
     # Open a shell session with server
-    server_session = kvm_utils.remote_login("nc", server_address,
+    server_session = virt_utils.remote_login("nc", server_address,
                                             server_shell_port, "", "",
                                             session.prompt, session.linesep)
     server_session.set_status_test_command(session.status_test_command)
@@ -81,7 +81,7 @@ def run_whql_client_install(test, params, env):
     server_session.close()
 
     # Rename the client machine
-    client_name = "autotest_%s" % kvm_utils.generate_random_string(4)
+    client_name = "autotest_%s" % virt_utils.generate_random_string(4)
     logging.info("Renaming client machine to '%s'", client_name)
     cmd = ('wmic computersystem where name="%%computername%%" rename name="%s"'
            % client_name)