Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

client/tests/kvm/deps/whql_submission_15.cs

Index: client/tests/kvm/deps/whql_submission_15.cs
diff --git a/client/tests/kvm/deps/whql_submission_15.cs b/client/tests/kvm/deps/whql_submission_15.cs
index 2a29ac533e2bbf591256ea8eaf0f034b15178ac3..8fa68560063397e9f5e15155bb02123e6acd325f 100644
--- a/client/tests/kvm/deps/whql_submission_15.cs
+++ b/client/tests/kvm/deps/whql_submission_15.cs
@@ -16,140 +16,20 @@ namespace automate0
 {
     class AutoJob
     {
-        // Wait for a machine to show up in the data store
-        static void FindMachine(IResourcePool rootPool, string machineName)
-        {
-            Console.WriteLine("Looking for machine '{0}'", machineName);
-            IResource machine = null;
-            while (true)
-            {
-                try
-                {
-                    machine = rootPool.GetResourceByName(machineName);
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine("Warning: " + e.Message);
-                }
-                // Make sure the machine is valid
-                if (machine != null &&
-                    machine.OperatingSystem != null &&
-                    machine.OperatingSystem.Length > 0 &&
-                    machine.ProcessorArchitecture != null &&
-                    machine.ProcessorArchitecture.Length > 0 &&
-                    machine.GetDevices().Length > 0)
-                    break;
-                System.Threading.Thread.Sleep(1000);
-            }
-            Console.WriteLine("Client machine '{0}' found ({1}, {2})",
-                machineName, machine.OperatingSystem, machine.ProcessorArchitecture);
-        }
-
-        // Delete a machine pool if it exists
-        static void DeleteResourcePool(IDeviceScript script, string poolName)
-        {
-            while (true)
-            {
-                try
-                {
-                    IResourcePool pool = script.GetResourcePoolByName(poolName);
-                    if (pool != null)
-                        script.DeleteResourcePool(pool);
-                    break;
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine("Warning: " + e.Message);
-                    System.Threading.Thread.Sleep(1000);
-                }
-            }
-        }
-
-        // Set the machine's status to 'Reset' and optionally wait for it to become ready
-        static void ResetMachine(IResourcePool rootPool, string machineName, bool wait)
-        {
-            Console.WriteLine("Resetting machine '{0}'", machineName);
-            IResource machine;
-            while (true)
-            {
-                try
-                {
-                    machine = rootPool.GetResourceByName(machineName);
-                    machine.ChangeResourceStatus("Reset");
-                    break;
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine("Warning: " + e.Message);
-                    System.Threading.Thread.Sleep(5000);
-                }
-            }
-            if (wait)
-            {
-                Console.WriteLine("Waiting for machine '{0}' to be ready", machineName);
-                while (machine.Status != "Ready")
-                {
-                    try
-                    {
-                        machine = rootPool.GetResourceByName(machineName);
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine("Warning: " + e.Message);
-                    }
-                    System.Threading.Thread.Sleep(1000);
-                }
-                Console.WriteLine("Machine '{0}' is ready", machineName);
-            }
-        }
-
-        // Look for a device in a machine, and if not found, keep trying for 3 minutes
-        static IDevice GetDevice(IResourcePool rootPool, string machineName, string regexStr)
-        {
-            Regex deviceRegex = new Regex(regexStr, RegexOptions.IgnoreCase);
-            int numAttempts = 1;
-            DateTime endTime = DateTime.Now.AddSeconds(180);
-            while (DateTime.Now < endTime)
-            {
-                IResource machine = rootPool.GetResourceByName(machineName);
-                Console.WriteLine("Looking for device '{0}' in machine '{1}' (machine has {2} devices)",
-                    regexStr, machineName, machine.GetDevices().Length);
-                foreach (IDevice d in machine.GetDevices())
-                {
-                    if (deviceRegex.IsMatch(d.FriendlyName))
-                    {
-                        Console.WriteLine("Found device '{0}'", d.FriendlyName);
-                        return d;
-                    }
-                }
-                Console.WriteLine("Device not found");
-                if (numAttempts % 5 == 0)
-                    ResetMachine(rootPool, machineName, true);
-                else
-                    System.Threading.Thread.Sleep(5000);
-                numAttempts++;
-            }
-            Console.WriteLine("Error: device '{0}' not found", deviceRegex);
-            return null;
-        }
-
         static int Main(string[] args)
         {
-            if (args.Length < 5)
+            if (args.Length != 5)
             {
                 Console.WriteLine("Error: incorrect number of command line arguments");
-                Console.WriteLine("Usage: {0} serverName machinePoolName submissionName timeout machineName0 machineName1 ...",
+                Console.WriteLine("Usage: {0} serverName clientName machinePoolName submissionName timeout",
                     System.Environment.GetCommandLineArgs()[0]);
                 return 1;
             }
             string serverName = args[0];
-            string machinePoolName = args[1];
-            string submissionName = args[2];
-            double timeout = Convert.ToDouble(args[3]);
-
-            List<string> machines = new List<string>();
-            for (int i = 4; i < args.Length; i++)
-                machines.Add(args[i]);
+            string clientName = args[1];
+            string machinePoolName = args[2];
+            string submissionName = args[3];
+            double timeout = Convert.ToDouble(args[4]);
 
             try
             {
@@ -157,17 +37,37 @@ namespace automate0
                 Console.WriteLine("Initializing DeviceScript object");
                 DeviceScript script = new DeviceScript();
                 Console.WriteLine("Connecting to data store");
+
                 script.ConnectToNamedDataStore(serverName);
 
-                // Wait for client machines to become available
+                // Find client machine
                 IResourcePool rootPool = script.GetResourcePoolByName("$");
-                foreach (string machineName in machines)
-                    FindMachine(rootPool, machineName);
-
-                // Delete the machine pool if it already exists
-                DeleteResourcePool(script, machinePoolName);
+                Console.WriteLine("Looking for client machine '{0}'", clientName);
+                IResource machine = null;
+                while (true)
+                {
+                    try
+                    {
+                        machine = rootPool.GetResourceByName(clientName);
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine("Warning: " + e.Message);
+                    }
+                    // Make sure the machine is valid
+                    if (machine != null &&
+                        machine.OperatingSystem != null &&
+                        machine.OperatingSystem.Length > 0 &&
+                        machine.ProcessorArchitecture != null &&
+                        machine.ProcessorArchitecture.Length > 0 &&
+                        machine.GetDevices().Length > 0)
+                        break;
+                    System.Threading.Thread.Sleep(1000);
+                }
+                Console.WriteLine("Client machine '{0}' found ({1}, {2})",
+                    clientName, machine.OperatingSystem, machine.ProcessorArchitecture);
 
-                // Create the machine pool and add the client machines to it
+                // Create machine pool and add client machine to it
                 // (this must be done because jobs cannot be scheduled for machines in the
                 // default pool)
                 try
@@ -179,27 +79,76 @@ namespace automate0
                     Console.WriteLine("Warning: " + e.Message);
                 }
                 IResourcePool newPool = script.GetResourcePoolByName(machinePoolName);
-                foreach (string machineName in machines)
+                Console.WriteLine("Moving the client machine to pool '{0}'", machinePoolName);
+                machine.ChangeResourcePool(newPool);
+
+                // Reset client machine
+                if (machine.Status != "Ready")
                 {
-                    Console.WriteLine("Moving machine '{0}' to pool '{1}'", machineName, machinePoolName);
-                    rootPool.GetResourceByName(machineName).ChangeResourcePool(newPool);
+                    Console.WriteLine("Changing the client machine's status to 'Reset'");
+                    while (true)
+                    {
+                        try
+                        {
+                            machine = rootPool.GetResourceByName(clientName);
+                            machine.ChangeResourceStatus("Unsafe");
+                            System.Threading.Thread.Sleep(5000);
+                            machine.ChangeResourceStatus("Reset");
+                            break;
+                        }
+                        catch (Exception e)
+                        {
+                            Console.WriteLine("Warning: " + e.Message);
+                        }
+                        System.Threading.Thread.Sleep(5000);
+                    }
+                    Console.WriteLine("Waiting for client machine to be ready");
+                    while (machine.Status != "Ready")
+                    {
+                        try
+                        {
+                            machine = rootPool.GetResourceByName(clientName);
+                        }
+                        catch (Exception e)
+                        {
+                            Console.WriteLine("Warning: " + e.Message);
+                        }
+                        System.Threading.Thread.Sleep(1000);
+                    }
                 }
+                Console.WriteLine("Client machine is ready");
 
-                // Reset client machine
-                foreach (string machineName in machines)
-                    ResetMachine(rootPool, machineName, true);
+                // Get requested device regex and look for a matching device
+                Console.WriteLine("Device to test: ");
+                Regex deviceRegex = new Regex(Console.ReadLine(), RegexOptions.IgnoreCase);
+                Console.WriteLine("Looking for device '{0}'", deviceRegex);
+                IDevice device;
+                DateTime endTime = DateTime.Now.AddSeconds(120);
+                while (DateTime.Now < endTime)
+                {
+                    machine = rootPool.GetResourceByName(clientName);
+                    Console.WriteLine("(Client machine has {0} devices)", machine.GetDevices().Length);
+                    foreach (IDevice d in machine.GetDevices())
+                    {
+                        if (deviceRegex.IsMatch(d.FriendlyName))
+                        {
+                            device = d;
+                            goto deviceFound;
+                        }
+                    }
+                    System.Threading.Thread.Sleep(5000);
+                }
+                Console.WriteLine("Error: device '{0}' not found", deviceRegex);
+                return 1;
 
-                // Get requested device regex and look for a matching device in the first machine
-                Console.WriteLine("Device to test:");
-                IDevice device = GetDevice(rootPool, machines[0], Console.ReadLine());
-                if (device == null)
-                    return 1;
+            deviceFound:
+                Console.WriteLine("Found device '{0}'", device.FriendlyName);
 
                 // Get requested jobs regex
-                Console.WriteLine("Jobs to run:");
+                Console.WriteLine("Jobs to run: ");
                 Regex jobRegex = new Regex(Console.ReadLine(), RegexOptions.IgnoreCase);
 
-                // Create a submission
+                // Create submission
                 Object[] existingSubmissions = script.GetSubmissionByName(submissionName);
                 if (existingSubmissions.Length > 0)
                 {
@@ -207,126 +156,83 @@ namespace automate0
                         submissionName);
                     script.DeleteSubmission(((ISubmission)existingSubmissions[0]).Id);
                 }
-                string hardwareId = device.InstanceId.Remove(device.InstanceId.LastIndexOf("\\"));
-                Console.WriteLine("Creating submission '{0}' (hardware ID: {1})", submissionName, hardwareId);
-                ISubmission submission = script.CreateHardwareSubmission(submissionName, newPool.ResourcePoolId, hardwareId);
+                Console.WriteLine("Creating submission '{0}'", submissionName);
+                ISubmission submission = script.CreateHardwareSubmission(submissionName,
+                    newPool.ResourcePoolId, device.InstanceId);
 
-                // Set submission DeviceData
+                // Get DeviceData objects from the user
                 List<Object> deviceDataList = new List<Object>();
                 while (true)
                 {
                     ISubmissionDeviceData dd = script.CreateNewSubmissionDeviceData();
-                    Console.WriteLine("DeviceData name:");
+                    Console.WriteLine("DeviceData name: ");
                     dd.Name = Console.ReadLine();
                     if (dd.Name.Length == 0)
                         break;
-                    Console.WriteLine("DeviceData data:");
+                    Console.WriteLine("DeviceData data: ");
                     dd.Data = Console.ReadLine();
                     deviceDataList.Add(dd);
                 }
+
+                // Set the submission's DeviceData
                 submission.SetDeviceData(deviceDataList.ToArray());
 
-                // Set submission descriptors
+                // Get descriptors from the user
                 List<Object> descriptorList = new List<Object>();
                 while (true)
                 {
-                    Console.WriteLine("Descriptor path:");
+                    Console.WriteLine("Descriptor path: ");
                     string descriptorPath = Console.ReadLine();
                     if (descriptorPath.Length == 0)
                         break;
                     descriptorList.Add(script.GetDescriptorByPath(descriptorPath));
                 }
-                submission.SetLogoDescriptors(descriptorList.ToArray());
 
-                // Set machine dimensions
-                foreach (string machineName in machines)
-                {
-                    IResource machine = rootPool.GetResourceByName(machineName);
-                    while (true)
-                    {
-                        Console.WriteLine("Dimension name ({0}):", machineName);
-                        string dimName = Console.ReadLine();
-                        if (dimName.Length == 0)
-                            break;
-                        Console.WriteLine("Dimension value ({0}):", machineName);
-                        machine.SetDimension(dimName, Console.ReadLine());
-                    }
-                    // Set the WDKSubmissionId dimension for all machines
-                    machine.SetDimension("WDKSubmissionId", submission.Id.ToString() + "_" + submission.Name);
-                }
-
-                // Get job parameters
-                List<string> paramNames = new List<string>();
-                List<string> paramValues = new List<string>();
-                foreach (string machineName in machines)
-                {
-                    while (true)
-                    {
-                        Console.WriteLine("Parameter name ({0}):", machineName);
-                        string paramName = Console.ReadLine();
-                        if (paramName.Length == 0)
-                            break;
-                        Console.WriteLine("Device regex ({0}):", machineName);
-                        IDevice d = GetDevice(rootPool, machineName, Console.ReadLine());
-                        if (d == null)
-                            return 1;
-                        string deviceName = d.GetAttribute("name")[0].ToString();
-                        Console.WriteLine("Setting parameter value to '{0}'", deviceName);
-                        paramNames.Add(paramName);
-                        paramValues.Add(deviceName);
-                    }
-                }
+                // Set the submission's descriptors
+                submission.SetLogoDescriptors(descriptorList.ToArray());
 
-                // Find jobs that match the requested pattern
+                // Create a schedule
+                ISchedule schedule = script.CreateNewSchedule();
                 Console.WriteLine("Scheduling jobs:");
-                List<IJob> jobs = new List<IJob>();
+                int jobCount = 0;
                 foreach (IJob j in submission.GetJobs())
                 {
                     if (jobRegex.IsMatch(j.Name))
-                    {
-                        Console.WriteLine("    " + j.Name);
-                        // Set job parameters
-                        for (int i = 0; i < paramNames.Count; i++)
-                        {
-                            IParameter p = j.GetParameterByName(paramNames[i]);
-                            if (p != null)
-                                p.ScheduleValue = paramValues[i];
-                        }
-                        jobs.Add(j);
+                     {
+                        Console.WriteLine("  " + j.Name);
+                        schedule.AddDeviceJob(device, j);
+                        jobCount++;
                     }
                 }
-                if (jobs.Count == 0)
+                if (jobCount == 0)
                 {
                     Console.WriteLine("Error: no submission jobs match pattern '{0}'", jobRegex);
                     return 1;
                 }
-
-                // Create a schedule, add jobs to it and run it
-                ISchedule schedule = script.CreateNewSchedule();
-                foreach (IScheduleItem item in submission.ProcessJobs(jobs.ToArray()))
-                {
-                    item.Device = device;
-                    schedule.AddScheduleItem(item);
-                }
                 schedule.AddSubmission(submission);
                 schedule.SetResourcePool(newPool);
                 script.RunSchedule(schedule);
 
                 // Wait for jobs to complete
-                Console.WriteLine("Waiting for all jobs to complete (timeout={0}s)", timeout);
-                DateTime endTime = DateTime.Now.AddSeconds(timeout);
-                int numCompleted, numFailed;
-                do
+                Console.WriteLine("Waiting for all jobs to complete (timeout={0})", timeout);
+                endTime = DateTime.Now.AddSeconds(timeout);
+                int numCompleted = 0, numFailed = 0;
+                while (numCompleted < submission.GetResults().Length && DateTime.Now < endTime)
                 {
+                    // Sleep for 30 seconds
                     System.Threading.Thread.Sleep(30000);
-                    // Report results in a Python readable format and count completed and failed schedule jobs
-                    numCompleted = numFailed = 0;
+                    // Count completed submission jobs
+                    numCompleted = 0;
+                    foreach (IResult r in submission.GetResults())
+                        if (r.ResultStatus != "InProgress")
+                            numCompleted++;
+                    // Report results in a Python readable format and count failed schedule jobs
+                    // (submission jobs are a subset of schedule jobs)
                     Console.WriteLine();
                     Console.WriteLine("---- [");
+                    numFailed = 0;
                     foreach (IResult r in schedule.GetResults())
                     {
-                        if (r.ResultStatus != "InProgress") numCompleted++;
-                        if (r.ResultStatus == "Investigate") numFailed++;
                         Console.WriteLine("  {");
                         Console.WriteLine("    'id': {0}, 'job': r'''{1}''',", r.Job.Id, r.Job.Name);
                         Console.WriteLine("    'logs': r'''{0}''',", r.LogLocation);
@@ -337,10 +243,10 @@ namespace automate0
                         Console.WriteLine("    'pass': {0}, 'fail': {1}, 'notrun': {2}, 'notapplicable': {3}",
                             r.Pass, r.Fail, r.NotRun, r.NotApplicable);
                         Console.WriteLine("  },");
+                        numFailed += r.Fail;
                     }
                     Console.WriteLine("] ----");
-                } while (numCompleted < schedule.GetResults().Length && DateTime.Now < endTime);
-
+                }
                 Console.WriteLine();
 
                 // Cancel incomplete jobs
@@ -348,16 +254,26 @@ namespace automate0
                     if (r.ResultStatus == "InProgress")
                         r.Cancel();
 
-                // Reset the machines
-                foreach (string machineName in machines)
-                    ResetMachine(rootPool, machineName, false);
+                // Set the machine's status to Unsafe and then Reset
+                try
+                {
+                    machine = rootPool.GetResourceByName(clientName);
+                    machine.ChangeResourceStatus("Unsafe");
+                    System.Threading.Thread.Sleep(5000);
+                    machine.ChangeResourceStatus("Reset");
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine("Warning: " + e.Message);
+                }
 
                 // Report failures
-                if (numCompleted < schedule.GetResults().Length)
+                if (numCompleted < submission.GetResults().Length)
                     Console.WriteLine("Some jobs did not complete on time.");
                 if (numFailed > 0)
                     Console.WriteLine("Some jobs failed.");
-                if (numFailed > 0 || numCompleted < schedule.GetResults().Length)
+
+                if (numFailed > 0 || numCompleted < submission.GetResults().Length)
                     return 1;
 
                 Console.WriteLine("All jobs completed.");