commit 31fc5330cf507be52faf6c2f72b1c0b0d9c51cf5
author cylan <cylan@google.com> Mon Sep 17 22:12:08 2018 +0800
committer cylan <cylan@google.com> Wed Oct 10 02:16:45 2018 +0800
tree 22fc8a184681f68f3175cc6e946816f0fd57c354
parent 7ffb7ceb2f25367591f2efbf387aa090819d0899

acloud: Create instance and upload local image

- Using host image to create the instance.
- upload the cvd-host-package.tar.gz and local image to instance.
- lanuch the CVD in the instance.

Bug: 112878792
Test: make dist that generate the local image
acloud create --local_image
acloud create --local_image /tmp/image_dir that for specified path
atest acloud_test

Change-Id: Ifbd80fb10b05fd45b1477d68e2472ba0f5357c93

public/actions/common_operations.py

diff --git a/public/actions/common_operations.py b/public/actions/common_operations.py
index 09f6495..e3a4035 100644
--- a/public/actions/common_operations.py
+++ b/public/actions/common_operations.py
@@ -22,7 +22,6 @@
 
 from __future__ import print_function
 import logging
-import time
 
 from acloud.public import avd
 from acloud.public import errors
@@ -100,6 +99,7 @@
             self.devices.append(
                 avd.AndroidVirtualDevice(ip=ip, instance_name=instance))
 
+    @utils.TimeExecute(function_description="Waiting for AVD(s) to boot up")
     def WaitForBoot(self):
         """Waits for all devices to boot up.
 
@@ -149,32 +149,14 @@
     """
     reporter = report.Report(command=command)
     try:
-        gce_start_time = time.time()
-        utils.PrintColorString("Creating GCE instance%s..." %
-                               ("s" if num > 1 else ""), end="")
         CreateSshKeyPairIfNecessary(cfg)
         device_pool = DevicePool(device_factory)
-        try:
-            device_pool.CreateDevices(num)
-        except:
-            utils.PrintColorString("Fail (%ds)" % (time.time() - gce_start_time),
-                                   utils.TextColors.FAIL)
-            raise
-        utils.PrintColorString("OK (%ds)" % (time.time() - gce_start_time),
-                               utils.TextColors.OKGREEN)
-
-        utils.PrintColorString("Starting up AVD%s..." %
-                               ("s" if num > 1 else ""), end="")
-        start_boot_time = time.time()
+        device_pool.CreateDevices(num)
         failures = device_pool.WaitForBoot()
         if failures:
             reporter.SetStatus(report.Status.BOOT_FAIL)
-            utils.PrintColorString("Fail (%ds)" % (time.time() - start_boot_time),
-                                   utils.TextColors.FAIL)
         else:
             reporter.SetStatus(report.Status.SUCCESS)
-            utils.PrintColorString("OK (%ds)" % (time.time() - start_boot_time),
-                                   utils.TextColors.OKGREEN)
         # Write result to report.
         for device in device_pool.devices:
             device_dict = {