Merge "acloud: auto unlock screen after invoke the vnc client"
diff --git a/internal/lib/android_compute_client.py b/internal/lib/android_compute_client.py
index b787576..b32c1ab 100755
--- a/internal/lib/android_compute_client.py
+++ b/internal/lib/android_compute_client.py
@@ -260,7 +260,6 @@
image_project=None,
gpu=None,
extra_disk_name=None,
- labels=None,
avd_spec=None,
extra_scopes=None,
tags=None):
@@ -283,7 +282,6 @@
None no gpus will be attached. For more details see:
https://cloud.google.com/compute/docs/gpus/add-gpus
extra_disk_name: String,the name of the extra disk to attach.
- labels: Dict, will be added to the instance's labels.
avd_spec: AVDSpec object that tells us what we're going to create.
extra_scopes: List, extra scopes (strings) to be passed to the
instance.
@@ -305,14 +303,10 @@
avd_spec.hw_property[constants.HW_Y_RES],
avd_spec.hw_property[constants.HW_ALIAS_DPI]))
- # Add labels for giving the instances ability to be filter for
- # acloud list/delete cmds.
- labels = {constants.LABEL_CREATE_BY: getpass.getuser()}
-
super(AndroidComputeClient, self).CreateInstance(
instance, image_name, self._machine_type, metadata, self._network,
self._zone, disk_args, image_project, gpu, extra_disk_name,
- labels=labels, extra_scopes=extra_scopes, tags=tags)
+ extra_scopes=extra_scopes, tags=tags)
def CheckBootFailure(self, serial_out, instance):
"""Determine if serial output has indicated any boot failure.
diff --git a/internal/lib/android_compute_client_test.py b/internal/lib/android_compute_client_test.py
index 34f4346..0c30e8b 100644
--- a/internal/lib/android_compute_client_test.py
+++ b/internal/lib/android_compute_client_test.py
@@ -15,7 +15,6 @@
# limitations under the License.
"""Tests for android_compute_client."""
import unittest
-import getpass
import mock
from acloud import errors
@@ -123,7 +122,6 @@
"fake_arg": "fake_value"
}]
- labels = {'created_by': getpass.getuser()}
fake_avd_spec = mock.MagicMock()
fake_avd_spec.avd_type = "gce"
fake_avd_spec.hw_property = {
@@ -139,7 +137,7 @@
instance_name, self.IMAGE, self.MACHINE_TYPE,
expected_metadata, self.NETWORK, self.ZONE,
expected_disk_args, image_project, gpu, extra_disk_name,
- labels=labels, extra_scopes=self.EXTRA_SCOPES, tags=None)
+ extra_scopes=self.EXTRA_SCOPES, tags=None)
# pylint: disable=invalid-name
def testCheckMachineSizeMeetsRequirement(self):