commit 480e1216c31eef46fa808dbc65150ceac8578f42
author Kevin Cheng <kevcheng@google.com> Wed Oct 24 00:23:30 2018 -0700
committer Kevin Cheng <kevcheng@google.com> Wed Oct 24 00:23:30 2018 -0700
tree 01e7775e726cc932a68b0bca13f526e62f0d4d7e
parent 1f582bc08c9238110a7d03215a015b6380e5f837

Fix up broken unittests from aosp/793931

Bug: 113535553
Test: atest acloud_test
Change-Id: I73029a1d3887e0d387a289eecdf27409d49b3e17

internal/lib/gcompute_client_test.py

diff --git a/internal/lib/gcompute_client_test.py b/internal/lib/gcompute_client_test.py
index dc9a44f..b84cdbd 100644
--- a/internal/lib/gcompute_client_test.py
+++ b/internal/lib/gcompute_client_test.py
@@ -51,6 +51,7 @@
     ACCELERATOR_URL = "http://speedy-gpu"
     NETWORK = "fake-network"
     NETWORK_URL = "http://fake-network-url"
+    SUBNETWORK_URL = "http://fake-subnetwork-url"
     ZONE = "fake-zone"
     REGION = "fake-region"
     OPERATION_NAME = "fake-op"
@@ -499,13 +500,16 @@
 
     @mock.patch.object(gcompute_client.ComputeClient, "GetImage")
     @mock.patch.object(gcompute_client.ComputeClient, "GetNetworkUrl")
+    @mock.patch.object(gcompute_client.ComputeClient, "GetSubnetworkUrl")
     @mock.patch.object(gcompute_client.ComputeClient, "GetMachineType")
     @mock.patch.object(gcompute_client.ComputeClient, "WaitOnOperation")
     def testCreateInstance(self, mock_wait, mock_get_mach_type,
-                           mock_get_network_url, mock_get_image):
+                           mock_get_subnetwork_url, mock_get_network_url,
+                           mock_get_image):
         """Test CreateInstance."""
         mock_get_mach_type.return_value = {"selfLink": self.MACHINE_TYPE_URL}
         mock_get_network_url.return_value = self.NETWORK_URL
+        mock_get_subnetwork_url.return_value = self.SUBNETWORK_URL
         mock_get_image.return_value = {"selfLink": self.IMAGE_URL}
         resource_mock = mock.MagicMock()
         self.compute_client._service.instances = mock.MagicMock(
@@ -525,6 +529,7 @@
             "networkInterfaces": [
                 {
                     "network": self.NETWORK_URL,
+                    "subnetwork": self.SUBNETWORK_URL,
                     "accessConfigs": [
                         {"name": "External NAT",
                          "type": "ONE_TO_ONE_NAT"}
@@ -561,14 +566,16 @@
     @mock.patch.object(gcompute_client.ComputeClient, "GetAcceleratorUrl")
     @mock.patch.object(gcompute_client.ComputeClient, "GetImage")
     @mock.patch.object(gcompute_client.ComputeClient, "GetNetworkUrl")
+    @mock.patch.object(gcompute_client.ComputeClient, "GetSubnetworkUrl")
     @mock.patch.object(gcompute_client.ComputeClient, "GetMachineType")
     @mock.patch.object(gcompute_client.ComputeClient, "WaitOnOperation")
     def testCreateInstanceWithGpu(self, mock_wait, mock_get_mach,
-                                  mock_get_network, mock_get_image,
-                                  mock_get_accel):
+                                  mock_get_subnetwork, mock_get_network,
+                                  mock_get_image, mock_get_accel):
         """Test CreateInstance with a GPU parameter not set to None."""
         mock_get_mach.return_value = {"selfLink": self.MACHINE_TYPE_URL}
         mock_get_network.return_value = self.NETWORK_URL
+        mock_get_subnetwork.return_value = self.SUBNETWORK_URL
         mock_get_accel.return_value = self.ACCELERATOR_URL
         mock_get_image.return_value = {"selfLink": self.IMAGE_URL}
 
@@ -583,8 +590,8 @@
             "name":
                 self.INSTANCE,
             "networkInterfaces": [{
-                "network":
-                    self.NETWORK_URL,
+                "network": self.NETWORK_URL,
+                "subnetwork": self.SUBNETWORK_URL,
                 "accessConfigs": [{
                     "name": "External NAT",
                     "type": "ONE_TO_ONE_NAT"