Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add GoogleComputeEngineProviderMetadata and implement dynamic Location suppliers.

This commit is contained in:
Adrian Cole 2014-11-05 23:02:53 -08:00
parent c7bb9f8b17
commit 8e8f9662e1
29 changed files with 654 additions and 665 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApiMetadata.java
View File

@ -19,7 +19,6 @@ package org.jclouds.googlecomputeengine;
import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
import static org.jclouds.compute.config.ComputeServiceProperties.TEMPLATE; import static org.jclouds.compute.config.ComputeServiceProperties.TEMPLATE;
import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.GCE_IMAGE_PROJECTS; import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.GCE_IMAGE_PROJECTS;
import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.GCE_PROVIDER_NAME;
import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.OPERATION_COMPLETE_INTERVAL; import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.OPERATION_COMPLETE_INTERVAL;
import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.OPERATION_COMPLETE_TIMEOUT; import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.OPERATION_COMPLETE_TIMEOUT;
import static org.jclouds.oauth.v2.config.OAuthProperties.AUDIENCE; import static org.jclouds.oauth.v2.config.OAuthProperties.AUDIENCE;
@ -29,7 +28,6 @@ import static org.jclouds.reflect.Reflection2.typeToken;
import java.net.URI; import java.net.URI;
import java.util.Properties; import java.util.Properties;
import org.jclouds.apis.ApiMetadata;
import org.jclouds.compute.ComputeServiceContext; import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.googlecomputeengine.compute.config.GoogleComputeEngineServiceContextModule; import org.jclouds.googlecomputeengine.compute.config.GoogleComputeEngineServiceContextModule;
import org.jclouds.googlecomputeengine.config.GoogleComputeEngineHttpApiModule; import org.jclouds.googlecomputeengine.config.GoogleComputeEngineHttpApiModule;
@ -38,11 +36,9 @@ import org.jclouds.oauth.v2.config.OAuthAuthenticationModule;
import org.jclouds.oauth.v2.config.OAuthModule; import org.jclouds.oauth.v2.config.OAuthModule;
import org.jclouds.rest.internal.BaseHttpApiMetadata; import org.jclouds.rest.internal.BaseHttpApiMetadata;
import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.inject.Module; import com.google.inject.Module;
@AutoService(ApiMetadata.class)
public class GoogleComputeEngineApiMetadata extends BaseHttpApiMetadata<GoogleComputeEngineApi> { public class GoogleComputeEngineApiMetadata extends BaseHttpApiMetadata<GoogleComputeEngineApi> {
@Override @Override
@ -64,9 +60,9 @@ public class GoogleComputeEngineApiMetadata extends BaseHttpApiMetadata<GoogleCo
properties.put(AUDIENCE, "https://accounts.google.com/o/oauth2/token"); properties.put(AUDIENCE, "https://accounts.google.com/o/oauth2/token");
properties.put(SIGNATURE_OR_MAC_ALGORITHM, "RS256"); properties.put(SIGNATURE_OR_MAC_ALGORITHM, "RS256");
properties.put(PROPERTY_SESSION_INTERVAL, 3600); properties.put(PROPERTY_SESSION_INTERVAL, 3600);
properties.setProperty(TEMPLATE, "osFamily=DEBIAN,osVersionMatches=7\\..*,locationId=us-central1-a,loginUser=jclouds");
properties.put(OPERATION_COMPLETE_INTERVAL, 500); properties.put(OPERATION_COMPLETE_INTERVAL, 500);
properties.put(OPERATION_COMPLETE_TIMEOUT, 600000); properties.put(OPERATION_COMPLETE_TIMEOUT, 600000);
properties.put(TEMPLATE, "osFamily=DEBIAN,osVersionMatches=7\\..*,locationId=us-central1-a,loginUser=jclouds");
properties.put(GCE_IMAGE_PROJECTS, "centos-cloud,debian-cloud,rhel-cloud,suse-cloud,opensuse-cloud,gce-nvme,coreos-cloud"); properties.put(GCE_IMAGE_PROJECTS, "centos-cloud,debian-cloud,rhel-cloud,suse-cloud,opensuse-cloud,gce-nvme,coreos-cloud");
return properties; return properties;
} }
@ -74,7 +70,7 @@ public class GoogleComputeEngineApiMetadata extends BaseHttpApiMetadata<GoogleCo
public static class Builder extends BaseHttpApiMetadata.Builder<GoogleComputeEngineApi, Builder> { public static class Builder extends BaseHttpApiMetadata.Builder<GoogleComputeEngineApi, Builder> {
protected Builder() { protected Builder() {
id(GCE_PROVIDER_NAME) id("google-compute-engine")
.name("Google Compute Engine Api") .name("Google Compute Engine Api")
.identityName("Email associated with the Google API client_id") .identityName("Email associated with the Google API client_id")
.credentialName("Private key literal associated with the Google API client_id") .credentialName("Private key literal associated with the Google API client_id")

20
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineConstants.java
View File

@ -16,30 +16,14 @@
*/ */
package org.jclouds.googlecomputeengine; package org.jclouds.googlecomputeengine;
import org.jclouds.domain.Location;
import org.jclouds.domain.LocationBuilder;
import org.jclouds.domain.LocationScope;
import com.google.common.annotations.Beta; import com.google.common.annotations.Beta;
public final class GoogleComputeEngineConstants { public final class GoogleComputeEngineConstants {
public static final String GCE_PROVIDER_NAME = "google-compute-engine";
/**
* The name of the project that keeps public resources.
*/
public static final String GOOGLE_PROJECT = "google";
public static final String COMPUTE_SCOPE = "https://www.googleapis.com/auth/compute"; public static final String COMPUTE_SCOPE = "https://www.googleapis.com/auth/compute";
public static final String COMPUTE_READONLY_SCOPE = "https://www.googleapis.com/auth/compute.readonly"; public static final String COMPUTE_READONLY_SCOPE = "https://www.googleapis.com/auth/compute.readonly";
public static final String STORAGE_READONLY_SCOPE = "https://www.googleapis.com/auth/devstorage.read_only";
public static final String STORAGE_WRITEONLY_SCOPE = "https://www.googleapis.com/auth/devstorage.write_only";
/** /**
* The total time, in msecs, to wait for an operation to complete. * The total time, in msecs, to wait for an operation to complete.
*/ */
@ -52,16 +36,12 @@ public final class GoogleComputeEngineConstants {
@Beta @Beta
public static final String OPERATION_COMPLETE_INTERVAL = "jclouds.google-compute-engine.operation-complete-interval"; public static final String OPERATION_COMPLETE_INTERVAL = "jclouds.google-compute-engine.operation-complete-interval";
public static final Location GOOGLE_PROVIDER_LOCATION = new LocationBuilder().scope(LocationScope.PROVIDER).id
(GCE_PROVIDER_NAME).description(GCE_PROVIDER_NAME).build();
/** /**
* The list of projects that will be scanned looking for images. * The list of projects that will be scanned looking for images.
*/ */
@Beta @Beta
public static final String GCE_IMAGE_PROJECTS = "jclouds.google-compute-engine.image-projects"; public static final String GCE_IMAGE_PROJECTS = "jclouds.google-compute-engine.image-projects";
/** /**
* The key we look for in instance metadata for the URI for the image the instance was created from. * The key we look for in instance metadata for the URI for the image the instance was created from.
*/ */

72
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineProviderMetadata.java Normal file
View File

@ -0,0 +1,72 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jclouds.googlecomputeengine;
import java.net.URI;
import java.util.Properties;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
import com.google.auto.service.AutoService;
/** Note: This does not set iso3166Codes as Google intentionally does not document them. */
@AutoService(ProviderMetadata.class)
public final class GoogleComputeEngineProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
return new Builder();
}
@Override
public Builder toBuilder() {
return builder().fromProviderMetadata(this);
}
public GoogleComputeEngineProviderMetadata() {
super(builder());
}
public GoogleComputeEngineProviderMetadata(Builder builder) {
super(builder);
}
public static Properties defaultProperties() {
return new Properties(); // currently all are set in the api metadata class.
}
public static final class Builder extends BaseProviderMetadata.Builder {
private Builder() {
id("google-compute-engine") //
.name("Google Compute Engine") //
.apiMetadata(new GoogleComputeEngineApiMetadata()) //
.homepage(URI.create("https://cloud.google.com/compute")) //
.console(URI.create("https://console.developers.google.com/project")) //
.defaultProperties(GoogleComputeEngineProviderMetadata.defaultProperties());
}
@Override public GoogleComputeEngineProviderMetadata build() {
return new GoogleComputeEngineProviderMetadata(this);
}
@Override public Builder fromProviderMetadata(ProviderMetadata in) {
super.fromProviderMetadata(in);
return this;
}
}
}

37
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java
View File

@ -38,7 +38,6 @@ import static org.jclouds.util.Predicates2.retry;
import java.net.URI; import java.net.URI;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -47,7 +46,6 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import org.jclouds.collect.Memoized;
import org.jclouds.compute.ComputeServiceAdapter; import org.jclouds.compute.ComputeServiceAdapter;
import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.Hardware;
import org.jclouds.compute.domain.Template; import org.jclouds.compute.domain.Template;
@ -69,15 +67,16 @@ import org.jclouds.googlecomputeengine.domain.Instance.AttachedDisk.Mode;
import org.jclouds.googlecomputeengine.domain.ListPage; import org.jclouds.googlecomputeengine.domain.ListPage;
import org.jclouds.googlecomputeengine.domain.MachineType; import org.jclouds.googlecomputeengine.domain.MachineType;
import org.jclouds.googlecomputeengine.domain.Operation; import org.jclouds.googlecomputeengine.domain.Operation;
import org.jclouds.googlecomputeengine.domain.Zone;
import org.jclouds.googlecomputeengine.domain.templates.InstanceTemplate; import org.jclouds.googlecomputeengine.domain.templates.InstanceTemplate;
import org.jclouds.googlecomputeengine.domain.templates.InstanceTemplate.PersistentDisk; import org.jclouds.googlecomputeengine.domain.templates.InstanceTemplate.PersistentDisk;
import org.jclouds.googlecomputeengine.features.DiskApi; import org.jclouds.googlecomputeengine.features.DiskApi;
import org.jclouds.googlecomputeengine.features.InstanceApi; import org.jclouds.googlecomputeengine.features.InstanceApi;
import org.jclouds.googlecomputeengine.options.DiskCreationOptions; import org.jclouds.googlecomputeengine.options.DiskCreationOptions;
import org.jclouds.location.Zone;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Splitter;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
@ -88,11 +87,12 @@ import com.google.common.primitives.Ints;
import com.google.common.util.concurrent.Atomics; import com.google.common.util.concurrent.Atomics;
import com.google.common.util.concurrent.UncheckedTimeoutException; import com.google.common.util.concurrent.UncheckedTimeoutException;
public final class GoogleComputeEngineServiceAdapter implements ComputeServiceAdapter<InstanceInZone, MachineTypeInZone, Image, Zone> { public final class GoogleComputeEngineServiceAdapter
implements ComputeServiceAdapter<InstanceInZone, MachineTypeInZone, Image, Location> {
private final GoogleComputeEngineApi api; private final GoogleComputeEngineApi api;
private final Supplier<String> userProject; private final Supplier<String> userProject;
private final Supplier<Map<URI, ? extends Location>> zones; private final Supplier<Set<String>> zoneIds;
private final Function<TemplateOptions, ImmutableMap.Builder<String, String>> metatadaFromTemplateOptions; private final Function<TemplateOptions, ImmutableMap.Builder<String, String>> metatadaFromTemplateOptions;
private final Predicate<AtomicReference<Operation>> retryOperationDonePredicate; private final Predicate<AtomicReference<Operation>> retryOperationDonePredicate;
private final long operationCompleteCheckInterval; private final long operationCompleteCheckInterval;
@ -107,9 +107,9 @@ public final class GoogleComputeEngineServiceAdapter implements ComputeServiceAd
@Named("zone") Predicate<AtomicReference<Operation>> operationDonePredicate, @Named("zone") Predicate<AtomicReference<Operation>> operationDonePredicate,
@Named(OPERATION_COMPLETE_INTERVAL) Long operationCompleteCheckInterval, @Named(OPERATION_COMPLETE_INTERVAL) Long operationCompleteCheckInterval,
@Named(OPERATION_COMPLETE_TIMEOUT) Long operationCompleteCheckTimeout, @Named(OPERATION_COMPLETE_TIMEOUT) Long operationCompleteCheckTimeout,
@Memoized Supplier<Map<URI, ? extends Location>> zones, @Zone Supplier<Set<String>> zoneIds,
FirewallTagNamingConvention.Factory firewallTagNamingConvention, FirewallTagNamingConvention.Factory firewallTagNamingConvention,
@Named(GCE_IMAGE_PROJECTS) List<String> imageProjects) { @Named(GCE_IMAGE_PROJECTS) String imageProjects) {
this.api = api; this.api = api;
this.userProject = userProject; this.userProject = userProject;
this.metatadaFromTemplateOptions = metatadaFromTemplateOptions; this.metatadaFromTemplateOptions = metatadaFromTemplateOptions;
@ -117,9 +117,9 @@ public final class GoogleComputeEngineServiceAdapter implements ComputeServiceAd
this.operationCompleteCheckTimeout = operationCompleteCheckTimeout; this.operationCompleteCheckTimeout = operationCompleteCheckTimeout;
this.retryOperationDonePredicate = retry(operationDonePredicate, operationCompleteCheckTimeout, this.retryOperationDonePredicate = retry(operationDonePredicate, operationCompleteCheckTimeout,
operationCompleteCheckInterval, TimeUnit.MILLISECONDS); operationCompleteCheckInterval, TimeUnit.MILLISECONDS);
this.zones = zones; this.zoneIds = zoneIds;
this.firewallTagNamingConvention = firewallTagNamingConvention; this.firewallTagNamingConvention = firewallTagNamingConvention;
this.imageProjects = imageProjects; this.imageProjects = Splitter.on(',').splitToList(imageProjects);
} }
@Override @Override
@ -241,8 +241,8 @@ public final class GoogleComputeEngineServiceAdapter implements ComputeServiceAd
public Iterable<MachineTypeInZone> listHardwareProfiles() { public Iterable<MachineTypeInZone> listHardwareProfiles() {
ImmutableList.Builder<MachineTypeInZone> builder = ImmutableList.builder(); ImmutableList.Builder<MachineTypeInZone> builder = ImmutableList.builder();
for (final Location zone : zones.get().values()) { for (final String zoneId : zoneIds.get()) {
for (Iterator<ListPage<MachineType>> i = api.getMachineTypeApi(userProject.get(), zone.getId()).list(); for (Iterator<ListPage<MachineType>> i = api.getMachineTypeApi(userProject.get(), zoneId).list();
i.hasNext(); ) { i.hasNext(); ) {
builder.addAll(FluentIterable.from(i.next()).filter(new Predicate<MachineType>() { builder.addAll(FluentIterable.from(i.next()).filter(new Predicate<MachineType>() {
@Override public boolean apply(MachineType input) { @Override public boolean apply(MachineType input) {
@ -254,7 +254,6 @@ public final class GoogleComputeEngineServiceAdapter implements ComputeServiceAd
} }
})); }));
} }
} }
return builder.build(); return builder.build();
@ -288,8 +287,8 @@ public final class GoogleComputeEngineServiceAdapter implements ComputeServiceAd
} }
@Override @Override
public Iterable<Zone> listLocations() { public Iterable<Location> listLocations() {
return concat(api.getZoneApi(userProject.get()).list()); throw new UnsupportedOperationException("Locations are configured in GoogleComputeEngineLocationModule");
} }
@Override @Override
@ -301,13 +300,13 @@ public final class GoogleComputeEngineServiceAdapter implements ComputeServiceAd
@Override @Override
public Iterable<InstanceInZone> listNodes() { public Iterable<InstanceInZone> listNodes() {
return FluentIterable.from(zones.get().values()) return FluentIterable.from(zoneIds.get())
.transformAndConcat(new Function<Location, Iterable<InstanceInZone>>() { .transformAndConcat(new Function<String, Iterable<InstanceInZone>>() {
@Override public Iterable<InstanceInZone> apply(final Location input) { @Override public Iterable<InstanceInZone> apply(final String zoneId) {
return transform(concat(api.getInstanceApi(userProject.get(), input.getId()).list()), return transform(concat(api.getInstanceApi(userProject.get(), zoneId).list()),
new Function<Instance, InstanceInZone>() { new Function<Instance, InstanceInZone>() {
@Override public InstanceInZone apply(Instance arg0) { @Override public InstanceInZone apply(Instance arg0) {
return InstanceInZone.create(arg0, input.getId()); return InstanceInZone.create(arg0, zoneId);
} }
}); });
} }

222
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/config/GoogleComputeEngineServiceContextModule.java
View File

@ -16,18 +16,13 @@
*/ */
package org.jclouds.googlecomputeengine.compute.config; package org.jclouds.googlecomputeengine.compute.config;
import static com.google.common.collect.Iterables.transform; import static com.google.common.base.Suppliers.memoizeWithExpiration;
import static com.google.common.collect.Maps.uniqueIndex; import static java.util.concurrent.TimeUnit.SECONDS;
import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
import static org.jclouds.googlecomputeengine.internal.ListPages.concat;
import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.GCE_IMAGE_PROJECTS;
import java.net.URI; import java.net.URI;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import javax.inject.Named; import javax.inject.Named;
import javax.inject.Singleton; import javax.inject.Singleton;
@ -44,7 +39,6 @@ import org.jclouds.compute.extensions.SecurityGroupExtension;
import org.jclouds.compute.options.TemplateOptions; import org.jclouds.compute.options.TemplateOptions;
import org.jclouds.compute.strategy.PrioritizeCredentialsFromTemplate; import org.jclouds.compute.strategy.PrioritizeCredentialsFromTemplate;
import org.jclouds.domain.Location; import org.jclouds.domain.Location;
import org.jclouds.googlecomputeengine.GoogleComputeEngineApi;
import org.jclouds.googlecomputeengine.compute.GoogleComputeEngineService; import org.jclouds.googlecomputeengine.compute.GoogleComputeEngineService;
import org.jclouds.googlecomputeengine.compute.GoogleComputeEngineServiceAdapter; import org.jclouds.googlecomputeengine.compute.GoogleComputeEngineServiceAdapter;
import org.jclouds.googlecomputeengine.compute.domain.InstanceInZone; import org.jclouds.googlecomputeengine.compute.domain.InstanceInZone;
@ -61,29 +55,21 @@ import org.jclouds.googlecomputeengine.compute.functions.InstanceInZoneToNodeMet
import org.jclouds.googlecomputeengine.compute.functions.MachineTypeInZoneToHardware; import org.jclouds.googlecomputeengine.compute.functions.MachineTypeInZoneToHardware;
import org.jclouds.googlecomputeengine.compute.functions.NetworkToSecurityGroup; import org.jclouds.googlecomputeengine.compute.functions.NetworkToSecurityGroup;
import org.jclouds.googlecomputeengine.compute.functions.OrphanedGroupsFromDeadNodes; import org.jclouds.googlecomputeengine.compute.functions.OrphanedGroupsFromDeadNodes;
import org.jclouds.googlecomputeengine.compute.functions.RegionToLocation;
import org.jclouds.googlecomputeengine.compute.functions.ZoneToLocation;
import org.jclouds.googlecomputeengine.compute.options.GoogleComputeEngineTemplateOptions; import org.jclouds.googlecomputeengine.compute.options.GoogleComputeEngineTemplateOptions;
import org.jclouds.googlecomputeengine.compute.predicates.AllNodesInGroupTerminated; import org.jclouds.googlecomputeengine.compute.predicates.AllNodesInGroupTerminated;
import org.jclouds.googlecomputeengine.compute.strategy.CreateNodesWithGroupEncodedIntoNameThenAddToSet; import org.jclouds.googlecomputeengine.compute.strategy.CreateNodesWithGroupEncodedIntoNameThenAddToSet;
import org.jclouds.googlecomputeengine.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy; import org.jclouds.googlecomputeengine.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy;
import org.jclouds.googlecomputeengine.compute.strategy.UseNodeCredentialsButOverrideFromTemplate; import org.jclouds.googlecomputeengine.compute.strategy.UseNodeCredentialsButOverrideFromTemplate;
import org.jclouds.googlecomputeengine.config.UserProject;
import org.jclouds.googlecomputeengine.domain.Firewall; import org.jclouds.googlecomputeengine.domain.Firewall;
import org.jclouds.googlecomputeengine.domain.Image; import org.jclouds.googlecomputeengine.domain.Image;
import org.jclouds.googlecomputeengine.domain.Instance; import org.jclouds.googlecomputeengine.domain.Instance;
import org.jclouds.googlecomputeengine.domain.Network; import org.jclouds.googlecomputeengine.domain.Network;
import org.jclouds.googlecomputeengine.domain.Region;
import org.jclouds.googlecomputeengine.domain.Zone;
import org.jclouds.net.domain.IpPermission; import org.jclouds.net.domain.IpPermission;
import org.jclouds.rest.AuthorizationException;
import org.jclouds.rest.suppliers.MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Functions;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Splitter;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
@ -94,8 +80,8 @@ import com.google.inject.Provides;
import com.google.inject.Scopes; import com.google.inject.Scopes;
import com.google.inject.TypeLiteral; import com.google.inject.TypeLiteral;
public class GoogleComputeEngineServiceContextModule public final class GoogleComputeEngineServiceContextModule
extends ComputeServiceAdapterContextModule<InstanceInZone, MachineTypeInZone, Image, Zone> { extends ComputeServiceAdapterContextModule<InstanceInZone, MachineTypeInZone, Image, Location> {
@Override @Override
protected void configure() { protected void configure() {
@ -103,174 +89,117 @@ public class GoogleComputeEngineServiceContextModule
bind(ComputeService.class).to(GoogleComputeEngineService.class); bind(ComputeService.class).to(GoogleComputeEngineService.class);
bind(new TypeLiteral<ComputeServiceAdapter<InstanceInZone, MachineTypeInZone, Image, Zone>>() {}) bind(new TypeLiteral<ComputeServiceAdapter<InstanceInZone, MachineTypeInZone, Image, Location>>() {
.to(GoogleComputeEngineServiceAdapter.class); }).to(GoogleComputeEngineServiceAdapter.class);
bind(new TypeLiteral<Function<InstanceInZone, NodeMetadata>>() {}) bind(new TypeLiteral<Function<Location, Location>>() {
.to(InstanceInZoneToNodeMetadata.class); }).toInstance(Functions.<Location>identity());
bind(new TypeLiteral<Function<MachineTypeInZone, Hardware>>() {}) bind(new TypeLiteral<Function<InstanceInZone, NodeMetadata>>() {
.to(MachineTypeInZoneToHardware.class); }).to(InstanceInZoneToNodeMetadata.class);
bind(new TypeLiteral<Function<Image, org.jclouds.compute.domain.Image>>() {}) bind(new TypeLiteral<Function<MachineTypeInZone, Hardware>>() {
.to(GoogleComputeEngineImageToImage.class); }).to(MachineTypeInZoneToHardware.class);
bind(new TypeLiteral<Function<Region, Location>>() { bind(new TypeLiteral<Function<Image, org.jclouds.compute.domain.Image>>() {
}) }).to(GoogleComputeEngineImageToImage.class);
.to(RegionToLocation.class);
bind(new TypeLiteral<Function<Zone, Location>>() {}) bind(new TypeLiteral<Function<Firewall, Iterable<IpPermission>>>() {
.to(ZoneToLocation.class); }).to(FirewallToIpPermission.class);
bind(new TypeLiteral<Function<Firewall, Iterable<IpPermission>>>() {}) bind(new TypeLiteral<Function<Network, SecurityGroup>>() {
.to(FirewallToIpPermission.class); }).to(NetworkToSecurityGroup.class);
bind(new TypeLiteral<Function<Network, SecurityGroup>>() {}) bind(new TypeLiteral<Function<TemplateOptions, ImmutableMap.Builder<String, String>>>() {
.to(NetworkToSecurityGroup.class); }).to(BuildInstanceMetadata.class);
bind(new TypeLiteral<Function<TemplateOptions, ImmutableMap.Builder<String, String>>>() {})
.to(BuildInstanceMetadata.class);
bind(org.jclouds.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy.class) bind(org.jclouds.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy.class)
.to(PopulateDefaultLoginCredentialsForImageStrategy.class); .to(PopulateDefaultLoginCredentialsForImageStrategy.class);
bind(org.jclouds.compute.strategy.impl.CreateNodesWithGroupEncodedIntoNameThenAddToSet.class).to( bind(org.jclouds.compute.strategy.impl.CreateNodesWithGroupEncodedIntoNameThenAddToSet.class)
CreateNodesWithGroupEncodedIntoNameThenAddToSet.class); .to(CreateNodesWithGroupEncodedIntoNameThenAddToSet.class);
bind(TemplateOptions.class).to(GoogleComputeEngineTemplateOptions.class); bind(TemplateOptions.class).to(GoogleComputeEngineTemplateOptions.class);
bind(new TypeLiteral<Function<Set<? extends NodeMetadata>, Set<String>>>() {}) bind(new TypeLiteral<Function<Set<? extends NodeMetadata>, Set<String>>>() {
.to(OrphanedGroupsFromDeadNodes.class); }).to(OrphanedGroupsFromDeadNodes.class);
bind(new TypeLiteral<Predicate<String>>() {}).to(AllNodesInGroupTerminated.class); bind(new TypeLiteral<Predicate<String>>() {
}).to(AllNodesInGroupTerminated.class);
bind(new TypeLiteral<Function<NetworkAndAddressRange, Network>>() {}) bind(new TypeLiteral<Function<NetworkAndAddressRange, Network>>() {
.to(CreateNetworkIfNeeded.class); }).to(CreateNetworkIfNeeded.class);
bind(new TypeLiteral<CacheLoader<NetworkAndAddressRange, Network>>() {}) bind(new TypeLiteral<CacheLoader<NetworkAndAddressRange, Network>>() {
.to(FindNetworkOrCreate.class); }).to(FindNetworkOrCreate.class);
bind(new TypeLiteral<SecurityGroupExtension>() {}) bind(SecurityGroupExtension.class).to(GoogleComputeEngineSecurityGroupExtension.class);
.to(GoogleComputeEngineSecurityGroupExtension.class);
bind(PrioritizeCredentialsFromTemplate.class).to(UseNodeCredentialsButOverrideFromTemplate.class); bind(PrioritizeCredentialsFromTemplate.class).to(UseNodeCredentialsButOverrideFromTemplate.class);
install(new LocationsFromComputeServiceAdapterModule<InstanceInZone, MachineTypeInZone, Image, Zone>() {});
bind(FirewallTagNamingConvention.Factory.class).in(Scopes.SINGLETON); bind(FirewallTagNamingConvention.Factory.class).in(Scopes.SINGLETON);
} }
@Provides @Provides @Singleton @Memoized Supplier<Map<URI, org.jclouds.compute.domain.Image>> imageByUri(
@Singleton @Memoized final Supplier<Set<? extends org.jclouds.compute.domain.Image>> imageSupplier,
@Memoized
public Supplier<Map<URI, ? extends org.jclouds.compute.domain.Image>> provideImagesMap(
AtomicReference<AuthorizationException> authException,
final Supplier<Set<? extends org.jclouds.compute.domain.Image>> images,
@Named(PROPERTY_SESSION_INTERVAL) long seconds) { @Named(PROPERTY_SESSION_INTERVAL) long seconds) {
return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, return memoizeWithExpiration(new Supplier<Map<URI, org.jclouds.compute.domain.Image>>() {
new Supplier<Map<URI, ? extends org.jclouds.compute.domain.Image>>() { @Override public Map<URI, org.jclouds.compute.domain.Image> get() {
@Override ImmutableMap.Builder<URI, org.jclouds.compute.domain.Image> result = ImmutableMap.builder();
public Map<URI, ? extends org.jclouds.compute.domain.Image> get() { for (org.jclouds.compute.domain.Image image : imageSupplier.get()) {
return uniqueIndex(images.get(), new Function<org.jclouds.compute.domain.Image, URI>() { result.put(image.getUri(), image);
@Override
public URI apply(org.jclouds.compute.domain.Image input) {
return input.getUri();
} }
}); return result.build();
} }
}, }, seconds, SECONDS);
seconds, TimeUnit.SECONDS);
} }
@Provides @Provides @Singleton @Memoized Supplier<Map<URI, Hardware>> hardwareByUri(
@Singleton @Memoized final Supplier<Set<? extends Hardware>> hardwareSupplier,
@Memoized
public Supplier<Map<URI, ? extends Hardware>> provideHardwaresMap(
AtomicReference<AuthorizationException> authException,
final Supplier<Set<? extends Hardware>> hardwares,
@Named(PROPERTY_SESSION_INTERVAL) long seconds) { @Named(PROPERTY_SESSION_INTERVAL) long seconds) {
return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, return memoizeWithExpiration(new Supplier<Map<URI, Hardware>>() {
new Supplier<Map<URI, ? extends Hardware>>() { @Override public Map<URI, Hardware> get() {
@Override ImmutableMap.Builder<URI, Hardware> result = ImmutableMap.builder();
public Map<URI, ? extends Hardware> get() { for (Hardware hardware : hardwareSupplier.get()) {
return uniqueIndex(hardwares.get(), new Function<Hardware, URI>() { result.put(hardware.getUri(), hardware);
@Override
public URI apply(Hardware input) {
return input.getUri();
} }
}); return result.build();
} }
}, }, seconds, SECONDS);
seconds, TimeUnit.SECONDS);
} }
@Provides @Provides @Singleton @Memoized Supplier<Map<URI, Location>> locationsByUri(
@Singleton @Memoized final Supplier<Set<? extends Location>> locations,
@Memoized @Memoized final Supplier<Map<URI, String>> selfLinkToNames, @Named(PROPERTY_SESSION_INTERVAL) long seconds) {
public Supplier<Map<URI, ? extends Location>> provideZones( return memoizeWithExpiration(new Supplier<Map<URI, Location>>() {
AtomicReference<AuthorizationException> authException, @Override public Map<URI, Location> get() {
final GoogleComputeEngineApi api, final Function<Zone, Location> zoneToLocation, ImmutableMap.Builder<URI, Location> result = ImmutableMap.builder();
@UserProject final Supplier<String> userProject, for (Location location : locations.get()) {
@Named(PROPERTY_SESSION_INTERVAL) long seconds) { for (Map.Entry<URI, String> entry : selfLinkToNames.get().entrySet()) {
return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, if (entry.getValue().equals(location.getId())) {
new Supplier<Map<URI, ? extends Location>>() { result.put(entry.getKey(), location);
@Override continue;
public Map<URI, ? extends Location> get() {
return uniqueIndex(transform(concat(api.getZoneApi(userProject.get()).list()), zoneToLocation),
new Function<Location, URI>() {
@Override
public URI apply(Location input) {
return (URI) input.getMetadata().get("selfLink");
} }
});
} }
}, }
seconds, TimeUnit.SECONDS); return result.build();
}
}, seconds, SECONDS);
} }
@Provides @Provides @Singleton
@Singleton LoadingCache<NetworkAndAddressRange, Network> networkMap(CacheLoader<NetworkAndAddressRange, Network> in) {
@Memoized
public Supplier<Map<URI, Region>> provideRegions(
AtomicReference<AuthorizationException> authException,
final GoogleComputeEngineApi api,
@UserProject final Supplier<String> userProject,
@Named(PROPERTY_SESSION_INTERVAL) long seconds) {
return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException,
new Supplier<Map<URI, Region>>() {
@Override
public Map<URI, Region> get() {
return uniqueIndex(concat(api.getRegionApi(userProject.get()).list()),
new Function<Region, URI>() {
@Override
public URI apply(Region input) {
return input.selfLink();
}
});
}
},
seconds, TimeUnit.SECONDS);
}
@Provides
@Singleton
protected LoadingCache<NetworkAndAddressRange, Network> networkMap(
CacheLoader<NetworkAndAddressRange, Network> in) {
return CacheBuilder.newBuilder().build(in); return CacheBuilder.newBuilder().build(in);
} }
@Override @Override protected Optional<ImageExtension> provideImageExtension(Injector i) {
protected Optional<ImageExtension> provideImageExtension(Injector i) {
return Optional.absent(); return Optional.absent();
} }
@Override @Override protected Optional<SecurityGroupExtension> provideSecurityGroupExtension(Injector i) {
protected Optional<SecurityGroupExtension> provideSecurityGroupExtension(Injector i) {
return Optional.of(i.getInstance(SecurityGroupExtension.class)); return Optional.of(i.getInstance(SecurityGroupExtension.class));
} }
@VisibleForTesting private static final Map<Instance.Status, NodeMetadata.Status> toPortableNodeStatus =
public static final Map<Instance.Status, NodeMetadata.Status> toPortableNodeStatus =
ImmutableMap.<Instance.Status, NodeMetadata.Status>builder() ImmutableMap.<Instance.Status, NodeMetadata.Status>builder()
.put(Instance.Status.PROVISIONING, NodeMetadata.Status.PENDING) .put(Instance.Status.PROVISIONING, NodeMetadata.Status.PENDING)
.put(Instance.Status.STAGING, NodeMetadata.Status.PENDING) .put(Instance.Status.STAGING, NodeMetadata.Status.PENDING)
@ -279,16 +208,7 @@ public class GoogleComputeEngineServiceContextModule
.put(Instance.Status.STOPPED, NodeMetadata.Status.SUSPENDED) .put(Instance.Status.STOPPED, NodeMetadata.Status.SUSPENDED)
.put(Instance.Status.TERMINATED, NodeMetadata.Status.TERMINATED).build(); .put(Instance.Status.TERMINATED, NodeMetadata.Status.TERMINATED).build();
@Singleton @Provides Map<Instance.Status, NodeMetadata.Status> toPortableNodeStatus() {
@Provides
protected Map<Instance.Status, NodeMetadata.Status> toPortableNodeStatus() {
return toPortableNodeStatus; return toPortableNodeStatus;
} }
@Singleton
@Provides
@Named(GCE_IMAGE_PROJECTS)
protected List<String> imageProjects(@Named(GCE_IMAGE_PROJECTS) String imageProjects) {
return Splitter.on(',').splitToList(imageProjects);
}
} }

9
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/BuildInstanceMetadata.java
View File

@ -19,8 +19,6 @@ package org.jclouds.googlecomputeengine.compute.functions;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static java.lang.String.format; import static java.lang.String.format;
import javax.inject.Singleton;
import org.jclouds.compute.options.TemplateOptions; import org.jclouds.compute.options.TemplateOptions;
import com.google.common.base.Function; import com.google.common.base.Function;
@ -29,11 +27,9 @@ import com.google.common.collect.ImmutableMap;
/** /**
* Prepares metadata from the provided TemplateOptions * Prepares metadata from the provided TemplateOptions
*/ */
@Singleton public final class BuildInstanceMetadata implements Function<TemplateOptions, ImmutableMap.Builder<String, String>> {
public class BuildInstanceMetadata implements Function<TemplateOptions, ImmutableMap.Builder<String, String>> {
@Override @Override public ImmutableMap.Builder apply(TemplateOptions input) {
public ImmutableMap.Builder apply(TemplateOptions input) {
ImmutableMap.Builder<String, String> builder = ImmutableMap.builder(); ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
if (input.getPublicKey() != null) { if (input.getPublicKey() != null) {
builder.put("sshKeys", format("%s:%s %s@localhost", checkNotNull(input.getLoginUser(), builder.put("sshKeys", format("%s:%s %s@localhost", checkNotNull(input.getLoginUser(),
@ -42,5 +38,4 @@ public class BuildInstanceMetadata implements Function<TemplateOptions, Immutabl
builder.putAll(input.getUserMetadata()); builder.putAll(input.getUserMetadata());
return builder; return builder;
} }
} }

6
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/CreateNetworkIfNeeded.java
View File

@ -25,17 +25,14 @@ import static org.jclouds.util.Predicates2.retry;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Resource;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.googlecomputeengine.GoogleComputeEngineApi; import org.jclouds.googlecomputeengine.GoogleComputeEngineApi;
import org.jclouds.googlecomputeengine.compute.domain.NetworkAndAddressRange; import org.jclouds.googlecomputeengine.compute.domain.NetworkAndAddressRange;
import org.jclouds.googlecomputeengine.config.UserProject; import org.jclouds.googlecomputeengine.config.UserProject;
import org.jclouds.googlecomputeengine.domain.Network; import org.jclouds.googlecomputeengine.domain.Network;
import org.jclouds.googlecomputeengine.domain.Operation; import org.jclouds.googlecomputeengine.domain.Operation;
import org.jclouds.logging.Logger;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
@ -43,9 +40,6 @@ import com.google.common.base.Supplier;
import com.google.common.util.concurrent.Atomics; import com.google.common.util.concurrent.Atomics;
public class CreateNetworkIfNeeded implements Function<NetworkAndAddressRange, Network> { public class CreateNetworkIfNeeded implements Function<NetworkAndAddressRange, Network> {
@Resource @Named(ComputeServiceConstants.COMPUTE_LOGGER)
private Logger logger = Logger.NULL;
private final GoogleComputeEngineApi api; private final GoogleComputeEngineApi api;
private final Supplier<String> userProject; private final Supplier<String> userProject;
private final Predicate<AtomicReference<Operation>> operationDonePredicate; private final Predicate<AtomicReference<Operation>> operationDonePredicate;

26
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/InstanceInZoneToNodeMetadata.java
View File

@ -47,22 +47,22 @@ public final class InstanceInZoneToNodeMetadata implements Function<InstanceInZo
private final Map<Instance.Status, NodeMetadata.Status> toPortableNodeStatus; private final Map<Instance.Status, NodeMetadata.Status> toPortableNodeStatus;
private final GroupNamingConvention nodeNamingConvention; private final GroupNamingConvention nodeNamingConvention;
private final Supplier<Map<URI, ? extends Image>> images; private final Supplier<Map<URI, Image>> images;
private final Supplier<Map<URI, ? extends Hardware>> hardwares; private final Supplier<Map<URI, Hardware>> hardwares;
private final Supplier<Map<URI, ? extends Location>> locations; private final Supplier<Map<URI, Location>> locationsByUri;
private final FirewallTagNamingConvention.Factory firewallTagNamingConvention; private final FirewallTagNamingConvention.Factory firewallTagNamingConvention;
@Inject InstanceInZoneToNodeMetadata(Map<Instance.Status, NodeMetadata.Status> toPortableNodeStatus, @Inject InstanceInZoneToNodeMetadata(Map<Instance.Status, NodeMetadata.Status> toPortableNodeStatus,
GroupNamingConvention.Factory namingConvention, GroupNamingConvention.Factory namingConvention,
@Memoized Supplier<Map<URI, ? extends Image>> images, @Memoized Supplier<Map<URI, Image>> images,
@Memoized Supplier<Map<URI, ? extends Hardware>> hardwares, @Memoized Supplier<Map<URI, Hardware>> hardwares,
@Memoized Supplier<Map<URI, ? extends Location>> locations, @Memoized Supplier<Map<URI, Location>> locationsByUri,
FirewallTagNamingConvention.Factory firewallTagNamingConvention) { FirewallTagNamingConvention.Factory firewallTagNamingConvention) {
this.toPortableNodeStatus = toPortableNodeStatus; this.toPortableNodeStatus = toPortableNodeStatus;
this.nodeNamingConvention = namingConvention.createWithoutPrefix(); this.nodeNamingConvention = namingConvention.createWithoutPrefix();
this.images = images; this.images = images;
this.hardwares = hardwares; this.hardwares = hardwares;
this.locations = locations; this.locationsByUri = locationsByUri;
this.firewallTagNamingConvention = checkNotNull(firewallTagNamingConvention, "firewallTagNamingConvention"); this.firewallTagNamingConvention = checkNotNull(firewallTagNamingConvention, "firewallTagNamingConvention");
} }
@ -77,12 +77,16 @@ public final class InstanceInZoneToNodeMetadata implements Function<InstanceInZo
NodeMetadataBuilder builder = new NodeMetadataBuilder(); NodeMetadataBuilder builder = new NodeMetadataBuilder();
Location location = checkNotNull(locations.get().get(input.zone()), "location for %s", input.zone()); Location zone = locationsByUri.get().get(input.zone());
builder.id(SlashEncodedIds.from(location.getId(), input.name()).slashEncode()) if (zone == null) {
throw new IllegalStateException(
String.format("zone %s not present in %s", input.zone(), locationsByUri.get().keySet()));
}
builder.id(SlashEncodedIds.from(zone.getId(), input.name()).slashEncode())
.name(input.name()) .name(input.name())
.providerId(input.id()) .providerId(input.id())
.hostname(input.name()) .hostname(input.name())
.location(location) .location(zone)
.hardware(hardwares.get().get(input.machineType())) .hardware(hardwares.get().get(input.machineType()))
.status(toPortableNodeStatus.get(input.status())) .status(toPortableNodeStatus.get(input.status()))
.tags(tags) .tags(tags)
@ -96,7 +100,7 @@ public final class InstanceInZoneToNodeMetadata implements Function<InstanceInZo
try { try {
URI imageUri = URI.create(input.metadata().items().get(GCE_IMAGE_METADATA_KEY)); URI imageUri = URI.create(input.metadata().items().get(GCE_IMAGE_METADATA_KEY));
Map<URI, ? extends Image> imagesMap = images.get(); Map<URI, Image> imagesMap = images.get();
Image image = checkNotNull(imagesMap.get(imageUri), Image image = checkNotNull(imagesMap.get(imageUri),
"no image for %s. images: %s", imageUri, "no image for %s. images: %s", imageUri,

41
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/MachineTypeInZoneToHardware.java
View File

@ -16,13 +16,11 @@
*/ */
package org.jclouds.googlecomputeengine.compute.functions; package org.jclouds.googlecomputeengine.compute.functions;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.getOnlyElement;
import java.net.URI; import java.net.URI;
import java.util.Map; import java.util.Map;
import javax.inject.Inject;
import org.jclouds.collect.Memoized; import org.jclouds.collect.Memoized;
import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.Hardware;
import org.jclouds.compute.domain.HardwareBuilder; import org.jclouds.compute.domain.HardwareBuilder;
@ -36,40 +34,31 @@ import org.jclouds.googlecomputeengine.compute.domain.SlashEncodedIds;
import org.jclouds.googlecomputeengine.domain.MachineType; import org.jclouds.googlecomputeengine.domain.MachineType;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.inject.Inject;
/** public final class MachineTypeInZoneToHardware implements Function<MachineTypeInZone, Hardware> {
* Transforms a google compute domain specific machine type to a generic Hardware object.
*/
public class MachineTypeInZoneToHardware implements Function<MachineTypeInZone, Hardware> {
private final Supplier<Map<URI, ? extends Location>> locations; private final Supplier<Map<URI, Location>> locationsByUri;
@Inject @Inject MachineTypeInZoneToHardware(@Memoized Supplier<Map<URI, Location>> locationsByUri) {
public MachineTypeInZoneToHardware(@Memoized Supplier<Map<URI, ? extends Location>> locations) { this.locationsByUri = locationsByUri;
this.locations = locations;
} }
@Override @Override
public Hardware apply(final MachineTypeInZone input) { public Hardware apply(MachineTypeInZone input) {
Iterable<? extends Location> zonesForMachineType = filter(locations.get().values(), new Predicate<Location>() { URI zoneLink = URI.create(
@Override input.machineType().selfLink().toString().replace("/machineTypes/" + input.machineType().name(), ""));
public boolean apply(Location l) {
return l.getId().equals(input.machineType().zone()); Location zone = locationsByUri.get().get(zoneLink);
if (zone == null) {
throw new IllegalStateException(
String.format("zone %s not present in %s", zoneLink, locationsByUri.get().keySet()));
} }
});
Location location = checkNotNull(getOnlyElement(zonesForMachineType),
"location for %s",
input.machineType().zone());
return new HardwareBuilder() return new HardwareBuilder()
.id(SlashEncodedIds.from(input.machineType().zone(), input.machineType().name()).slashEncode()) .id(SlashEncodedIds.from(input.machineType().zone(), input.machineType().name()).slashEncode())
.location(location) .location(zone)
.name(input.machineType().name()) .name(input.machineType().name())
.hypervisor("kvm") .hypervisor("kvm")
.processor(new Processor(input.machineType().guestCpus(), 1.0)) .processor(new Processor(input.machineType().guestCpus(), 1.0))

12
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/OrphanedGroupsFromDeadNodes.java
View File

@ -19,7 +19,6 @@ package org.jclouds.googlecomputeengine.compute.functions;
import java.util.Set; import java.util.Set;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton;
import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.NodeMetadata;
@ -27,19 +26,16 @@ import com.google.common.base.Function;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
@Singleton public final class OrphanedGroupsFromDeadNodes implements Function<Set<? extends NodeMetadata>, Set<String>> {
public class OrphanedGroupsFromDeadNodes implements Function<Set<? extends NodeMetadata>, Set<String>> {
private final Predicate<String> isOrphanedGroupPredicate; private final Predicate<String> isOrphanedGroupPredicate;
@Inject @Inject OrphanedGroupsFromDeadNodes(Predicate<String> isOrphanedGroupPredicate) {
public OrphanedGroupsFromDeadNodes(Predicate<String> isOrphanedGroupPredicate) {
this.isOrphanedGroupPredicate = isOrphanedGroupPredicate; this.isOrphanedGroupPredicate = isOrphanedGroupPredicate;
} }
@Override @Override public Set<String> apply(Set<? extends NodeMetadata> deadNodes) {
public Set<String> apply(Set<? extends NodeMetadata> deadNodes) {
Set<String> groups = Sets.newLinkedHashSet(); Set<String> groups = Sets.newLinkedHashSet();
for (NodeMetadata deadNode : deadNodes) { for (NodeMetadata deadNode : deadNodes) {
groups.add(deadNode.getGroup()); groups.add(deadNode.getGroup());
@ -52,6 +48,4 @@ public class OrphanedGroupsFromDeadNodes implements Function<Set<? extends NodeM
} }
return orphanedGroups; return orphanedGroups;
} }
} }

45
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/RegionToLocation.java
View File

@ -1,45 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jclouds.googlecomputeengine.compute.functions;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.GOOGLE_PROVIDER_LOCATION;
import org.jclouds.domain.Location;
import org.jclouds.domain.LocationBuilder;
import org.jclouds.domain.LocationScope;
import org.jclouds.googlecomputeengine.domain.Region;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableMap;
/**
* Transforms a google compute domain specific region to a generic Region object.
*/
public class RegionToLocation implements Function<Region, Location> {
@Override
public Location apply(Region input) {
return new LocationBuilder()
.description(input.description())
.metadata(ImmutableMap.of("selfLink", (Object) checkNotNull(input.selfLink(), "region URI")))
.id(input.name())
.scope(LocationScope.REGION)
.parent(GOOGLE_PROVIDER_LOCATION)
.build();
}
}

45
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/ZoneToLocation.java
View File

@ -1,45 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jclouds.googlecomputeengine.compute.functions;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.GOOGLE_PROVIDER_LOCATION;
import org.jclouds.domain.Location;
import org.jclouds.domain.LocationBuilder;
import org.jclouds.domain.LocationScope;
import org.jclouds.googlecomputeengine.domain.Zone;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableMap;
/**
* Transforms a google compute domain specific zone to a generic Zone object.
*/
public class ZoneToLocation implements Function<Zone, Location> {
@Override
public Location apply(Zone input) {
return new LocationBuilder()
.description(input.description())
.metadata(ImmutableMap.of("selfLink", (Object) checkNotNull(input.selfLink(), "zone URI")))
.id(input.name())
.scope(LocationScope.ZONE)
.parent(GOOGLE_PROVIDER_LOCATION)
.build();
}
}

2
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/options/GoogleComputeEngineTemplateOptions.java
View File

@ -36,7 +36,7 @@ import com.google.common.collect.Lists;
/** /**
* Instance options specific to Google Compute Engine. * Instance options specific to Google Compute Engine.
*/ */
public class GoogleComputeEngineTemplateOptions extends TemplateOptions { public final class GoogleComputeEngineTemplateOptions extends TemplateOptions {
private Optional<URI> network = Optional.absent(); private Optional<URI> network = Optional.absent();
private List<Instance.ServiceAccount> serviceAccounts = Lists.newArrayList(); private List<Instance.ServiceAccount> serviceAccounts = Lists.newArrayList();

68
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java
View File

@ -18,10 +18,10 @@ package org.jclouds.googlecomputeengine.config;
import static com.google.common.base.Suppliers.compose; import static com.google.common.base.Suppliers.compose;
import static com.google.inject.name.Names.named; import static com.google.inject.name.Names.named;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
import java.net.URI; import java.net.URI;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import javax.inject.Named; import javax.inject.Named;
@ -31,7 +31,6 @@ import org.jclouds.domain.Credentials;
import org.jclouds.googlecomputeengine.GoogleComputeEngineApi; import org.jclouds.googlecomputeengine.GoogleComputeEngineApi;
import org.jclouds.googlecomputeengine.compute.domain.SlashEncodedIds; import org.jclouds.googlecomputeengine.compute.domain.SlashEncodedIds;
import org.jclouds.googlecomputeengine.domain.Operation; import org.jclouds.googlecomputeengine.domain.Operation;
import org.jclouds.googlecomputeengine.domain.Project;
import org.jclouds.googlecomputeengine.handlers.GoogleComputeEngineErrorHandler; import org.jclouds.googlecomputeengine.handlers.GoogleComputeEngineErrorHandler;
import org.jclouds.googlecomputeengine.predicates.GlobalOperationDonePredicate; import org.jclouds.googlecomputeengine.predicates.GlobalOperationDonePredicate;
import org.jclouds.googlecomputeengine.predicates.RegionOperationDonePredicate; import org.jclouds.googlecomputeengine.predicates.RegionOperationDonePredicate;
@ -44,8 +43,6 @@ import org.jclouds.http.annotation.ServerError;
import org.jclouds.json.config.GsonModule.DateAdapter; import org.jclouds.json.config.GsonModule.DateAdapter;
import org.jclouds.json.config.GsonModule.Iso8601DateAdapter; import org.jclouds.json.config.GsonModule.Iso8601DateAdapter;
import org.jclouds.location.Provider; import org.jclouds.location.Provider;
import org.jclouds.location.suppliers.ImplicitLocationSupplier;
import org.jclouds.location.suppliers.implicit.FirstZone;
import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.AuthorizationException;
import org.jclouds.rest.ConfiguresHttpApi; import org.jclouds.rest.ConfiguresHttpApi;
import org.jclouds.rest.config.HttpApiModule; import org.jclouds.rest.config.HttpApiModule;
@ -57,14 +54,10 @@ import com.google.common.base.Splitter;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.inject.Provides; import com.google.inject.Provides;
import com.google.inject.Scopes;
import com.google.inject.TypeLiteral; import com.google.inject.TypeLiteral;
/**
* Configures the GoogleCompute connection.
*/
@ConfiguresHttpApi @ConfiguresHttpApi
public class GoogleComputeEngineHttpApiModule extends HttpApiModule<GoogleComputeEngineApi> { public final class GoogleComputeEngineHttpApiModule extends HttpApiModule<GoogleComputeEngineApi> {
public GoogleComputeEngineHttpApiModule() { public GoogleComputeEngineHttpApiModule() {
} }
@ -77,7 +70,6 @@ public class GoogleComputeEngineHttpApiModule extends HttpApiModule<GoogleComput
}).annotatedWith(named("region")).to(RegionOperationDonePredicate.class); }).annotatedWith(named("region")).to(RegionOperationDonePredicate.class);
bind(new TypeLiteral<Predicate<AtomicReference<Operation>>>() { bind(new TypeLiteral<Predicate<AtomicReference<Operation>>>() {
}).annotatedWith(named("zone")).to(ZoneOperationDonePredicate.class); }).annotatedWith(named("zone")).to(ZoneOperationDonePredicate.class);
bind(ImplicitLocationSupplier.class).to(FirstZone.class).in(Scopes.SINGLETON);
super.configure(); super.configure();
} }
@ -88,10 +80,18 @@ public class GoogleComputeEngineHttpApiModule extends HttpApiModule<GoogleComput
bind(HttpErrorHandler.class).annotatedWith(ServerError.class).to(GoogleComputeEngineErrorHandler.class); bind(HttpErrorHandler.class).annotatedWith(ServerError.class).to(GoogleComputeEngineErrorHandler.class);
} }
@Override
protected void installLocations() {
install(new GoogleComputeEngineLocationModule());
}
/**
* Since this is caching a direct api call, we memoize, but short-circuit on any auth exception. This prevents
* excessive errors when things occur in parallel, or as peers on a function graph.
*/
@Provides @Provides
@Singleton @Singleton
@UserProject @UserProject Supplier<String> projectName(@Provider final Supplier<Credentials> creds,
public Supplier<String> supplyProject(@Provider final Supplier<Credentials> creds,
final GoogleComputeEngineApi api, final GoogleComputeEngineApi api,
AtomicReference<AuthorizationException> authException, AtomicReference<AuthorizationException> authException,
@Named(PROPERTY_SESSION_INTERVAL) long seconds) { @Named(PROPERTY_SESSION_INTERVAL) long seconds) {
@ -111,17 +111,15 @@ public class GoogleComputeEngineHttpApiModule extends HttpApiModule<GoogleComput
projectName = Iterables.get(Splitter.on("-").split(projectName), 0); projectName = Iterables.get(Splitter.on("-").split(projectName), 0);
} }
} }
Project project = api.getProjectApi().get(projectName); return api.getProjectApi().get(projectName).name();
return project.name();
} }
}, creds), seconds, TimeUnit.SECONDS); }, creds), seconds, SECONDS);
} }
@Provides @Provides
@Singleton @Singleton
@Named("machineTypeToURI") @Named("machineTypeToURI") Function<String, URI> machineTypeNameToURI(
public Function<String, URI> provideMachineTypeNameToURIFunction(@Provider final Supplier<URI> endpoint, @Provider final Supplier<URI> endpoint, @UserProject final Supplier<String> userProject) {
@UserProject final Supplier<String> userProject) {
return new Function<String, URI>() { return new Function<String, URI>() {
@Override @Override
public URI apply(String input) { public URI apply(String input) {
@ -135,43 +133,13 @@ public class GoogleComputeEngineHttpApiModule extends HttpApiModule<GoogleComput
@Provides @Provides
@Singleton @Singleton
@Named("networkToURI") @Named("networkToURI") Function<String, URI> networkNameToURI(@Provider final Supplier<URI> endpoint,
public Function<String, URI> provideNetworkNameToURIFunction(@Provider final Supplier<URI> endpoint,
@UserProject final Supplier<String> userProject) { @UserProject final Supplier<String> userProject) {
return new Function<String, URI>() { return new Function<String, URI>() {
@Override @Override public URI apply(String input) {
public URI apply(String input) {
return Uris.uriBuilder(endpoint.get()).appendPath("/projects/").appendPath(userProject.get()) return Uris.uriBuilder(endpoint.get()).appendPath("/projects/").appendPath(userProject.get())
.appendPath("/global/networks/").appendPath(input).build(); .appendPath("/global/networks/").appendPath(input).build();
} }
}; };
} }
@Provides
@Singleton
@Named("zoneToURI")
public Function<String, URI> provideZoneNameToURIFunction(@Provider final Supplier<URI> endpoint,
@UserProject final Supplier<String> userProject) {
return new Function<String, URI>() {
@Override
public URI apply(String input) {
return Uris.uriBuilder(endpoint.get()).appendPath("/projects/").appendPath(userProject.get())
.appendPath("/zones/").appendPath(input).build();
}
};
}
@Provides
@Singleton
@Named("regionToURI")
public Function<String, URI> provideRegionNameToURIFunction(@Provider final Supplier<URI> endpoint,
@UserProject final Supplier<String> userProject) {
return new Function<String, URI>() {
@Override
public URI apply(String input) {
return Uris.uriBuilder(endpoint.get()).appendPath("/projects/").appendPath(userProject.get())
.appendPath("/regions/").appendPath(input).build();
}
};
}
} }

194
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineLocationModule.java Normal file
View File

@ -0,0 +1,194 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jclouds.googlecomputeengine.config;
import static com.google.common.base.Suppliers.compose;
import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
import static org.jclouds.googlecomputeengine.internal.ListPages.concat;
import java.net.URI;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import org.jclouds.collect.Memoized;
import org.jclouds.domain.Location;
import org.jclouds.googlecomputeengine.GoogleComputeEngineApi;
import org.jclouds.googlecomputeengine.domain.Region;
import org.jclouds.location.config.LocationModule;
import org.jclouds.location.predicates.LocationPredicates;
import org.jclouds.location.reference.LocationConstants;
import org.jclouds.location.suppliers.ImplicitLocationSupplier;
import org.jclouds.location.suppliers.LocationsSupplier;
import org.jclouds.location.suppliers.RegionIdToURISupplier;
import org.jclouds.location.suppliers.RegionIdToZoneIdsSupplier;
import org.jclouds.location.suppliers.RegionIdsSupplier;
import org.jclouds.location.suppliers.ZoneIdToURISupplier;
import org.jclouds.location.suppliers.ZoneIdsSupplier;
import org.jclouds.location.suppliers.all.ZoneToRegionToProviderOrJustProvider;
import org.jclouds.location.suppliers.derived.RegionIdsFromRegionIdToURIKeySet;
import org.jclouds.location.suppliers.derived.ZoneIdsFromRegionIdToZoneIdsValues;
import org.jclouds.location.suppliers.implicit.FirstZone;
import org.jclouds.rest.AuthorizationException;
import org.jclouds.rest.suppliers.MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
import com.google.common.base.Function;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import com.google.inject.Provides;
/**
* This configures dynamic locations from {@link org.jclouds.googlecomputeengine.features.RegionApi#list}. As the only
* assignable location for nodes are zones, this module does not directly expose regions. Rather, they can be found by
* looking at {@link Location#getParent()} on a zone.
* <p/> This does not yet support constraining region or zone lists via settings {@linkplain
* LocationConstants#PROPERTY_REGIONS} or {@linkplain LocationConstants#PROPERTY_ZONES}.
*/
public final class GoogleComputeEngineLocationModule extends LocationModule {
@Override protected void configure() {
super.configure();
// Unlike EC2, you cannot default GCE instances to a region. Hence, we constrain to zones.
bind(LocationsSupplier.class).to(OnlyZonesLocationSupplier.class);
bind(ImplicitLocationSupplier.class).to(FirstZone.class);
// Region and zones are derived from the same network request to RegionApi.list
// Using these suppliers will make that consistent and also cache timeout consistently
bind(RegionIdToZoneIdsSupplier.class).to(RegionIdToZoneIdsFromRegionList.class);
bind(RegionIdToURISupplier.class).to(RegionIdToURISupplierFromRegionList.class);
bind(ZoneIdToURISupplier.class).to(ZoneIdToURIFromRegionList.class);
bind(ZoneIdsSupplier.class).to(ZoneIdsFromRegionIdToZoneIdsValues.class);
bind(RegionIdsSupplier.class).to(RegionIdsFromRegionIdToURIKeySet.class);
}
/** Retain the metadata tree, including regions, just don't present anything except zones as assignable. */
static final class OnlyZonesLocationSupplier implements LocationsSupplier {
// This correctly links parents for zone -> region -> provider.
private final ZoneToRegionToProviderOrJustProvider delegate;
@Inject OnlyZonesLocationSupplier(ZoneToRegionToProviderOrJustProvider delegate) {
this.delegate = delegate;
}
@Override public Set<? extends Location> get() {
return Sets.filter(delegate.get(), LocationPredicates.isZone());
}
}
/**
* Since this is caching a direct api call, we memoize, but short-circuit on any auth exception. This prevents
* excessive errors when things occur in parallel, or as peers on a function graph.
*/
@Provides @Singleton @Memoized Supplier<List<Region>> regions(@UserProject Supplier<String> project,
final GoogleComputeEngineApi api, AtomicReference<AuthorizationException> authException,
@Named(PROPERTY_SESSION_INTERVAL) long seconds) {
return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier
.create(authException, compose(new Function<String, List<Region>>() {
public List<Region> apply(String project) {
return ImmutableList.copyOf(concat(api.getRegionApi(project).list()));
}
}, project), seconds, TimeUnit.SECONDS);
}
@Provides @Singleton @Memoized Supplier<Map<URI, String>> selfLinkToNames(
AtomicReference<AuthorizationException> authException, @Memoized Supplier<List<Region>> regions,
@Named(PROPERTY_SESSION_INTERVAL) long seconds) {
return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier
.create(authException, compose(new Function<List<Region>, Map<URI, String>>() {
public Map<URI, String> apply(List<Region> regions) {
ImmutableMap.Builder<URI, String> selfLinkToName = ImmutableMap.builder();
for (Region region : regions) {
selfLinkToName.put(region.selfLink(), region.name());
for (URI zoneSelfLink : region.zones()) {
selfLinkToName.put(zoneSelfLink, toName(zoneSelfLink));
}
}
return selfLinkToName.build();
}
}, regions), seconds, TimeUnit.SECONDS);
}
static final class RegionIdToZoneIdsFromRegionList implements RegionIdToZoneIdsSupplier {
private final Supplier<List<Region>> regions;
@Inject RegionIdToZoneIdsFromRegionList(@Memoized Supplier<List<Region>> regions) {
this.regions = regions;
}
@Override public Map<String, Supplier<Set<String>>> get() {
ImmutableMap.Builder<String, Supplier<Set<String>>> result = ImmutableMap.builder();
for (org.jclouds.googlecomputeengine.domain.Region region : regions.get()) {
ImmutableSet.Builder<String> zoneIds = ImmutableSet.builder();
for (URI uri : region.zones()) {
zoneIds.add(toName(uri));
}
result.put(region.name(), Suppliers.<Set<String>>ofInstance(zoneIds.build()));
}
return result.build();
}
}
static final class RegionIdToURISupplierFromRegionList implements RegionIdToURISupplier {
private final Supplier<List<Region>> regions;
@Inject RegionIdToURISupplierFromRegionList(@Memoized Supplier<List<Region>> regions) {
this.regions = regions;
}
@Override public Map<String, Supplier<URI>> get() {
ImmutableMap.Builder<String, Supplier<URI>> result = ImmutableMap.builder();
for (org.jclouds.googlecomputeengine.domain.Region region : regions.get()) {
result.put(region.name(), Suppliers.ofInstance(region.selfLink()));
}
return result.build();
}
}
static final class ZoneIdToURIFromRegionList implements ZoneIdToURISupplier {
private final Supplier<List<Region>> regions;
@Inject ZoneIdToURIFromRegionList(@Memoized Supplier<List<Region>> regions) {
this.regions = regions;
}
@Override public Map<String, Supplier<URI>> get() {
ImmutableMap.Builder<String, Supplier<URI>> result = ImmutableMap.builder();
for (Region region : regions.get()) {
for (URI input : region.zones()) {
result.put(toName(input), Suppliers.ofInstance(input));
}
}
return result.build();
}
}
private static String toName(URI link) {
String path = link.getPath();
return path.substring(path.lastIndexOf('/') + 1);
}
}

40
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineParserModule.java
View File

@ -55,7 +55,7 @@ public final class GoogleComputeEngineParserModule extends AbstractModule {
bind(GsonModule.DateAdapter.class).to(GsonModule.Iso8601DateAdapter.class); bind(GsonModule.DateAdapter.class).to(GsonModule.Iso8601DateAdapter.class);
} }
@Provides @Singleton public Map<Type, Object> typeAdapters() { @Provides @Singleton Map<Type, Object> typeAdapters() {
return new ImmutableMap.Builder<Type, Object>() return new ImmutableMap.Builder<Type, Object>()
.put(InstanceTemplate.class, new InstanceTemplateTypeAdapter()) .put(InstanceTemplate.class, new InstanceTemplateTypeAdapter())
.put(FirewallOptions.class, new FirewallOptionsTypeAdapter()) .put(FirewallOptions.class, new FirewallOptionsTypeAdapter())
@ -63,11 +63,11 @@ public final class GoogleComputeEngineParserModule extends AbstractModule {
} }
// TODO: change jclouds core to use collaborative set bindings // TODO: change jclouds core to use collaborative set bindings
@Provides @Singleton public Set<TypeAdapterFactory> typeAdapterFactories() { @Provides @Singleton Set<TypeAdapterFactory> typeAdapterFactories() {
return ImmutableSet.<TypeAdapterFactory>of(new MetadataTypeAdapter()); return ImmutableSet.<TypeAdapterFactory>of(new MetadataTypeAdapter());
} }
private static class InstanceTemplateTypeAdapter implements JsonSerializer<InstanceTemplate> { private static final class InstanceTemplateTypeAdapter implements JsonSerializer<InstanceTemplate> {
@Override public JsonElement serialize(InstanceTemplate src, Type typeOfSrc, JsonSerializationContext context) { @Override public JsonElement serialize(InstanceTemplate src, Type typeOfSrc, JsonSerializationContext context) {
InstanceTemplateInternal template = new InstanceTemplateInternal(src); InstanceTemplateInternal template = new InstanceTemplateInternal(src);
@ -96,7 +96,7 @@ public final class GoogleComputeEngineParserModule extends AbstractModule {
return instance; return instance;
} }
private static class InstanceTemplateInternal extends InstanceTemplate { private static final class InstanceTemplateInternal extends InstanceTemplate {
private InstanceTemplateInternal(InstanceTemplate template) { private InstanceTemplateInternal(InstanceTemplate template) {
machineType(template.machineType()); machineType(template.machineType());
name(template.name()); name(template.name());
@ -108,11 +108,7 @@ public final class GoogleComputeEngineParserModule extends AbstractModule {
} }
} }
private static class MetadataTypeAdapter extends SubtypeAdapterFactory<Metadata> { private static final class MetadataTypeAdapter extends TypeAdapter<Metadata> implements TypeAdapterFactory {
private MetadataTypeAdapter() {
super(Metadata.class);
}
@Override public void write(JsonWriter out, Metadata src) throws IOException { @Override public void write(JsonWriter out, Metadata src) throws IOException {
out.beginObject(); out.beginObject();
@ -167,9 +163,16 @@ public final class GoogleComputeEngineParserModule extends AbstractModule {
in.endObject(); in.endObject();
return Metadata.create(fingerprint, builder.build()); return Metadata.create(fingerprint, builder.build());
} }
@Override public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
if (!(Metadata.class.isAssignableFrom(typeToken.getRawType()))) {
return null;
}
return (TypeAdapter<T>) this;
}
} }
private static class FirewallOptionsTypeAdapter implements JsonSerializer<FirewallOptions> { private static final class FirewallOptionsTypeAdapter implements JsonSerializer<FirewallOptions> {
@Override public JsonElement serialize(FirewallOptions src, Type typeOfSrc, JsonSerializationContext context) { @Override public JsonElement serialize(FirewallOptions src, Type typeOfSrc, JsonSerializationContext context) {
JsonObject firewall = new JsonObject(); JsonObject firewall = new JsonObject();
@ -199,7 +202,7 @@ public final class GoogleComputeEngineParserModule extends AbstractModule {
} }
} }
private static class RouteOptionsTypeAdapter implements JsonSerializer<RouteOptions> { private static final class RouteOptionsTypeAdapter implements JsonSerializer<RouteOptions> {
@Override public JsonElement serialize(RouteOptions src, Type typeOfSrc, JsonSerializationContext context) { @Override public JsonElement serialize(RouteOptions src, Type typeOfSrc, JsonSerializationContext context) {
JsonObject route = new JsonObject(); JsonObject route = new JsonObject();
@ -244,19 +247,4 @@ public final class GoogleComputeEngineParserModule extends AbstractModule {
} }
return array; return array;
} }
private abstract static class SubtypeAdapterFactory<T> extends TypeAdapter<T> implements TypeAdapterFactory {
private final Class<T> baseClass;
private SubtypeAdapterFactory(Class<T> baseClass) {
this.baseClass = baseClass;
}
@Override public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
if (!(baseClass.isAssignableFrom(typeToken.getRawType()))) {
return null;
}
return (TypeAdapter<T>) this;
}
}
} }

9
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/predicates/RegionOperationDonePredicate.java
View File

@ -28,7 +28,6 @@ import org.jclouds.collect.Memoized;
import org.jclouds.googlecomputeengine.GoogleComputeEngineApi; import org.jclouds.googlecomputeengine.GoogleComputeEngineApi;
import org.jclouds.googlecomputeengine.config.UserProject; import org.jclouds.googlecomputeengine.config.UserProject;
import org.jclouds.googlecomputeengine.domain.Operation; import org.jclouds.googlecomputeengine.domain.Operation;
import org.jclouds.googlecomputeengine.domain.Region;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
@ -36,19 +35,19 @@ import com.google.common.base.Supplier;
public final class RegionOperationDonePredicate implements Predicate<AtomicReference<Operation>> { public final class RegionOperationDonePredicate implements Predicate<AtomicReference<Operation>> {
private final GoogleComputeEngineApi api; private final GoogleComputeEngineApi api;
private final Supplier<String> project; private final Supplier<String> project;
private final Supplier<Map<URI, Region>> regions; private final Supplier<Map<URI, String>> selfLinkToName;
@Inject RegionOperationDonePredicate(GoogleComputeEngineApi api, @UserProject Supplier<String> project, @Inject RegionOperationDonePredicate(GoogleComputeEngineApi api, @UserProject Supplier<String> project,
@Memoized Supplier<Map<URI, Region>> regions) { @Memoized Supplier<Map<URI, String>> selfLinkToName) {
this.api = api; this.api = api;
this.project = project; this.project = project;
this.regions = regions; this.selfLinkToName = selfLinkToName;
} }
@Override public boolean apply(AtomicReference<Operation> input) { @Override public boolean apply(AtomicReference<Operation> input) {
checkNotNull(input.get(), "input"); checkNotNull(input.get(), "input");
URI region = checkNotNull(input.get().region(), "region of %s", input.get()); URI region = checkNotNull(input.get().region(), "region of %s", input.get());
String locationId = checkNotNull(regions.get().get(region), "location of %s", region).id(); String locationId = checkNotNull(selfLinkToName.get().get(region), "location of %s", region);
Operation current = api.getRegionOperationApi(project.get(), locationId).get(input.get().name()); Operation current = api.getRegionOperationApi(project.get(), locationId).get(input.get().name());
switch (current.status()) { switch (current.status()) {
case DONE: case DONE:

9
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/predicates/ZoneOperationDonePredicate.java
View File

@ -23,7 +23,6 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.jclouds.collect.Memoized; import org.jclouds.collect.Memoized;
import org.jclouds.domain.Location;
import org.jclouds.googlecomputeengine.GoogleComputeEngineApi; import org.jclouds.googlecomputeengine.GoogleComputeEngineApi;
import org.jclouds.googlecomputeengine.config.UserProject; import org.jclouds.googlecomputeengine.config.UserProject;
import org.jclouds.googlecomputeengine.domain.Operation; import org.jclouds.googlecomputeengine.domain.Operation;
@ -39,19 +38,19 @@ public final class ZoneOperationDonePredicate implements Predicate<AtomicReferen
private final GoogleComputeEngineApi api; private final GoogleComputeEngineApi api;
private final Supplier<String> project; private final Supplier<String> project;
private final Supplier<Map<URI, ? extends Location>> zones; private final Supplier<Map<URI, String>> selfLinkToName;
@Inject ZoneOperationDonePredicate(GoogleComputeEngineApi api, @UserProject Supplier<String> project, @Inject ZoneOperationDonePredicate(GoogleComputeEngineApi api, @UserProject Supplier<String> project,
@Memoized Supplier<Map<URI, ? extends Location>> zones) { @Memoized Supplier<Map<URI, String>> selfLinkToName) {
this.api = api; this.api = api;
this.project = project; this.project = project;
this.zones = zones; this.selfLinkToName = selfLinkToName;
} }
@Override public boolean apply(AtomicReference<Operation> input) { @Override public boolean apply(AtomicReference<Operation> input) {
checkNotNull(input.get(), "input"); checkNotNull(input.get(), "input");
URI zone = checkNotNull(input.get().zone(), "zone of %s", input.get()); URI zone = checkNotNull(input.get().zone(), "zone of %s", input.get());
String locationId = checkNotNull(zones.get().get(zone), "location of %s", zone).getId(); String locationId = checkNotNull(selfLinkToName.get().get(zone), "location of %s", zone);
Operation current = api.getZoneOperationApi(project.get(), locationId).get(input.get().name()); Operation current = api.getZoneOperationApi(project.get(), locationId).get(input.get().name());
switch (current.status()) { switch (current.status()) {
case DONE: case DONE:

22
providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApiMetadataTest.java → providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/GoogleComputeEngineProviderMetadataTest.java
View File

@ -16,27 +16,19 @@
*/ */
package org.jclouds.googlecomputeengine; package org.jclouds.googlecomputeengine;
import static org.jclouds.reflect.Reflection2.typeToken; import org.jclouds.providers.internal.BaseProviderMetadataTest;
import org.jclouds.View;
import org.jclouds.apis.internal.BaseApiMetadataTest;
import org.jclouds.compute.ComputeServiceContext;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableSet;
import com.google.common.reflect.TypeToken;
/** /**
* Tests that GoogleComputeApiMetadata is properly registered in ServiceLoader * Tests that GoogleComputeProviderMetadata is properly registered in ServiceLoader
* <p/> * <p/>
* <pre> * <pre>
* META-INF/services/org.jclouds.apis.ApiMetadata * META-INF/services/org.jclouds.providers.ProviderMetadata
* </pre> * </pre>
*/ */
@Test(groups = "unit", testName = "GoogleComputeApiMetadataTest") @Test(groups = "unit", testName = "GoogleComputeProviderMetadataTest")
public class GoogleComputeEngineApiMetadataTest extends BaseApiMetadataTest { public class GoogleComputeEngineProviderMetadataTest extends BaseProviderMetadataTest {
public GoogleComputeEngineApiMetadataTest() { public GoogleComputeEngineProviderMetadataTest() {
super(new GoogleComputeEngineApiMetadata(), super(new GoogleComputeEngineProviderMetadata(), new GoogleComputeEngineApiMetadata());
ImmutableSet.<TypeToken<? extends View>>of(typeToken(ComputeServiceContext.class)));
} }
} }

236
providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java
View File

@ -16,11 +16,15 @@
*/ */
package org.jclouds.googlecomputeengine.compute; package org.jclouds.googlecomputeengine.compute;
import static com.google.common.base.Throwables.propagate;
import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.collect.Iterables.getOnlyElement;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE; import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;
import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_SCOPE; import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_SCOPE;
import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.GCE_BOOT_DISK_SUFFIX; import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.GCE_BOOT_DISK_SUFFIX;
import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.GCE_IMAGE_PROJECTS; import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.GCE_IMAGE_PROJECTS;
import static org.jclouds.googlecomputeengine.domain.Instance.Status.RUNNING;
import static org.jclouds.googlecomputeengine.domain.Instance.Status.TERMINATED;
import static org.jclouds.googlecomputeengine.features.GlobalOperationApiExpectTest.GET_GLOBAL_OPERATION_REQUEST; import static org.jclouds.googlecomputeengine.features.GlobalOperationApiExpectTest.GET_GLOBAL_OPERATION_REQUEST;
import static org.jclouds.googlecomputeengine.features.GlobalOperationApiExpectTest.GET_GLOBAL_OPERATION_RESPONSE; import static org.jclouds.googlecomputeengine.features.GlobalOperationApiExpectTest.GET_GLOBAL_OPERATION_RESPONSE;
import static org.jclouds.googlecomputeengine.features.ImageApiExpectTest.LIST_CENTOS_IMAGES_REQUEST; import static org.jclouds.googlecomputeengine.features.ImageApiExpectTest.LIST_CENTOS_IMAGES_REQUEST;
@ -40,38 +44,33 @@ import static org.jclouds.googlecomputeengine.features.MachineTypeApiExpectTest.
import static org.jclouds.googlecomputeengine.features.NetworkApiExpectTest.GET_NETWORK_REQUEST; import static org.jclouds.googlecomputeengine.features.NetworkApiExpectTest.GET_NETWORK_REQUEST;
import static org.jclouds.googlecomputeengine.features.ProjectApiExpectTest.GET_PROJECT_REQUEST; import static org.jclouds.googlecomputeengine.features.ProjectApiExpectTest.GET_PROJECT_REQUEST;
import static org.jclouds.googlecomputeengine.features.ProjectApiExpectTest.GET_PROJECT_RESPONSE; import static org.jclouds.googlecomputeengine.features.ProjectApiExpectTest.GET_PROJECT_RESPONSE;
import static org.jclouds.googlecomputeengine.features.ZoneApiExpectTest.LIST_ZONES_REQ; import static org.jclouds.googlecomputeengine.features.RegionApiExpectTest.LIST_REGIONS_REQ;
import static org.jclouds.googlecomputeengine.features.ZoneApiExpectTest.LIST_ZONES_RESPONSE;
import static org.jclouds.googlecomputeengine.features.ZoneApiExpectTest.LIST_ZONES_SHORT_RESPONSE;
import static org.jclouds.googlecomputeengine.features.ZoneOperationApiExpectTest.GET_ZONE_OPERATION_REQUEST; import static org.jclouds.googlecomputeengine.features.ZoneOperationApiExpectTest.GET_ZONE_OPERATION_REQUEST;
import static org.jclouds.googlecomputeengine.features.ZoneOperationApiExpectTest.GET_ZONE_OPERATION_RESPONSE; import static org.jclouds.googlecomputeengine.features.ZoneOperationApiExpectTest.GET_ZONE_OPERATION_RESPONSE;
import static org.jclouds.util.Strings2.toStringAndClose; import static org.jclouds.util.Strings2.toStringAndClose;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import javax.ws.rs.core.MediaType;
import org.jclouds.compute.ComputeService; import org.jclouds.compute.ComputeService;
import org.jclouds.compute.RunNodesException; import org.jclouds.compute.RunNodesException;
import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.Hardware;
import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.Template; import org.jclouds.compute.domain.Template;
import org.jclouds.domain.Location; import org.jclouds.domain.Location;
import org.jclouds.domain.LocationScope;
import org.jclouds.googlecomputeengine.compute.options.GoogleComputeEngineTemplateOptions; import org.jclouds.googlecomputeengine.compute.options.GoogleComputeEngineTemplateOptions;
import org.jclouds.googlecomputeengine.domain.Instance;
import org.jclouds.googlecomputeengine.features.InstanceApiExpectTest; import org.jclouds.googlecomputeengine.features.InstanceApiExpectTest;
import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineServiceExpectTest; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineServiceExpectTest;
import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponse;
import org.jclouds.util.Strings2;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
@ -82,11 +81,11 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
private HttpRequest INSERT_NETWORK_REQUEST = HttpRequest private HttpRequest INSERT_NETWORK_REQUEST = HttpRequest
.builder() .builder()
.method("POST") .method("POST")
.endpoint("https://www.googleapis.com/compute/v1/projects/myproject/global/networks") .endpoint(BASE_URL + "/myproject/global/networks")
.addHeader("Accept", "application/json") .addHeader("Accept", APPLICATION_JSON)
.addHeader("Authorization", "Bearer " + TOKEN) .addHeader("Authorization", "Bearer " + TOKEN)
.payload(payloadFromStringWithContentType("{\"name\":\"jclouds-test\",\"IPv4Range\":\"10.0.0.0/8\"}", .payload(payloadFromStringWithContentType("{\"name\":\"jclouds-test\",\"IPv4Range\":\"10.0.0.0/8\"}",
MediaType.APPLICATION_JSON)) APPLICATION_JSON))
.build(); .build();
private HttpResponse GET_NETWORK_RESPONSE = HttpResponse.builder().statusCode(200) private HttpResponse GET_NETWORK_RESPONSE = HttpResponse.builder().statusCode(200)
@ -100,33 +99,39 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
" \"description\": \"test network\",\n" + " \"description\": \"test network\",\n" +
" \"IPv4Range\": \"10.0.0.0/8\",\n" + " \"IPv4Range\": \"10.0.0.0/8\",\n" +
" \"gatewayIPv4\": \"10.0.0.1\"\n" + " \"gatewayIPv4\": \"10.0.0.1\"\n" +
"}", MediaType.APPLICATION_JSON)).build(); "}", APPLICATION_JSON)).build();
private HttpResponse SUCESSFULL_OPERATION_RESPONSE = HttpResponse.builder().statusCode(200) private HttpResponse SUCCESSFUL_OPERATION_RESPONSE = HttpResponse.builder().statusCode(200)
.payload(payloadFromResource("/operation.json")).build(); .payload(payloadFromResource("/operation.json")).build();
private HttpRequest SET_TAGS_REQUEST = HttpRequest.builder() private HttpRequest SET_TAGS_REQUEST = HttpRequest.builder()
.method("POST") .method("POST")
.endpoint("https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1/setTags") .endpoint(BASE_URL + "/myproject/zones/us-central1-a/instances/test-1/setTags")
.addHeader("Accept", "application/json") .addHeader("Accept", APPLICATION_JSON)
.addHeader("Authorization", "Bearer " + TOKEN) .addHeader("Authorization", "Bearer " + TOKEN)
.payload(payloadFromStringWithContentType("{\"items\":[\"aTag\"],\"fingerprint\":\"abcd\"}", .payload(payloadFromStringWithContentType("{\"items\":[\"aTag\"],\"fingerprint\":\"abcd\"}",
MediaType.APPLICATION_JSON)) APPLICATION_JSON))
.build(); .build();
private HttpResponse SET_TAGS_RESPONSE = HttpResponse.builder().statusCode(200) private HttpResponse SET_TAGS_RESPONSE = HttpResponse.builder().statusCode(200)
.payload(payloadFromResource("/operation.json")).build(); .payload(payloadFromResource("/operation.json")).build();
private HttpResponse getInstanceResponseForInstanceAndNetworkAndStatus(String instanceName, String networkName, private HttpResponse getInstanceResponseForInstanceAndNetworkAndStatus(String instanceName, String networkName,
String status) throws String status) throws IOException {
IOException {
return HttpResponse.builder().statusCode(200) return HttpResponse.builder().statusCode(200)
.payload(payloadFromStringWithContentType( .payload(payloadFromStringWithContentType(
replaceInstanceNameNetworkAndStatusOnResource("/instance_get.json", replaceInstanceNameNetworkAndStatusOnResource("/instance_get.json",
instanceName, networkName, status), instanceName, networkName, status),
"application/json")).build(); APPLICATION_JSON)).build();
} }
/** Reduce work implementing this test, by only using one region, zone! */
private final HttpResponse singleRegionSingleZoneResponse = HttpResponse.builder().statusCode(200).payload(
"{\"items\":[" + payloadFromResource("/region_get.json").getRawContent().toString()
.replace("\"https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-b\"", "")
+ "]}")
.build();
private HttpResponse getListInstancesResponseForSingleInstanceAndNetworkAndStatus(String instanceName, private HttpResponse getListInstancesResponseForSingleInstanceAndNetworkAndStatus(String instanceName,
String networkName, String networkName,
String status) { String status) {
@ -134,32 +139,31 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
.payload(payloadFromStringWithContentType( .payload(payloadFromStringWithContentType(
replaceInstanceNameNetworkAndStatusOnResource("/instance_list.json", replaceInstanceNameNetworkAndStatusOnResource("/instance_list.json",
instanceName, networkName, status), instanceName, networkName, status),
"application/json")).build(); APPLICATION_JSON)).build();
} }
private HttpResponse getDiskResponseForInstance(String instanceName) { private HttpResponse getDiskResponseForInstance(String instanceName) {
return HttpResponse.builder().statusCode(200) return HttpResponse.builder().statusCode(200)
.payload(payloadFromStringWithContentType( .payload(payloadFromStringWithContentType(
replaceDiskNameOnResource("/disk_get.json", instanceName + "-" + GCE_BOOT_DISK_SUFFIX), replaceDiskNameOnResource("/disk_get.json", instanceName + "-" + GCE_BOOT_DISK_SUFFIX),
"application/json")).build(); APPLICATION_JSON)).build();
} }
private String replaceDiskNameOnResource(String resourceName, String diskName) { private String replaceDiskNameOnResource(String resourceName, String diskName) {
try { try {
return Strings2.toStringAndClose(this.getClass().getResourceAsStream(resourceName)) return toStringAndClose(this.getClass().getResourceAsStream(resourceName)).replace("testimage1", diskName);
.replace("testimage1", diskName);
} catch (IOException e) { } catch (IOException e) {
throw Throwables.propagate(e); throw propagate(e);
} }
} }
private String replaceInstanceNameNetworkAndStatusOnResource(String resourceName, String instanceName, private String replaceInstanceNameNetworkAndStatusOnResource(String resourceName, String instanceName,
String networkName, String status) { String networkName, String status) {
try { try {
return Strings2.toStringAndClose(this.getClass().getResourceAsStream(resourceName)).replace("test-0", return toStringAndClose(this.getClass().getResourceAsStream(resourceName)).replace("test-0", instanceName)
instanceName).replace("default", networkName).replace("RUNNING", status); .replace("default", networkName).replace("RUNNING", status);
} catch (IOException e) { } catch (IOException e) {
throw Throwables.propagate(e); throw propagate(e);
} }
} }
@ -167,31 +171,29 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
return HttpRequest return HttpRequest
.builder() .builder()
.method("POST") .method("POST")
.endpoint("https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks") .endpoint(BASE_URL + "/myproject/zones/us-central1-a/disks")
.addHeader("Accept", "application/json") .addHeader("Accept", APPLICATION_JSON)
.addHeader("Authorization", "Bearer " + TOKEN) .addHeader("Authorization", "Bearer " + TOKEN)
.payload(payloadFromStringWithContentType("{\"name\":\"" + instanceName + "-" + GCE_BOOT_DISK_SUFFIX + "\"," .payload(payloadFromStringWithContentType("{\"name\":\"" + instanceName + "-" + GCE_BOOT_DISK_SUFFIX + "\","
+ "\"sizeGb\":10," + "\"sizeGb\":10,"
+ "\"sourceImage\":\"https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140718\"}", + "\"sourceImage\":\"https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140718\"}",
MediaType.APPLICATION_JSON)).build(); APPLICATION_JSON)).build();
} }
private HttpRequest getDiskRequestForInstance(String instanceName) { private HttpRequest getDiskRequestForInstance(String instanceName) {
return HttpRequest return HttpRequest
.builder() .builder()
.method("GET") .method("GET")
.endpoint("https://www.googleapis" + .endpoint(BASE_URL + "/myproject/zones/us-central1-a/disks/" + instanceName + "-" + GCE_BOOT_DISK_SUFFIX)
".com/compute/v1/projects/myproject/zones/us-central1-a/disks/" .addHeader("Accept", APPLICATION_JSON)
+ instanceName + "-" + GCE_BOOT_DISK_SUFFIX)
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build(); .addHeader("Authorization", "Bearer " + TOKEN).build();
} }
private HttpRequest createInstanceRequestForInstance(String instanceName, String groupName, String networkName, private HttpRequest createInstanceRequestForInstance(String instanceName, String groupName, String networkName,
String publicKey) { String publicKey) {
return HttpRequest.builder().method("POST") return HttpRequest.builder().method("POST")
.endpoint("https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances") .endpoint(BASE_URL + "/myproject/zones/us-central1-a/instances")
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).payload( .addHeader("Accept", APPLICATION_JSON).addHeader("Authorization", "Bearer " + TOKEN).payload(
payloadFromStringWithContentType("{\"name\":\"" + instanceName payloadFromStringWithContentType("{\"name\":\"" + instanceName
+ "\",\"machineType\":\"https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/f1-micro\",\"serviceAccounts\":[],\"disks\":[{\"type\":\"PERSISTENT\",\"mode\":\"READ_WRITE\",\"source\":\"https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/" + "\",\"machineType\":\"https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/f1-micro\",\"serviceAccounts\":[],\"disks\":[{\"type\":\"PERSISTENT\",\"mode\":\"READ_WRITE\",\"source\":\"https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/"
+ instanceName + "-" + GCE_BOOT_DISK_SUFFIX + instanceName + "-" + GCE_BOOT_DISK_SUFFIX
@ -200,29 +202,28 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
+ "\",\"accessConfigs\":[{\"type\":\"ONE_TO_ONE_NAT\"}]}],\"metadata\":{\"kind\":\"compute#metadata\",\"items\":[{\"key\":\"sshKeys\",\"value\":\"jclouds:" + "\",\"accessConfigs\":[{\"type\":\"ONE_TO_ONE_NAT\"}]}],\"metadata\":{\"kind\":\"compute#metadata\",\"items\":[{\"key\":\"sshKeys\",\"value\":\"jclouds:"
+ publicKey + " jclouds@localhost\"},{\"key\":\"jclouds-group\",\"value\":\"" + groupName + publicKey + " jclouds@localhost\"},{\"key\":\"jclouds-group\",\"value\":\"" + groupName
+ "\"},{\"key\":\"jclouds-image\",\"value\":\"https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140718\"},{\"key\":\"jclouds-delete-boot-disk\",\"value\":\"true\"}]}}", + "\"},{\"key\":\"jclouds-image\",\"value\":\"https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140718\"},{\"key\":\"jclouds-delete-boot-disk\",\"value\":\"true\"}]}}",
MediaType.APPLICATION_JSON)).build(); APPLICATION_JSON)).build();
} }
private HttpRequest getInstanceRequestForInstance(String instanceName) { private HttpRequest getInstanceRequestForInstance(String instanceName) {
return HttpRequest return HttpRequest
.builder() .builder()
.method("GET") .method("GET")
.endpoint("https://www.googleapis" + .endpoint(BASE_URL + "/myproject/zones/us-central1-a/instances/" + instanceName)
".com/compute/v1/projects/myproject/zones/us-central1-a/instances/" + instanceName) .addHeader("Accept", APPLICATION_JSON)
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build(); .addHeader("Authorization", "Bearer " + TOKEN).build();
} }
@Override @Override
protected Properties setupProperties() { protected Properties setupProperties() {
Properties overrides = super.setupProperties(); Properties overrides = super.setupProperties();
overrides.put("google-compute-engine.identity", "myproject"); overrides.put("google-compute-engine.identity", "myproject");
overrides.put(GCE_IMAGE_PROJECTS, "debian-cloud,centos-cloud"); overrides.put(GCE_IMAGE_PROJECTS, "debian-cloud,centos-cloud");
try { try {
overrides.put("google-compute-engine.credential", toStringAndClose(getClass().getResourceAsStream("/testpk.pem"))); overrides.put("google-compute-engine.credential",
toStringAndClose(this.getClass().getResourceAsStream("/testpk.pem")));
} catch (IOException e) { } catch (IOException e) {
Throwables.propagate(e); propagate(e);
} }
return overrides; return overrides;
} }
@ -247,7 +248,7 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
<HttpRequest, HttpResponse>builder() <HttpRequest, HttpResponse>builder()
.put(requestForScopes(COMPUTE_READONLY_SCOPE), TOKEN_RESPONSE) .put(requestForScopes(COMPUTE_READONLY_SCOPE), TOKEN_RESPONSE)
.put(GET_PROJECT_REQUEST, GET_PROJECT_RESPONSE) .put(GET_PROJECT_REQUEST, GET_PROJECT_RESPONSE)
.put(LIST_ZONES_REQ, LIST_ZONES_RESPONSE) .put(LIST_REGIONS_REQ, singleRegionSingleZoneResponse)
.put(LIST_PROJECT_IMAGES_REQUEST, LIST_PROJECT_IMAGES_RESPONSE) .put(LIST_PROJECT_IMAGES_REQUEST, LIST_PROJECT_IMAGES_RESPONSE)
.put(LIST_DEBIAN_IMAGES_REQUEST, LIST_DEBIAN_IMAGES_RESPONSE) .put(LIST_DEBIAN_IMAGES_REQUEST, LIST_DEBIAN_IMAGES_RESPONSE)
.put(LIST_CENTOS_IMAGES_REQUEST, LIST_CENTOS_IMAGES_RESPONSE) .put(LIST_CENTOS_IMAGES_REQUEST, LIST_CENTOS_IMAGES_RESPONSE)
@ -265,7 +266,7 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
Hardware fastest = client.templateBuilder().fastest().build().getHardware(); Hardware fastest = client.templateBuilder().fastest().build().getHardware();
assertNotNull(fastest); assertNotNull(fastest);
assertEquals(client.listHardwareProfiles().size(), 5); assertEquals(client.listHardwareProfiles().size(), 3);
Template toMatch = client.templateBuilder() Template toMatch = client.templateBuilder()
.imageId(template.getImage().getId()) .imageId(template.getImage().getId())
@ -278,23 +279,20 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
HttpRequest deleteNodeRequest = HttpRequest.builder() HttpRequest deleteNodeRequest = HttpRequest.builder()
.method("DELETE") .method("DELETE")
.endpoint("https://www.googleapis" + .endpoint(BASE_URL + "/myproject/zones/us-central1-a/instances/test-delete-networks")
".com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-delete-networks") .addHeader("Accept", APPLICATION_JSON)
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build(); .addHeader("Authorization", "Bearer " + TOKEN).build();
HttpRequest deleteFirewallRequest = HttpRequest.builder() HttpRequest deleteFirewallRequest = HttpRequest.builder()
.method("DELETE") .method("DELETE")
.endpoint("https://www.googleapis" + .endpoint(BASE_URL + "/myproject/global/firewalls/jclouds-test-delete")
".com/compute/v1/projects/myproject/global/firewalls/jclouds-test-delete") .addHeader("Accept", APPLICATION_JSON)
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build(); .addHeader("Authorization", "Bearer " + TOKEN).build();
HttpRequest getNetworkRequest = HttpRequest.builder() HttpRequest getNetworkRequest = HttpRequest.builder()
.method("GET") .method("GET")
.endpoint("https://www.googleapis" + .endpoint(BASE_URL + "/myproject/global/networks/jclouds-test-delete")
".com/compute/v1/projects/myproject/global/networks/jclouds-test-delete") .addHeader("Accept", APPLICATION_JSON)
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build(); .addHeader("Authorization", "Bearer " + TOKEN).build();
HttpResponse getNetworkResponse = HttpResponse.builder().statusCode(200) HttpResponse getNetworkResponse = HttpResponse.builder().statusCode(200)
@ -302,9 +300,8 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
HttpRequest listFirewallsRequest = HttpRequest.builder() HttpRequest listFirewallsRequest = HttpRequest.builder()
.method("GET") .method("GET")
.endpoint("https://www.googleapis" + .endpoint(BASE_URL + "/myproject/global/firewalls")
".com/compute/v1/projects/myproject/global/firewalls") .addHeader("Accept", APPLICATION_JSON)
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build(); .addHeader("Authorization", "Bearer " + TOKEN).build();
HttpResponse listFirewallsResponse = HttpResponse.builder().statusCode(200) HttpResponse listFirewallsResponse = HttpResponse.builder().statusCode(200)
@ -312,23 +309,21 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
HttpRequest deleteNetworkReqquest = HttpRequest.builder() HttpRequest deleteNetworkReqquest = HttpRequest.builder()
.method("DELETE") .method("DELETE")
.endpoint("https://www.googleapis" + .endpoint(BASE_URL + "/myproject/global/networks/jclouds-test-delete")
".com/compute/v1/projects/myproject/global/networks/jclouds-test-delete") .addHeader("Accept", APPLICATION_JSON)
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build(); .addHeader("Authorization", "Bearer " + TOKEN).build();
HttpRequest deleteDiskRequest = HttpRequest.builder() HttpRequest deleteDiskRequest = HttpRequest.builder()
.method("DELETE") .method("DELETE")
.endpoint("https://www.googleapis" + .endpoint(BASE_URL + "/myproject/zones/us-central1-a/disks/test")
".com/compute/v1/projects/myproject/zones/us-central1-a/disks/test") .addHeader("Accept", APPLICATION_JSON)
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build(); .addHeader("Authorization", "Bearer " + TOKEN).build();
List<HttpRequest> orderedRequests = ImmutableList.<HttpRequest>builder() List<HttpRequest> orderedRequests = ImmutableList.<HttpRequest>builder()
.add(requestForScopes(COMPUTE_READONLY_SCOPE)) .add(requestForScopes(COMPUTE_READONLY_SCOPE))
.add(GET_PROJECT_REQUEST) .add(GET_PROJECT_REQUEST)
.add(getInstanceRequestForInstance("test-delete-networks")) .add(getInstanceRequestForInstance("test-delete-networks"))
.add(LIST_ZONES_REQ) .add(LIST_REGIONS_REQ)
.add(LIST_MACHINE_TYPES_REQUEST) .add(LIST_MACHINE_TYPES_REQUEST)
.add(LIST_PROJECT_IMAGES_REQUEST) .add(LIST_PROJECT_IMAGES_REQUEST)
.add(LIST_DEBIAN_IMAGES_REQUEST) .add(LIST_DEBIAN_IMAGES_REQUEST)
@ -349,49 +344,72 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
.add(GET_GLOBAL_OPERATION_REQUEST) .add(GET_GLOBAL_OPERATION_REQUEST)
.build(); .build();
List<HttpResponse> orderedResponses = ImmutableList.<HttpResponse>builder() List<HttpResponse> orderedResponses = ImmutableList.<HttpResponse>builder()
.add(TOKEN_RESPONSE) .add(TOKEN_RESPONSE)
.add(GET_PROJECT_RESPONSE) .add(GET_PROJECT_RESPONSE)
.add(getInstanceResponseForInstanceAndNetworkAndStatus("test-delete-networks", "test-network", Instance .add(getInstanceResponseForInstanceAndNetworkAndStatus("test-delete-networks", "test-network", RUNNING.name()))
.Status.RUNNING.name())) .add(singleRegionSingleZoneResponse)
.add(LIST_ZONES_SHORT_RESPONSE)
.add(LIST_MACHINE_TYPES_RESPONSE) .add(LIST_MACHINE_TYPES_RESPONSE)
.add(LIST_PROJECT_IMAGES_RESPONSE) .add(LIST_PROJECT_IMAGES_RESPONSE)
.add(LIST_DEBIAN_IMAGES_RESPONSE) .add(LIST_DEBIAN_IMAGES_RESPONSE)
.add(LIST_CENTOS_IMAGES_RESPONSE) .add(LIST_CENTOS_IMAGES_RESPONSE)
.add(getInstanceResponseForInstanceAndNetworkAndStatus("test-delete-networks", "test-network", Instance .add(getInstanceResponseForInstanceAndNetworkAndStatus("test-delete-networks", "test-network", RUNNING.name()))
.Status.RUNNING.name()))
.add(TOKEN_RESPONSE) .add(TOKEN_RESPONSE)
.add(SUCESSFULL_OPERATION_RESPONSE) .add(SUCCESSFUL_OPERATION_RESPONSE)
.add(GET_ZONE_OPERATION_RESPONSE) .add(GET_ZONE_OPERATION_RESPONSE)
.add(SUCESSFULL_OPERATION_RESPONSE) .add(SUCCESSFUL_OPERATION_RESPONSE)
.add(GET_ZONE_OPERATION_RESPONSE) .add(GET_ZONE_OPERATION_RESPONSE)
.add(getInstanceResponseForInstanceAndNetworkAndStatus("test-delete-networks", "test-network", Instance .add(getInstanceResponseForInstanceAndNetworkAndStatus("test-delete-networks", "test-network", TERMINATED.name()))
.Status.TERMINATED.name()))
.add(getListInstancesResponseForSingleInstanceAndNetworkAndStatus("test-delete-networks", .add(getListInstancesResponseForSingleInstanceAndNetworkAndStatus("test-delete-networks",
"test-network", Instance "test-network", TERMINATED.name()))
.Status.TERMINATED.name()))
.add(getNetworkResponse) .add(getNetworkResponse)
.add(listFirewallsResponse) .add(listFirewallsResponse)
.add(SUCESSFULL_OPERATION_RESPONSE) .add(SUCCESSFUL_OPERATION_RESPONSE)
.add(GET_GLOBAL_OPERATION_RESPONSE) .add(GET_GLOBAL_OPERATION_RESPONSE)
.add(SUCESSFULL_OPERATION_RESPONSE) .add(SUCCESSFUL_OPERATION_RESPONSE)
.add(GET_GLOBAL_OPERATION_RESPONSE) .add(GET_GLOBAL_OPERATION_RESPONSE)
.build(); .build();
ComputeService client = orderedRequestsSendResponses(orderedRequests, orderedResponses); ComputeService client = orderedRequestsSendResponses(orderedRequests, orderedResponses);
client.destroyNode("us-central1-a/test-delete-networks"); client.destroyNode("us-central1-a/test-delete-networks");
} }
public void testListLocationsWhenResponseIs2xx() throws Exception { public void listAssignableLocations() throws Exception {
ImmutableMap<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap. ImmutableMap<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.
<HttpRequest, HttpResponse>builder() <HttpRequest, HttpResponse>builder()
.put(requestForScopes(COMPUTE_READONLY_SCOPE), TOKEN_RESPONSE) .put(requestForScopes(COMPUTE_READONLY_SCOPE), TOKEN_RESPONSE)
.put(GET_PROJECT_REQUEST, GET_PROJECT_RESPONSE) .put(GET_PROJECT_REQUEST, GET_PROJECT_RESPONSE)
.put(LIST_ZONES_REQ, LIST_ZONES_RESPONSE) .put(LIST_REGIONS_REQ, singleRegionSingleZoneResponse)
.build();
ComputeService apiWhenServersExist = requestsSendResponses(requestResponseMap);
Set<? extends Location> locations = apiWhenServersExist.listAssignableLocations();
assertNotNull(locations);
assertEquals(locations.size(), 1);
Location firstZone = locations.iterator().next();
assertEquals(firstZone.getId(), "us-central1-a");
assertEquals(firstZone.getDescription(), "us-central1-a");
assertEquals(firstZone.getScope(), LocationScope.ZONE);
assertEquals(firstZone.getParent().getId(), "us-central1");
assertEquals(firstZone.getParent().getDescription(), "us-central1");
assertEquals(firstZone.getParent().getScope(), LocationScope.REGION);
// Google intentionally does not document locations!
assertTrue(firstZone.getIso3166Codes().isEmpty());
assertTrue(firstZone.getParent().getIso3166Codes().isEmpty());
}
public void listNodes() throws Exception {
ImmutableMap<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.
<HttpRequest, HttpResponse>builder()
.put(requestForScopes(COMPUTE_READONLY_SCOPE), TOKEN_RESPONSE)
.put(GET_PROJECT_REQUEST, GET_PROJECT_RESPONSE)
.put(LIST_REGIONS_REQ, singleRegionSingleZoneResponse)
.put(LIST_INSTANCES_REQUEST, LIST_INSTANCES_RESPONSE) .put(LIST_INSTANCES_REQUEST, LIST_INSTANCES_RESPONSE)
.put(LIST_CENTRAL1B_INSTANCES_REQUEST, LIST_CENTRAL1B_INSTANCES_RESPONSE) .put(LIST_CENTRAL1B_INSTANCES_REQUEST, LIST_CENTRAL1B_INSTANCES_RESPONSE)
.put(LIST_PROJECT_IMAGES_REQUEST, LIST_PROJECT_IMAGES_RESPONSE) .put(LIST_PROJECT_IMAGES_REQUEST, LIST_PROJECT_IMAGES_RESPONSE)
@ -403,66 +421,58 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
ComputeService apiWhenServersExist = requestsSendResponses(requestResponseMap); ComputeService apiWhenServersExist = requestsSendResponses(requestResponseMap);
Set<? extends Location> locations = apiWhenServersExist.listAssignableLocations();
assertNotNull(locations);
assertEquals(locations.size(), 2);
assertEquals(locations.iterator().next().getId(), "us-central1-a");
assertNotNull(apiWhenServersExist.listNodes()); assertNotNull(apiWhenServersExist.listNodes());
assertEquals(apiWhenServersExist.listNodes().size(), 1); assertEquals(apiWhenServersExist.listNodes().size(), 1);
assertEquals(apiWhenServersExist.listNodes().iterator().next().getId(), "us-central1-a/test-0"); assertEquals(apiWhenServersExist.listNodes().iterator().next().getId(), "us-central1-a/test-0");
assertEquals(apiWhenServersExist.listNodes().iterator().next().getName(), "test-0"); assertEquals(apiWhenServersExist.listNodes().iterator().next().getName(), "test-0");
} }
@Test(dependsOnMethods = "testListLocationsWhenResponseIs2xx") @Test
public void testCreateNodeWhenNetworkNorFirewallExistDoesNotExist() throws RunNodesException, IOException { public void testCreateNodeWhenNetworkNorFirewallExistDoesNotExist() throws RunNodesException, IOException {
String payload = Strings2.toStringAndClose(InstanceApiExpectTest.class.getResourceAsStream("/instance_get.json")); String payload = toStringAndClose(InstanceApiExpectTest.class.getResourceAsStream("/instance_get.json"));
payload = payload.replace("test-0", "test-1"); payload = payload.replace("test-0", "test-1");
HttpResponse getInstanceResponse = HttpResponse.builder().statusCode(200) HttpResponse getInstanceResponse = HttpResponse.builder().statusCode(200)
.payload(payloadFromStringWithContentType(payload, "application/json")).build(); .payload(payloadFromStringWithContentType(payload, APPLICATION_JSON)).build();
HttpRequest getFirewallRequest = HttpRequest HttpRequest getFirewallRequest = HttpRequest
.builder() .builder()
.method("GET") .method("GET")
.endpoint("https://www.googleapis" + .endpoint(BASE_URL + "/myproject/global/firewalls/jclouds-test-port-22")
".com/compute/v1/projects/myproject/global/firewalls/jclouds-test-port-22") .addHeader("Accept", APPLICATION_JSON)
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build(); .addHeader("Authorization", "Bearer " + TOKEN).build();
HttpRequest insertFirewallRequest = HttpRequest HttpRequest insertFirewallRequest = HttpRequest
.builder() .builder()
.method("POST") .method("POST")
.endpoint("https://www.googleapis.com/compute/v1/projects/myproject/global/firewalls") .endpoint(BASE_URL + "/myproject/global/firewalls")
.addHeader("Accept", "application/json") .addHeader("Accept", APPLICATION_JSON)
.addHeader("Authorization", "Bearer " + TOKEN) .addHeader("Authorization", "Bearer " + TOKEN)
.payload(payloadFromStringWithContentType("{\"name\":\"jclouds-test-port-22\",\"network\":\"https://www.googleapis" + .payload(payloadFromStringWithContentType("{\"name\":\"jclouds-test-port-22\",\"network\":\"https://www.googleapis" +
".com/compute/v1/projects/myproject/global/networks/jclouds-test\"," + ".com/compute/v1/projects/myproject/global/networks/jclouds-test\"," +
"\"sourceRanges\":[\"10.0.0.0/8\",\"0.0.0.0/0\"],\"sourceTags\":[\"aTag\"],\"targetTags\":[\"jclouds-test-port-22\"],\"allowed\":[{\"IPProtocol\":\"tcp\"," + "\"sourceRanges\":[\"10.0.0.0/8\",\"0.0.0.0/0\"],\"sourceTags\":[\"aTag\"],\"targetTags\":[\"jclouds-test-port-22\"],\"allowed\":[{\"IPProtocol\":\"tcp\"," +
"\"ports\":[\"22\"]}," + "\"ports\":[\"22\"]}," +
"{\"IPProtocol\":\"udp\",\"ports\":[\"22\"]}]}", "{\"IPProtocol\":\"udp\",\"ports\":[\"22\"]}]}",
MediaType.APPLICATION_JSON)) APPLICATION_JSON))
.build(); .build();
HttpRequest setTagsRequest = HttpRequest HttpRequest setTagsRequest = HttpRequest
.builder() .builder()
.method("POST") .method("POST")
.endpoint("https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-1/setTags") .endpoint(BASE_URL + "/myproject/zones/us-central1-a/instances/test-1/setTags")
.addHeader("Accept", "application/json") .addHeader("Accept", APPLICATION_JSON)
.addHeader("Authorization", "Bearer " + TOKEN) .addHeader("Authorization", "Bearer " + TOKEN)
.payload(payloadFromStringWithContentType("{\"items\":[\"jclouds-test-port-22\"],\"fingerprint\":\"abcd\"}", .payload(payloadFromStringWithContentType("{\"items\":[\"jclouds-test-port-22\"],\"fingerprint\":\"abcd\"}",
MediaType.APPLICATION_JSON)) APPLICATION_JSON))
.build(); .build();
List<HttpRequest> orderedRequests = ImmutableList.<HttpRequest>builder() List<HttpRequest> orderedRequests = ImmutableList.<HttpRequest>builder()
.add(requestForScopes(COMPUTE_READONLY_SCOPE)) .add(requestForScopes(COMPUTE_READONLY_SCOPE))
.add(GET_PROJECT_REQUEST) .add(GET_PROJECT_REQUEST)
.add(LIST_ZONES_REQ) .add(LIST_REGIONS_REQ)
.add(LIST_PROJECT_IMAGES_REQUEST) .add(LIST_PROJECT_IMAGES_REQUEST)
.add(LIST_DEBIAN_IMAGES_REQUEST) .add(LIST_DEBIAN_IMAGES_REQUEST)
.add(LIST_CENTOS_IMAGES_REQUEST) .add(LIST_CENTOS_IMAGES_REQUEST)
.add(LIST_ZONES_REQ)
.add(LIST_MACHINE_TYPES_REQUEST) .add(LIST_MACHINE_TYPES_REQUEST)
.add(GET_NETWORK_REQUEST) .add(GET_NETWORK_REQUEST)
.add(GET_NETWORK_REQUEST) .add(GET_NETWORK_REQUEST)
@ -474,10 +484,6 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
.add(insertFirewallRequest) .add(insertFirewallRequest)
.add(GET_GLOBAL_OPERATION_REQUEST) .add(GET_GLOBAL_OPERATION_REQUEST)
.add(LIST_INSTANCES_REQUEST) .add(LIST_INSTANCES_REQUEST)
.add(LIST_MACHINE_TYPES_REQUEST)
.add(LIST_PROJECT_IMAGES_REQUEST)
.add(LIST_DEBIAN_IMAGES_REQUEST)
.add(LIST_CENTOS_IMAGES_REQUEST)
.add(createDiskRequestForInstance("test-1")) .add(createDiskRequestForInstance("test-1"))
.add(GET_ZONE_OPERATION_REQUEST) .add(GET_ZONE_OPERATION_REQUEST)
.add(getDiskRequestForInstance("test-1")) .add(getDiskRequestForInstance("test-1"))
@ -497,43 +503,37 @@ public class GoogleComputeEngineServiceExpectTest extends BaseGoogleComputeEngin
List<HttpResponse> orderedResponses = ImmutableList.<HttpResponse>builder() List<HttpResponse> orderedResponses = ImmutableList.<HttpResponse>builder()
.add(TOKEN_RESPONSE) .add(TOKEN_RESPONSE)
.add(GET_PROJECT_RESPONSE) .add(GET_PROJECT_RESPONSE)
.add(LIST_ZONES_SHORT_RESPONSE) .add(singleRegionSingleZoneResponse)
.add(LIST_PROJECT_IMAGES_RESPONSE) .add(LIST_PROJECT_IMAGES_RESPONSE)
.add(LIST_DEBIAN_IMAGES_RESPONSE) .add(LIST_DEBIAN_IMAGES_RESPONSE)
.add(LIST_CENTOS_IMAGES_RESPONSE) .add(LIST_CENTOS_IMAGES_RESPONSE)
.add(LIST_ZONES_SHORT_RESPONSE)
.add(LIST_MACHINE_TYPES_RESPONSE) .add(LIST_MACHINE_TYPES_RESPONSE)
.add(HttpResponse.builder().statusCode(404).build()) .add(HttpResponse.builder().statusCode(404).build())
.add(HttpResponse.builder().statusCode(404).build()) .add(HttpResponse.builder().statusCode(404).build())
.add(TOKEN_RESPONSE) .add(TOKEN_RESPONSE)
.add(SUCESSFULL_OPERATION_RESPONSE) .add(SUCCESSFUL_OPERATION_RESPONSE)
.add(GET_GLOBAL_OPERATION_RESPONSE) .add(GET_GLOBAL_OPERATION_RESPONSE)
.add(GET_NETWORK_RESPONSE) .add(GET_NETWORK_RESPONSE)
.add(HttpResponse.builder().statusCode(404).build()) .add(HttpResponse.builder().statusCode(404).build())
.add(SUCESSFULL_OPERATION_RESPONSE) .add(SUCCESSFUL_OPERATION_RESPONSE)
.add(GET_GLOBAL_OPERATION_RESPONSE) .add(GET_GLOBAL_OPERATION_RESPONSE)
.add(LIST_INSTANCES_RESPONSE) .add(LIST_INSTANCES_RESPONSE)
.add(LIST_MACHINE_TYPES_RESPONSE) .add(SUCCESSFUL_OPERATION_RESPONSE)
.add(LIST_PROJECT_IMAGES_RESPONSE)
.add(LIST_DEBIAN_IMAGES_RESPONSE)
.add(LIST_CENTOS_IMAGES_RESPONSE)
.add(SUCESSFULL_OPERATION_RESPONSE)
.add(GET_ZONE_OPERATION_RESPONSE) .add(GET_ZONE_OPERATION_RESPONSE)
.add(getDiskResponseForInstance("test-1")) .add(getDiskResponseForInstance("test-1"))
.add(SUCESSFULL_OPERATION_RESPONSE) .add(SUCCESSFUL_OPERATION_RESPONSE)
.add(GET_ZONE_OPERATION_RESPONSE) .add(GET_ZONE_OPERATION_RESPONSE)
.add(getInstanceResponse) .add(getInstanceResponse)
.add(SET_TAGS_RESPONSE) .add(SET_TAGS_RESPONSE)
.add(GET_ZONE_OPERATION_RESPONSE) .add(GET_ZONE_OPERATION_RESPONSE)
.add(getInstanceResponse) .add(getInstanceResponse)
.add(SUCESSFULL_OPERATION_RESPONSE) .add(SUCCESSFUL_OPERATION_RESPONSE)
.add(LIST_PROJECT_IMAGES_RESPONSE) .add(LIST_PROJECT_IMAGES_RESPONSE)
.add(LIST_DEBIAN_IMAGES_RESPONSE) .add(LIST_DEBIAN_IMAGES_RESPONSE)
.add(LIST_CENTOS_IMAGES_RESPONSE) .add(LIST_CENTOS_IMAGES_RESPONSE)
.add(SUCESSFULL_OPERATION_RESPONSE) .add(SUCCESSFUL_OPERATION_RESPONSE)
.build(); .build();
ComputeService computeService = orderedRequestsSendResponses(orderedRequests, orderedResponses); ComputeService computeService = orderedRequestsSendResponses(orderedRequests, orderedResponses);
GoogleComputeEngineTemplateOptions options = computeService.templateOptions().as(GoogleComputeEngineTemplateOptions.class); GoogleComputeEngineTemplateOptions options = computeService.templateOptions().as(GoogleComputeEngineTemplateOptions.class);

12
providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/InstanceInZoneToNodeMetadataTest.java
View File

@ -157,9 +157,9 @@ public class InstanceInZoneToNodeMetadataTest {
private InstanceInZoneToNodeMetadata createNodeParser(final Set<Hardware> hardware, final Set<Image> images, private InstanceInZoneToNodeMetadata createNodeParser(final Set<Hardware> hardware, final Set<Image> images,
final Set<Location> locations, final String groupName) { final Set<Location> locations, final String groupName) {
Supplier<Map<URI, ? extends Location>> locationSupplier = new Supplier<Map<URI, ? extends Location>>() { Supplier<Map<URI, Location>> locationSupplier = new Supplier<Map<URI, Location>>() {
@Override @Override
public Map<URI, ? extends Location> get() { public Map<URI, Location> get() {
return Maps.uniqueIndex(locations, new Function<Location, URI>() { return Maps.uniqueIndex(locations, new Function<Location, URI>() {
@Override @Override
public URI apply(final Location input) { public URI apply(final Location input) {
@ -169,9 +169,9 @@ public class InstanceInZoneToNodeMetadataTest {
} }
}; };
Supplier<Map<URI, ? extends Hardware>> hardwareSupplier = new Supplier<Map<URI, ? extends Hardware>>() { Supplier<Map<URI, Hardware>> hardwareSupplier = new Supplier<Map<URI, Hardware>>() {
@Override @Override
public Map<URI, ? extends Hardware> get() { public Map<URI, Hardware> get() {
return Maps.uniqueIndex(hardware, new Function<Hardware, URI>() { return Maps.uniqueIndex(hardware, new Function<Hardware, URI>() {
@Override @Override
public URI apply(final Hardware input) { public URI apply(final Hardware input) {
@ -181,9 +181,9 @@ public class InstanceInZoneToNodeMetadataTest {
} }
}; };
Supplier<Map<URI, ? extends Image>> imageSupplier = new Supplier<Map<URI, ? extends Image>>() { Supplier<Map<URI, Image>> imageSupplier = new Supplier<Map<URI, Image>>() {
@Override @Override
public Map<URI, ? extends Image> get() { public Map<URI, Image> get() {
return Maps.uniqueIndex(images, new Function<Image, URI>() { return Maps.uniqueIndex(images, new Function<Image, URI>() {
@Override @Override
public URI apply(final Image input) { public URI apply(final Image input) {

18
providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/OrphanedGroupsFromDeadNodesTest.java
View File

@ -51,13 +51,13 @@ public class OrphanedGroupsFromDeadNodesTest {
@Test @Test
public void testDetectsAllOrphanedGroupsWhenAllNodesTerminated() { public void testDetectsAllOrphanedGroupsWhenAllNodesTerminated() {
Set<? extends NodeMetadata> deadNodesGroup1 = (Set) ImmutableSet.builder() Set<NodeMetadata> deadNodesGroup1 = (Set) ImmutableSet.builder()
.add(new IdAndGroupOnlyNodeMetadata("a", "1", NodeMetadata.Status.TERMINATED)).build(); .add(new IdAndGroupOnlyNodeMetadata("a", "1", NodeMetadata.Status.TERMINATED)).build();
Set<? extends NodeMetadata> deadNodesGroup2 = (Set) ImmutableSet.builder() Set<NodeMetadata> deadNodesGroup2 = (Set) ImmutableSet.builder()
.add(new IdAndGroupOnlyNodeMetadata("b", "2", NodeMetadata.Status.TERMINATED)).build(); .add(new IdAndGroupOnlyNodeMetadata("b", "2", NodeMetadata.Status.TERMINATED)).build();
Set<? extends NodeMetadata> allDeadNodes = Sets.union(deadNodesGroup1, deadNodesGroup2); Set<NodeMetadata> allDeadNodes = Sets.union(deadNodesGroup1, deadNodesGroup2);
ComputeService mock = createMock(ComputeService.class); ComputeService mock = createMock(ComputeService.class);
expect(mock.listNodesDetailsMatching(EasyMock.<Predicate<ComputeMetadata>>anyObject())) expect(mock.listNodesDetailsMatching(EasyMock.<Predicate<ComputeMetadata>>anyObject()))
@ -80,13 +80,13 @@ public class OrphanedGroupsFromDeadNodesTest {
@Test @Test
public void testDetectsAllOrphanedGroupsWhenSomeNodesTerminatedAndOtherMissing() { public void testDetectsAllOrphanedGroupsWhenSomeNodesTerminatedAndOtherMissing() {
Set<? extends NodeMetadata> deadNodesGroup1 = (Set) ImmutableSet.builder() Set<NodeMetadata> deadNodesGroup1 = (Set) ImmutableSet.builder()
.add(new IdAndGroupOnlyNodeMetadata("a", "1", NodeMetadata.Status.TERMINATED)).build(); .add(new IdAndGroupOnlyNodeMetadata("a", "1", NodeMetadata.Status.TERMINATED)).build();
Set<? extends NodeMetadata> deadNodesGroup2 = (Set) ImmutableSet.builder() Set<NodeMetadata> deadNodesGroup2 = (Set) ImmutableSet.builder()
.add(new IdAndGroupOnlyNodeMetadata("b", "2", NodeMetadata.Status.TERMINATED)).build(); .add(new IdAndGroupOnlyNodeMetadata("b", "2", NodeMetadata.Status.TERMINATED)).build();
Set<? extends NodeMetadata> allDeadNodes = Sets.union(deadNodesGroup1, deadNodesGroup2); Set<NodeMetadata> allDeadNodes = Sets.union(deadNodesGroup1, deadNodesGroup2);
ComputeService mock = createMock(ComputeService.class); ComputeService mock = createMock(ComputeService.class);
expect(mock.listNodesDetailsMatching(EasyMock.<Predicate<ComputeMetadata>>anyObject())) expect(mock.listNodesDetailsMatching(EasyMock.<Predicate<ComputeMetadata>>anyObject()))
@ -109,13 +109,13 @@ public class OrphanedGroupsFromDeadNodesTest {
@Test @Test
public void testDetectsAllOrphanedGroupsWhenSomeNodesAreAlive() { public void testDetectsAllOrphanedGroupsWhenSomeNodesAreAlive() {
Set<? extends NodeMetadata> deadNodesGroup1 = (Set) ImmutableSet.builder() Set<NodeMetadata> deadNodesGroup1 = (Set) ImmutableSet.builder()
.add(new IdAndGroupOnlyNodeMetadata("a", "1", NodeMetadata.Status.TERMINATED)).build(); .add(new IdAndGroupOnlyNodeMetadata("a", "1", NodeMetadata.Status.TERMINATED)).build();
Set<? extends NodeMetadata> deadNodesGroup2 = (Set) ImmutableSet.builder() Set<NodeMetadata> deadNodesGroup2 = (Set) ImmutableSet.builder()
.add(new IdAndGroupOnlyNodeMetadata("b", "2", NodeMetadata.Status.RUNNING)).build(); .add(new IdAndGroupOnlyNodeMetadata("b", "2", NodeMetadata.Status.RUNNING)).build();
Set<? extends NodeMetadata> allDeadNodes = Sets.union(deadNodesGroup1, deadNodesGroup2); Set<NodeMetadata> allDeadNodes = Sets.union(deadNodesGroup1, deadNodesGroup2);
ComputeService mock = createMock(ComputeService.class); ComputeService mock = createMock(ComputeService.class);
expect(mock.listNodesDetailsMatching(EasyMock.<Predicate<ComputeMetadata>>anyObject())) expect(mock.listNodesDetailsMatching(EasyMock.<Predicate<ComputeMetadata>>anyObject()))

1
providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java
View File

@ -232,5 +232,4 @@ public class InstanceApiLiveTest extends BaseGoogleComputeEngineApiLiveTest {
// we don't really care about any exception here, so just delete away. // we don't really care about any exception here, so just delete away.
} }
} }
} }

5
providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/RegionApiExpectTest.java
View File

@ -51,16 +51,13 @@ public class RegionApiExpectTest extends BaseGoogleComputeEngineApiExpectTest {
.payload(staticPayloadFromResource("/region_list.json")).build(); .payload(staticPayloadFromResource("/region_list.json")).build();
public void testGetRegionResponseIs2xx() throws Exception { public void testGetRegionResponseIs2xx() throws Exception {
HttpResponse operationResponse = HttpResponse.builder().statusCode(200) HttpResponse operationResponse = HttpResponse.builder().statusCode(200)
.payload(payloadFromResource("/region_get.json")).build(); .payload(payloadFromResource("/region_get.json")).build();
RegionApi api = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE), RegionApi api = requestsSendResponses(requestForScopes(COMPUTE_READONLY_SCOPE),
TOKEN_RESPONSE, GET_REGION_REQ, operationResponse).getRegionApi("myproject"); TOKEN_RESPONSE, GET_REGION_REQ, operationResponse).getRegionApi("myproject");
assertEquals(api.get("us-central1"), assertEquals(api.get("us-central1"), new ParseRegionTest().expected());
new ParseRegionTest().expected());
} }
public void testGetRegionResponseIs4xx() throws Exception { public void testGetRegionResponseIs4xx() throws Exception {

50
providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineExpectTest.java
View File

@ -45,14 +45,14 @@ import java.util.concurrent.atomic.AtomicInteger;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import org.jclouds.apis.ApiMetadata;
import org.jclouds.crypto.Crypto; import org.jclouds.crypto.Crypto;
import org.jclouds.googlecomputeengine.GoogleComputeEngineApiMetadata; import org.jclouds.googlecomputeengine.GoogleComputeEngineProviderMetadata;
import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponse;
import org.jclouds.io.Payload; import org.jclouds.io.Payload;
import org.jclouds.oauth.v2.OAuthConstants; import org.jclouds.oauth.v2.OAuthConstants;
import org.jclouds.oauth.v2.config.OAuthProperties; import org.jclouds.oauth.v2.config.OAuthProperties;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.rest.internal.BaseRestApiExpectTest; import org.jclouds.rest.internal.BaseRestApiExpectTest;
import org.jclouds.ssh.SshKeys; import org.jclouds.ssh.SshKeys;
@ -85,35 +85,41 @@ public class BaseGoogleComputeEngineExpectTest<T> extends BaseRestApiExpectTest<
" \"expires_in\" : 3600\n" + " \"expires_in\" : 3600\n" +
"}")).build(); "}")).build();
protected String openSshKey; private final KeyPair keyPair;
protected final String openSshKey;
protected BaseGoogleComputeEngineExpectTest() {
public BaseGoogleComputeEngineExpectTest() {
provider = "google-compute-engine"; provider = "google-compute-engine";
try {
KeyFactory keyfactory = KeyFactory.getInstance("RSA");
PrivateKey privateKey = keyfactory
.generatePrivate(privateKeySpec(ByteSource.wrap(PRIVATE_KEY.getBytes(UTF_8))));
PublicKey publicKey = keyfactory.generatePublic(publicKeySpec(ByteSource.wrap(PUBLIC_KEY.getBytes(UTF_8))));
keyPair = new KeyPair(publicKey, privateKey);
openSshKey = SshKeys.encodeAsOpenSSH(RSAPublicKey.class.cast(publicKey));
} catch (NoSuchAlgorithmException e) {
throw propagate(e);
} catch (InvalidKeySpecException e) {
throw propagate(e);
} catch (IOException e) {
throw propagate(e);
}
} }
@Override protected ApiMetadata createApiMetadata(){ @Override protected ProviderMetadata createProviderMetadata(){
return new GoogleComputeEngineApiMetadata(); return new GoogleComputeEngineProviderMetadata();
} }
@Override @Override protected Module createModule() {
protected Module createModule() {
return new Module() { return new Module() {
@Override @Override
public void configure(Binder binder) { public void configure(Binder binder) {
// Predictable time // Predictable time
binder.bind(new TypeLiteral<Supplier<Long>>() {}).toInstance(Suppliers.ofInstance(0L)); binder.bind(new TypeLiteral<Supplier<Long>>() {}).toInstance(Suppliers.ofInstance(0L));
try { Crypto crypto = createMock(Crypto.class);
KeyFactory keyfactory = KeyFactory.getInstance("RSA");
PrivateKey privateKey = keyfactory.generatePrivate(privateKeySpec(ByteSource.wrap(
PRIVATE_KEY.getBytes(UTF_8))));
PublicKey publicKey = keyfactory.generatePublic(publicKeySpec(ByteSource.wrap(PUBLIC_KEY.getBytes(UTF_8))));
KeyPair keyPair = new KeyPair(publicKey, privateKey);
openSshKey = SshKeys.encodeAsOpenSSH(RSAPublicKey.class.cast(publicKey));
final Crypto crypto = createMock(Crypto.class);
KeyPairGenerator rsaKeyPairGenerator = createMock(KeyPairGenerator.class); KeyPairGenerator rsaKeyPairGenerator = createMock(KeyPairGenerator.class);
final SecureRandom secureRandom = createMock(SecureRandom.class); SecureRandom secureRandom = createMock(SecureRandom.class);
expect(crypto.rsaKeyPairGenerator()).andReturn(rsaKeyPairGenerator).anyTimes(); expect(crypto.rsaKeyPairGenerator()).andReturn(rsaKeyPairGenerator).anyTimes();
rsaKeyPairGenerator.initialize(2048, secureRandom); rsaKeyPairGenerator.initialize(2048, secureRandom);
expectLastCall().anyTimes(); expectLastCall().anyTimes();
@ -121,13 +127,7 @@ public class BaseGoogleComputeEngineExpectTest<T> extends BaseRestApiExpectTest<
replay(crypto, rsaKeyPairGenerator, secureRandom); replay(crypto, rsaKeyPairGenerator, secureRandom);
binder.bind(Crypto.class).toInstance(crypto); binder.bind(Crypto.class).toInstance(crypto);
binder.bind(SecureRandom.class).toInstance(secureRandom); binder.bind(SecureRandom.class).toInstance(secureRandom);
} catch (NoSuchAlgorithmException e) {
propagate(e);
} catch (InvalidKeySpecException e) {
propagate(e);
} catch (IOException e) {
propagate(e);
}
// predictable node names // predictable node names
final AtomicInteger suffix = new AtomicInteger(); final AtomicInteger suffix = new AtomicInteger();
binder.bind(new TypeLiteral<Supplier<String>>() { binder.bind(new TypeLiteral<Supplier<String>>() {

2
providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java
View File

@ -47,7 +47,7 @@ public class ParseRegionListTest extends BaseGoogleComputeEngineParseTest<ListPa
"us-central2", // name "us-central2", // name
"us-central2", // description "us-central2", // description
Region.Status.UP, // status Region.Status.UP, // status
ImmutableList.of(URI.create("https://www.googleapis.com/compute/v1/zones/us-central2-a")), // zones ImmutableList.of(URI.create(BASE_URL + "/myproject/zones/us-central2-a")), // zones
ImmutableList.of( // ImmutableList.of( //
Quota.create("INSTANCES", 0, 8), // Quota.create("INSTANCES", 0, 8), //
Quota.create("CPUS", 0, 8), // Quota.create("CPUS", 0, 8), //

4
providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionTest.java
View File

@ -46,8 +46,8 @@ public class ParseRegionTest extends BaseGoogleComputeEngineParseTest<Region> {
"us-central1", // description "us-central1", // description
Region.Status.UP, // status Region.Status.UP, // status
ImmutableList.of(// ImmutableList.of(//
URI.create("https://www.googleapis.com/compute/v1/zones/us-central1-a"), URI.create(BASE_URL + "/myproject/zones/us-central1-a"),
URI.create("https://www.googleapis.com/compute/v1/zones/us-central1-b")), // zones URI.create(BASE_URL + "/myproject/zones/us-central1-b")), // zones
ImmutableList.of( // ImmutableList.of( //
Quota.create("INSTANCES", 0, 8), // Quota.create("INSTANCES", 0, 8), //
Quota.create("CPUS", 0, 8), // Quota.create("CPUS", 0, 8), //

4
providers/google-compute-engine/src/test/resources/region_get.json
View File

@ -7,8 +7,8 @@
"description": "us-central1", "description": "us-central1",
"status": "UP", "status": "UP",
"zones": [ "zones": [
"https://www.googleapis.com/compute/v1/zones/us-central1-a", "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a",
"https://www.googleapis.com/compute/v1/zones/us-central1-b" "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-b"
], ],
"quotas": [ "quotas": [
{ {

6
providers/google-compute-engine/src/test/resources/region_list.json
View File

@ -12,8 +12,8 @@
"description": "us-central1", "description": "us-central1",
"status": "UP", "status": "UP",
"zones": [ "zones": [
"https://www.googleapis.com/compute/v1/zones/us-central1-a", "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a",
"https://www.googleapis.com/compute/v1/zones/us-central1-b" "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-b"
], ],
"quotas": [ "quotas": [
{ {
@ -72,7 +72,7 @@
"description": "us-central2", "description": "us-central2",
"status": "UP", "status": "UP",
"zones": [ "zones": [
"https://www.googleapis.com/compute/v1/zones/us-central2-a" "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central2-a"
], ],
"quotas": [ "quotas": [
{ {