[autotest] Move host_objects logic together

BUG=None
TEST=None

Change-Id: I73e6d8775c2885b2757681bfc53c125df2358006
Reviewed-on: https://chromium-review.googlesource.com/430208
Commit-Ready: Allen Li <ayatane@chromium.org>
Tested-by: Allen Li <ayatane@chromium.org>
Reviewed-by: Allen Li <ayatane@chromium.org>
diff --git a/frontend/afe/rpc_utils.py b/frontend/afe/rpc_utils.py
index 897d8fe..0822a84 100644
--- a/frontend/afe/rpc_utils.py
+++ b/frontend/afe/rpc_utils.py
@@ -937,6 +937,9 @@
     # convert hostnames & meta hosts to host/label objects
     host_objects = models.Host.smart_get_bulk(hosts)
     _validate_host_job_sharding(host_objects)
+    for host in one_time_hosts:
+        this_host = models.Host.create_one_time_host(host)
+        host_objects.append(this_host)
 
     metahost_objects = []
     meta_host_labels_by_name = {label.name: label for label in label_objects}
@@ -975,10 +978,6 @@
     else:
         atomic_group = None
 
-    for host in one_time_hosts:
-        this_host = models.Host.create_one_time_host(host)
-        host_objects.append(this_host)
-
     options = dict(name=name,
                    priority=priority,
                    control_file=control_file,