commit afbc658d0faf6ea2d9ed4a0a7b93b2bf6d24efc0
author Sam Chiu <samchiu@google.com> Tue Sep 04 20:47:13 2018 +0800
committer Sam Chiu <samchiu@google.com> Tue Oct 09 18:36:16 2018 +0800
tree f5138862a3698b53f91ec3eb663a3e9802baeae8
parent cd004bc52ae31f846ee84739e480b526b7fd6358

Create local instance with local image

- Prepare the launch_cvd cmd and check the required enviornment.
- Create local instance via launch_cvd cmd and wait for boot up.
- Launch vnc client after AVD boot up.

Bug: 111162251
Test: m acloud && atest acloud_test &&
acloud create --local_instance --local_image -vv
Change-Id: I73461b023c444c1ebb29818eef4475bbf86a4200

setup/host_setup_runner.py

diff --git a/setup/host_setup_runner.py b/setup/host_setup_runner.py
index 7869cae..d5eaeb1 100644
--- a/setup/host_setup_runner.py
+++ b/setup/host_setup_runner.py
@@ -39,7 +39,6 @@
 _AVD_REQUIRED_PKGS = ["cuttlefish-common", "ssvnc"]
 # dict of supported system and their distributions.
 _SUPPORTED_SYSTEMS_AND_DISTS = {"Linux": ["Ubuntu", "Debian"]}
-_LIST_OF_GROUPS = ["kvm", "libvirt", "cvdnetwork"]
 _LIST_OF_MODULES = ["kvm_intel", "kvm"]
 
 
@@ -121,11 +120,11 @@
         if not _IsSupportedPlatform():
             return False
 
-        return not (self._CheckUserInGroups(_LIST_OF_GROUPS)
+        return not (self.CheckUserInGroups(constants.LIST_CF_USER_GROUPS)
                     and self._CheckLoadedModules(_LIST_OF_MODULES))
 
     @staticmethod
-    def _CheckUserInGroups(group_name_list):
+    def CheckUserInGroups(group_name_list):
         """Check if the current user is in the group.
 
         Args:
@@ -170,7 +169,7 @@
             "sudo rmmod kvm",
             "sudo modprobe kvm",
             "sudo modprobe kvm_intel"]
-        for group in _LIST_OF_GROUPS:
+        for group in constants.LIST_CF_USER_GROUPS:
             setup_cmds.append("sudo usermod -aG %s % s" % (group, username))
 
         print("Below commands will be run:")

setup/host_setup_runner_test.py

diff --git a/setup/host_setup_runner_test.py b/setup/host_setup_runner_test.py
index fcb843a..4ec8290 100644
--- a/setup/host_setup_runner_test.py
+++ b/setup/host_setup_runner_test.py
@@ -43,7 +43,7 @@
 
     def testShouldRunFalse(self):
         """Test ShouldRun returns False."""
-        self.Patch(CuttlefishHostSetup, "_CheckUserInGroups", return_value=True)
+        self.Patch(CuttlefishHostSetup, "CheckUserInGroups", return_value=True)
         self.Patch(CuttlefishHostSetup, "_CheckLoadedModules", return_value=True)
         self.assertFalse(self.CuttlefishHostSetup.ShouldRun())
 
@@ -51,19 +51,19 @@
         """Test ShouldRun returns True."""
         # 1. Checking groups fails.
         self.Patch(
-            CuttlefishHostSetup, "_CheckUserInGroups", return_value=False)
+            CuttlefishHostSetup, "CheckUserInGroups", return_value=False)
         self.Patch(CuttlefishHostSetup, "_CheckLoadedModules", return_value=True)
         self.assertTrue(self.CuttlefishHostSetup.ShouldRun())
 
         # 2. Checking modules fails.
-        self.Patch(CuttlefishHostSetup, "_CheckUserInGroups", return_value=True)
+        self.Patch(CuttlefishHostSetup, "CheckUserInGroups", return_value=True)
         self.Patch(
             CuttlefishHostSetup, "_CheckLoadedModules", return_value=False)
         self.assertTrue(self.CuttlefishHostSetup.ShouldRun())
 
     # pylint: disable=protected-access
     def testCheckUserInGroups(self):
-        """Test _CheckUserInGroups."""
+        """Test CheckUserInGroups."""
         self.Patch(os, "getgroups", return_value=[1, 2, 3])
         gr1 = mock.MagicMock()
         gr1.gr_name = "fake_gr_1"
@@ -75,13 +75,13 @@
 
         # User in all required groups should return true.
         self.assertTrue(
-            self.CuttlefishHostSetup._CheckUserInGroups(
+            self.CuttlefishHostSetup.CheckUserInGroups(
                 ["fake_gr_1", "fake_gr_2"]))
 
         # User not in all required groups should return False.
         self.Patch(grp, "getgrgid", side_effect=[gr1, gr2, gr3])
         self.assertFalse(
-            self.CuttlefishHostSetup._CheckUserInGroups(
+            self.CuttlefishHostSetup.CheckUserInGroups(
                 ["fake_gr_1", "fake_gr_4"]))
 
     def testCheckLoadedModules(self):