http://git-wip-us.apache.org/repos/asf/jclouds/blob/c83a08a8/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetInstanceApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetInstanceApiLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetInstanceApiLiveTest.java index 9780d45..f6f0bef 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetInstanceApiLiveTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetInstanceApiLiveTest.java @@ -69,11 +69,12 @@ public class TargetInstanceApiLiveTest extends BaseGoogleComputeEngineApiLiveTes INSTANCE_NAME, // name getDefaultMachineTypeUrl(), // machineType getNetworkUrl(INSTANCE_NETWORK_NAME), // network + null, // subnetwork imageUri); // need to insert the network first - assertOperationDoneSuccessfully(api.networks().createInIPv4Range - (INSTANCE_NETWORK_NAME, IPV4_RANGE)); + assertOperationDoneSuccessfully(api.networks().createLegacy(INSTANCE_NETWORK_NAME, IPV4_RANGE)); + assertOperationDoneSuccessfully(api.instancesInZone(DEFAULT_ZONE_NAME).create(newInstance)); instance = api.instancesInZone(DEFAULT_ZONE_NAME).get(INSTANCE_NAME); assertNotNull(instance);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/c83a08a8/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java index dab8cda..ea742a9 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java @@ -26,13 +26,13 @@ import java.util.ArrayList; import java.util.List; import org.jclouds.googlecloud.domain.ListPage; +import org.jclouds.googlecomputeengine.domain.ForwardingRule.IPProtocol; import org.jclouds.googlecomputeengine.domain.HealthStatus; import org.jclouds.googlecomputeengine.domain.HttpHealthCheck; import org.jclouds.googlecomputeengine.domain.Image; import org.jclouds.googlecomputeengine.domain.Instance; import org.jclouds.googlecomputeengine.domain.NewInstance; import org.jclouds.googlecomputeengine.domain.TargetPool; -import org.jclouds.googlecomputeengine.domain.ForwardingRule.IPProtocol; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiLiveTest; import org.jclouds.googlecomputeengine.options.ForwardingRuleCreationOptions; import org.jclouds.googlecomputeengine.options.HttpHealthCheckCreationOptions; @@ -84,9 +84,8 @@ public class TargetPoolApiLiveTest extends BaseGoogleComputeEngineApiLiveTest { }) .first().get().selfLink(); - // Insert a network. - assertOperationDoneSuccessfully(api.networks().createInIPv4Range(INSTANCE_NETWORK_NAME, - IPV4_RANGE)); + // need to insert the network first + assertOperationDoneSuccessfully(api.networks().createLegacy(INSTANCE_NETWORK_NAME, IPV4_RANGE)); // Create an instance. assertOperationDoneSuccessfully( @@ -94,6 +93,7 @@ public class TargetPoolApiLiveTest extends BaseGoogleComputeEngineApiLiveTest { INSTANCE_NAME, // name getDefaultMachineTypeUrl(), // machineType getNetworkUrl(INSTANCE_NETWORK_NAME), // network + null, // subnetwork imageUri // disks ))); http://git-wip-us.apache.org/repos/asf/jclouds/blob/c83a08a8/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiLiveTest.java index 72673ff..bd374fa 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiLiveTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiLiveTest.java @@ -48,6 +48,7 @@ public class BaseGoogleComputeEngineApiLiveTest extends BaseApiLiveTest<GoogleCo protected static final String ZONE_API_URL_SUFFIX = "/zones/"; protected static final String DEFAULT_ZONE_NAME = "us-central1-f"; + protected static final String REGION_API_URL_SUFFIX = "/regions/"; protected static final String DEFAULT_REGION_NAME = "us-central1"; protected static final String NETWORK_API_URL_SUFFIX = "/global/networks/"; protected static final String MACHINE_TYPE_API_URL_SUFFIX = "/machineTypes/"; @@ -116,6 +117,14 @@ public class BaseGoogleComputeEngineApiLiveTest extends BaseApiLiveTest<GoogleCo protected URI getZoneUrl(String zone) { return URI.create(projectUrl + ZONE_API_URL_SUFFIX + zone); } + + protected URI getDefaultRegionUrl() { + return getRegionUrl(DEFAULT_REGION_NAME); + } + + protected URI getRegionUrl(String region) { + return URI.create(projectUrl + REGION_API_URL_SUFFIX + region); + } protected URI getNetworkUrl(String network) { return URI.create(projectUrl + NETWORK_API_URL_SUFFIX + network); @@ -162,5 +171,9 @@ public class BaseGoogleComputeEngineApiLiveTest extends BaseApiLiveTest<GoogleCo protected URI getUrlMapUrl(String urlMap) { return URI.create(projectUrl + URL_MAP_API_URL_SUFFIX + urlMap); } + + protected URI getSubnetworkUrl(String region, String subnetName) { + return URI.create(projectUrl + REGION_API_URL_SUFFIX + region + "/subnetworks/" + subnetName); + } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/c83a08a8/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkTest.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkTest.java index 98ad345..7592c82 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseNetworkTest.java @@ -19,6 +19,7 @@ package org.jclouds.googlecomputeengine.parse; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; import java.net.URI; +import java.util.Collections; import javax.ws.rs.Consumes; @@ -48,7 +49,9 @@ public class ParseNetworkTest extends BaseGoogleComputeEngineParseTest<Network> "jclouds-test", // name "A custom network for the project", // description "10.0.0.0/8", // rangeIPv4 - "10.0.0.1" // gatewayIPv4 + "10.0.0.1", // gatewayIPv4 + false, + Collections.<URI> emptyList() // subnetworks ); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/c83a08a8/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkListTest.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkListTest.java index 61fb646..a978ade 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkListTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkListTest.java @@ -33,7 +33,7 @@ public class ParseSubnetworkListTest extends BaseGoogleComputeEngineParseTest<Li @Override public String resource() { - return "/network_list.json"; + return "/subnetwork_list.json"; } @Override @Consumes(APPLICATION_JSON) http://git-wip-us.apache.org/repos/asf/jclouds/blob/c83a08a8/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkTest.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkTest.java index 08d1734..cac3bad 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseSubnetworkTest.java @@ -31,7 +31,7 @@ public class ParseSubnetworkTest extends BaseGoogleComputeEngineParseTest<Subnet @Override public String resource() { - return "/network_get.json"; + return "/subnetwork_get.json"; } @Override @Consumes(APPLICATION_JSON) @@ -45,7 +45,7 @@ public class ParseSubnetworkTest extends BaseGoogleComputeEngineParseTest<Subnet "5850679262666457680", // id parse("2016-06-07T14:29:35.476-07:00"), // creationTimestamp URI.create(baseUrl + "/party/regions/someregion/subnetworks/jclouds-test"), // selfLink - "jclouds-subnetwork-test", // name + "jclouds-test", // name "A custom subnetwork for the project", // description "10.128.0.1", URI.create(baseUrl + "/party/global/networks/mynetwork"), // network http://git-wip-us.apache.org/repos/asf/jclouds/blob/c83a08a8/providers/google-compute-engine/src/test/resources/firewall_insert_3.json ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/resources/firewall_insert_3.json b/providers/google-compute-engine/src/test/resources/firewall_insert_3.json new file mode 100644 index 0000000..f34ca15 --- /dev/null +++ b/providers/google-compute-engine/src/test/resources/firewall_insert_3.json @@ -0,0 +1,28 @@ +{ + "name": "jclouds-test-65f", + "network": "https://www.googleapis.com/compute/v1/projects/party/networks/jclouds-test";, + "sourceRanges": [ + "10.128.0.0/20", + "0.0.0.0/0" + ], + "sourceTags": [ + "aTag" + ], + "targetTags": [ + "jclouds-test-65f" + ], + "allowed": [ + { + "IPProtocol": "tcp", + "ports": [ + "22" + ] + }, + { + "IPProtocol": "udp", + "ports": [ + "22" + ] + } + ] +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/c83a08a8/providers/google-compute-engine/src/test/resources/instance_insert_subnet.json ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/resources/instance_insert_subnet.json b/providers/google-compute-engine/src/test/resources/instance_insert_subnet.json new file mode 100644 index 0000000..1cc3d08 --- /dev/null +++ b/providers/google-compute-engine/src/test/resources/instance_insert_subnet.json @@ -0,0 +1,46 @@ +{ + "machineType": "%s", + "name": "test-1", + "networkInterfaces": [ + { + "network": "https://www.googleapis.com/compute/v1/projects/party/global/networks/mynetwork";, + "subnetwork": "https://www.googleapis.com/compute/v1/projects/party/regions/someregion/subnetworks/jclouds-test";, + "accessConfigs": [ + { + "type": "ONE_TO_ONE_NAT" + } + ] + } + ], + "disks": [ + { + "type": "PERSISTENT", + "initializeParams": { + "sourceImage": "%s", + "diskType": "https://content.googleapis.com/compute/v1/projects/party/zones/us-central1-a/diskTypes/pd-ssd"; + }, + "boot": true, + "autoDelete": true + } + ], + "description": "test", + "tags": { + "items": [ + "aTag", + "jclouds-test-65f" + ] + }, + "metadata": { + "items": [ + { + "key": "jclouds-group", + "value": "test" + } + ] + }, + "scheduling": { + "onHostMaintenance": "MIGRATE", + "automaticRestart": true, + "preemptible": false + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/c83a08a8/providers/google-compute-engine/src/test/resources/network_get.json ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/resources/network_get.json b/providers/google-compute-engine/src/test/resources/network_get.json index ca82f69..fc407df 100644 --- a/providers/google-compute-engine/src/test/resources/network_get.json +++ b/providers/google-compute-engine/src/test/resources/network_get.json @@ -6,5 +6,6 @@ "name": "jclouds-test", "description": "A custom network for the project", "IPv4Range": "10.0.0.0/8", - "gatewayIPv4": "10.0.0.1" + "gatewayIPv4": "10.0.0.1", + "subnetworks": [] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/c83a08a8/providers/google-compute-engine/src/test/resources/network_insert_custom.json ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/resources/network_insert_custom.json b/providers/google-compute-engine/src/test/resources/network_insert_custom.json new file mode 100644 index 0000000..b8b1f2e --- /dev/null +++ b/providers/google-compute-engine/src/test/resources/network_insert_custom.json @@ -0,0 +1 @@ +{"autoCreateSubnetworks":false,"name":"test-network"} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/c83a08a8/providers/google-compute-engine/src/test/resources/subnetwork_get.json ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/resources/subnetwork_get.json b/providers/google-compute-engine/src/test/resources/subnetwork_get.json index 0b44694..4551544 100644 --- a/providers/google-compute-engine/src/test/resources/subnetwork_get.json +++ b/providers/google-compute-engine/src/test/resources/subnetwork_get.json @@ -3,7 +3,7 @@ "id": "5850679262666457680", "creationTimestamp": "2016-06-07T14:29:35.476-07:00", "gatewayAddress": "10.128.0.1", - "name": "jclouds-subnetwork-test", + "name": "jclouds-test", "network": "https://www.googleapis.com/compute/v1/projects/party/global/networks/mynetwork";, "ipCidrRange": "10.128.0.0/20", "region": "https://www.googleapis.com/compute/v1/projects/party/regions/someregion";, http://git-wip-us.apache.org/repos/asf/jclouds/blob/c83a08a8/providers/google-compute-engine/src/test/resources/subnetwork_insert.json ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/resources/subnetwork_insert.json b/providers/google-compute-engine/src/test/resources/subnetwork_insert.json index 927a125..eda40a8 100644 --- a/providers/google-compute-engine/src/test/resources/subnetwork_insert.json +++ b/providers/google-compute-engine/src/test/resources/subnetwork_insert.json @@ -3,5 +3,6 @@ "description": "my subnetwork", "network": "https://www.googleapis.com/compute/v1/projects/party/global/networks/mynetwork";, "ipCidrRange": "10.0.0.0/24", - "region": "https://www.googleapis.com/compute/v1/projects/party/regions/someregion"; + "region": "https://www.googleapis.com/compute/v1/projects/party/regions/someregion";, + "privateIpGoogleAccess": false } http://git-wip-us.apache.org/repos/asf/jclouds/blob/c83a08a8/providers/google-compute-engine/src/test/resources/subnetwork_list.json ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/resources/subnetwork_list.json b/providers/google-compute-engine/src/test/resources/subnetwork_list.json index 74353cd..6d6ee77 100644 --- a/providers/google-compute-engine/src/test/resources/subnetwork_list.json +++ b/providers/google-compute-engine/src/test/resources/subnetwork_list.json @@ -8,7 +8,7 @@ "id": "5850679262666457680", "creationTimestamp": "2016-06-07T14:29:35.476-07:00", "gatewayAddress": "10.128.0.1", - "name": "jclouds-subnetwork-test", + "name": "jclouds-test", "network": "https://www.googleapis.com/compute/v1/projects/party/global/networks/mynetwork";, "ipCidrRange": "10.128.0.0/20", "region": "https://www.googleapis.com/compute/v1/projects/party/regions/someregion";,
