Merge autotest upstream from @5318 ~ @5336

client/virt/tests/whql_client_install.py

 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):
     """
     WHQL DTM client installation:
     1) Log into the guest (the client machine) and into a DTM server machine
     2) Stop the DTM client service (wttsvc) on the client machine
     3) Delete the client machine from the server's data store
     4) Rename the client machine (give it a randomly generated name)
     5) Move the client machine into the server's workgroup
@@ skipping 16 matching lines @@
     server_shell_port = int(params.get("server_shell_port"))
     server_file_transfer_port = int(params.get("server_file_transfer_port"))
     server_studio_path = params.get("server_studio_path", "%programfiles%\\ "
                                     "Microsoft Driver Test Manager\\Studio")
     server_username = params.get("server_username")
     server_password = params.get("server_password")
     client_username = params.get("client_username")
     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")
     wtt_services = params.get("wtt_services")
 
     # 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)
 
     # Get server and client information
     cmd = "echo %computername%"
     server_name = server_session.cmd_output(cmd).strip()
     client_name = session.cmd_output(cmd).strip()
     cmd = "wmic computersystem get domain"
     server_workgroup = server_session.cmd_output(cmd).strip()
     server_workgroup = server_workgroup.splitlines()[-1]
     regkey = r"HKLM\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters"
     cmd = "reg query %s /v Domain" % regkey
     o = server_session.cmd_output(cmd).strip().splitlines()[-1]
     try:
         server_dns_suffix = o.split(None, 2)[2]
     except IndexError:
         server_dns_suffix = ""
 
     # Delete the client machine from the server's data store (if it's there)
     server_session.cmd("cd %s" % server_studio_path)
     cmd = "%s %s %s" % (os.path.basename(dsso_delete_machine_binary),
                         server_name, client_name)
     server_session.cmd(cmd, print_func=logging.info)
     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)
     session.cmd(cmd, timeout=600)
 
     # Join the server's workgroup
     logging.info("Joining workgroup '%s'", server_workgroup)
     cmd = ('wmic computersystem where name="%%computername%%" call '
            'joindomainorworkgroup name="%s"' % server_workgroup)
     session.cmd(cmd, timeout=600)
@@ skipping 32 matching lines @@
     cmd = ('reg add '
            '"HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion\\winlogon" '
            '/v "%s" /d "%s" /t REG_SZ /f')
     session.cmd(cmd % ("AutoAdminLogon", "1"))
     session.cmd(cmd % ("DefaultUserName", client_username))
     session.cmd(cmd % ("DefaultPassword", client_password))
 
     # Reboot one more time
     session = vm.reboot(session)
     session.close()