Enhance acloud list/delete/reconnect function cross with all zones.
Bug: 139409482
Bug: 140699221
Test: acloud-dev list
acloud-dev delete
acloud-dev reconnect
Change-Id: I569fe55706c025a350cce744d17342daf91e729b
diff --git a/public/device_driver_test.py b/public/device_driver_test.py
index 237d3ea..560c26b 100644
--- a/public/device_driver_test.py
+++ b/public/device_driver_test.py
@@ -162,10 +162,12 @@
def testDeleteAndroidVirtualDevices(self):
"""Test DeleteAndroidVirtualDevices."""
+ cfg = _CreateCfg()
instance_names = ["fake-instance-1", "fake-instance-2"]
+ self.compute_client.GetZonesByInstances.return_value = (
+ {cfg.zone: instance_names})
self.compute_client.DeleteInstances.return_value = (instance_names, [],
[])
- cfg = _CreateCfg()
report = device_driver.DeleteAndroidVirtualDevices(cfg, instance_names)
self.compute_client.DeleteInstances.assert_called_once_with(
instance_names, cfg.zone)
@@ -267,8 +269,7 @@
}
self.assertEqual(report.data, expected_report_data)
- self.compute_client.ListInstances.assert_called_once_with(
- zone=cfg.zone)
+ self.compute_client.ListInstances.assert_called_once_with()
self.compute_client.DeleteInstances.assert_called_once_with(
instances=["fake_instance_1"], zone=cfg.zone)