diff --git a/allcompute/pom.xml b/allcompute/pom.xml
index f878476495..760cb00133 100644
--- a/allcompute/pom.xml
+++ b/allcompute/pom.xml
@@ -49,6 +49,16 @@
jclouds-vcloud
${project.version}
+
+ ${project.groupId}
+ jclouds-bluelock
+ ${project.version}
+
+
+ ${project.groupId}
+ jclouds-terremark
+ ${project.version}
+
${project.groupId}
jclouds-gogrid
diff --git a/archetypes/json-client-archetype/src/main/resources/archetype-resources/src/main/java/__providerName__Client.java b/archetypes/json-client-archetype/src/main/resources/archetype-resources/src/main/java/__providerName__Client.java
index f739311897..58fbf97ee8 100644
--- a/archetypes/json-client-archetype/src/main/resources/archetype-resources/src/main/java/__providerName__Client.java
+++ b/archetypes/json-client-archetype/src/main/resources/archetype-resources/src/main/java/__providerName__Client.java
@@ -43,7 +43,7 @@ public interface ${providerName}Client {
/*
* Note all these delegate to methods in ${providerName}AsyncClient with a specified or inherited timeout.
* The singatures should match those of ${providerName}AsyncClient, except the returnvals should not be
- * wrapped in a ListenableFuture
+ * wrapped in a Future
*/
String list();
diff --git a/atmos/src/main/java/org/jclouds/atmosonline/saas/AtmosStorageAsyncClient.java b/atmos/src/main/java/org/jclouds/atmosonline/saas/AtmosStorageAsyncClient.java
index 181526c74f..7fcd486c12 100644
--- a/atmos/src/main/java/org/jclouds/atmosonline/saas/AtmosStorageAsyncClient.java
+++ b/atmos/src/main/java/org/jclouds/atmosonline/saas/AtmosStorageAsyncClient.java
@@ -82,7 +82,7 @@ public interface AtmosStorageAsyncClient {
@Path("/rest/namespace")
@ResponseParser(ParseDirectoryListFromContentAndHeaders.class)
@Consumes(MediaType.TEXT_XML)
- ListenableFuture> listDirectories(
+ ListenableFuture> listDirectories(
ListOptions... options);
/**
@@ -93,7 +93,7 @@ public interface AtmosStorageAsyncClient {
@ResponseParser(ParseDirectoryListFromContentAndHeaders.class)
@ExceptionParser(ThrowContainerNotFoundOn404.class)
@Consumes(MediaType.TEXT_XML)
- ListenableFuture> listDirectory(
+ ListenableFuture> listDirectory(
@PathParam("directoryName") String directoryName, ListOptions... options);
/**
diff --git a/atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/AtmosAsyncBlobStore.java b/atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/AtmosAsyncBlobStore.java
index 70312be621..85096fbc03 100644
--- a/atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/AtmosAsyncBlobStore.java
+++ b/atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/AtmosAsyncBlobStore.java
@@ -19,7 +19,8 @@
package org.jclouds.atmosonline.saas.blobstore;
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.util.concurrent.Futures.compose;
+import static org.jclouds.concurrent.ConcurrentUtils.compose;
+import static org.jclouds.concurrent.ConcurrentUtils.makeListenable;
import java.net.URI;
import java.util.Set;
@@ -53,7 +54,6 @@ import org.jclouds.blobstore.functions.BlobToHttpGetOptions;
import org.jclouds.blobstore.internal.BaseAsyncBlobStore;
import org.jclouds.blobstore.strategy.internal.FetchBlobMetadata;
import org.jclouds.blobstore.util.BlobUtils;
-import org.jclouds.concurrent.ConcurrentUtils;
import org.jclouds.domain.Location;
import org.jclouds.encryption.EncryptionService;
import org.jclouds.http.options.GetOptions;
@@ -79,15 +79,12 @@ public class AtmosAsyncBlobStore extends BaseAsyncBlobStore {
@Inject
AtmosAsyncBlobStore(BlobStoreContext context, BlobUtils blobUtils,
- @Named(Constants.PROPERTY_USER_THREADS) ExecutorService service,
- Location defaultLocation, Set locations,
-
- AtmosStorageAsyncClient async, AtmosStorageClient sync, ObjectToBlob object2Blob,
- ObjectToBlobMetadata object2BlobMd, BlobToObject blob2Object,
+ @Named(Constants.PROPERTY_USER_THREADS) ExecutorService service, Location defaultLocation,
+ Set locations, AtmosStorageAsyncClient async, AtmosStorageClient sync,
+ ObjectToBlob object2Blob, ObjectToBlobMetadata object2BlobMd, BlobToObject blob2Object,
BlobStoreListOptionsToListOptions container2ContainerListOptions,
- DirectoryEntryListToResourceMetadataList container2ResourceList,
- EncryptionService encryptionService, BlobToHttpGetOptions blob2ObjectGetOptions,
- Provider fetchBlobMetadataProvider) {
+ DirectoryEntryListToResourceMetadataList container2ResourceList, EncryptionService encryptionService,
+ BlobToHttpGetOptions blob2ObjectGetOptions, Provider fetchBlobMetadataProvider) {
super(context, blobUtils, service, defaultLocation, locations);
this.blob2ObjectGetOptions = checkNotNull(blob2ObjectGetOptions, "blob2ObjectGetOptions");
this.sync = checkNotNull(sync, "sync");
@@ -99,8 +96,7 @@ public class AtmosAsyncBlobStore extends BaseAsyncBlobStore {
this.blob2Object = checkNotNull(blob2Object, "blob2Object");
this.object2BlobMd = checkNotNull(object2BlobMd, "object2BlobMd");
this.encryptionService = checkNotNull(encryptionService, "encryptionService");
- this.fetchBlobMetadataProvider = checkNotNull(fetchBlobMetadataProvider,
- "fetchBlobMetadataProvider");
+ this.fetchBlobMetadataProvider = checkNotNull(fetchBlobMetadataProvider, "fetchBlobMetadataProvider");
}
/**
@@ -108,13 +104,12 @@ public class AtmosAsyncBlobStore extends BaseAsyncBlobStore {
*/
@Override
public ListenableFuture blobMetadata(String container, String key) {
- return compose(async.headFile(container + "/" + key),
- new Function() {
- @Override
- public BlobMetadata apply(AtmosObject from) {
- return object2BlobMd.apply(from);
- }
- }, service);
+ return compose(async.headFile(container + "/" + key), new Function() {
+ @Override
+ public BlobMetadata apply(AtmosObject from) {
+ return object2BlobMd.apply(from);
+ }
+ }, service);
}
/**
@@ -130,7 +125,7 @@ public class AtmosAsyncBlobStore extends BaseAsyncBlobStore {
return true;
}
- });
+ }, service);
}
/**
@@ -144,7 +139,7 @@ public class AtmosAsyncBlobStore extends BaseAsyncBlobStore {
return null;// no etag
}
- });
+ }, service);
}
/**
@@ -197,8 +192,7 @@ public class AtmosAsyncBlobStore extends BaseAsyncBlobStore {
* This implementation invokes {@link AtmosStorageAsyncClient#readFile}
*/
@Override
- public ListenableFuture getBlob(String container, String key,
- org.jclouds.blobstore.options.GetOptions options) {
+ public ListenableFuture getBlob(String container, String key, org.jclouds.blobstore.options.GetOptions options) {
GetOptions httpOptions = blob2ObjectGetOptions.apply(options);
ListenableFuture returnVal = async.readFile(container + "/" + key, httpOptions);
return compose(returnVal, object2Blob, service);
@@ -208,7 +202,7 @@ public class AtmosAsyncBlobStore extends BaseAsyncBlobStore {
* This implementation invokes {@link AtmosStorageAsyncClient#listDirectories}
*/
@Override
- public ListenableFuture> list() {
+ public ListenableFuture> list() {
return compose(async.listDirectories(), container2ResourceList, service);
}
@@ -216,16 +210,14 @@ public class AtmosAsyncBlobStore extends BaseAsyncBlobStore {
* This implementation invokes {@link AtmosStorageAsyncClient#listDirectory}
*/
@Override
- public ListenableFuture> list(String container,
+ public ListenableFuture> list(String container,
org.jclouds.blobstore.options.ListContainerOptions options) {
container = AtmosStorageUtils.adjustContainerIfDirOptionPresent(container, options);
ListOptions nativeOptions = container2ContainerListOptions.apply(options);
- ListenableFuture> returnVal = async
- .listDirectory(container, nativeOptions);
- ListenableFuture> list = compose(returnVal,
- container2ResourceList, service);
- return options.isDetailed() ? compose(list, fetchBlobMetadataProvider.get().setContainerName(
- container), service) : list;
+ ListenableFuture> returnVal = async.listDirectory(container, nativeOptions);
+ ListenableFuture> list = compose(returnVal, container2ResourceList, service);
+ return (ListenableFuture>) (options.isDetailed() ? compose(list,
+ fetchBlobMetadataProvider.get().setContainerName(container), service) : list);
}
/**
@@ -235,7 +227,7 @@ public class AtmosAsyncBlobStore extends BaseAsyncBlobStore {
*/
@Override
public ListenableFuture putBlob(final String container, final Blob blob) {
- return ConcurrentUtils.makeListenable(service.submit(new Callable() {
+ return makeListenable(service.submit(new Callable() {
@Override
public String call() throws Exception {
diff --git a/atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/strategy/FindMD5InUserMetadata.java b/atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/strategy/FindMD5InUserMetadata.java
index 614595b7ed..d9e764ce5e 100644
--- a/atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/strategy/FindMD5InUserMetadata.java
+++ b/atmos/src/main/java/org/jclouds/atmosonline/saas/blobstore/strategy/FindMD5InUserMetadata.java
@@ -26,6 +26,7 @@ import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.TimeUnit;
@@ -42,6 +43,7 @@ import org.jclouds.blobstore.internal.BlobRuntimeException;
import org.jclouds.blobstore.options.ListContainerOptions;
import org.jclouds.blobstore.strategy.ContainsValueInListStrategy;
import org.jclouds.blobstore.strategy.ListBlobsInContainer;
+import static org.jclouds.concurrent.ConcurrentUtils.*;
import org.jclouds.logging.Logger;
import com.google.common.base.Throwables;
@@ -70,10 +72,8 @@ public class FindMD5InUserMetadata implements ContainsValueInListStrategy {
protected Long maxTime;
@Inject
- private FindMD5InUserMetadata(
- @Named(Constants.PROPERTY_USER_THREADS) ExecutorService userExecutor,
- ObjectMD5 objectMD5, ListBlobsInContainer getAllBlobMetadata,
- AtmosStorageAsyncClient client) {
+ private FindMD5InUserMetadata(@Named(Constants.PROPERTY_USER_THREADS) ExecutorService userExecutor,
+ ObjectMD5 objectMD5, ListBlobsInContainer getAllBlobMetadata, AtmosStorageAsyncClient client) {
this.objectMD5 = objectMD5;
this.getAllBlobMetadata = getAllBlobMetadata;
this.client = client;
@@ -83,10 +83,10 @@ public class FindMD5InUserMetadata implements ContainsValueInListStrategy {
public boolean execute(final String containerName, Object value, ListContainerOptions options) {
final byte[] toSearch = objectMD5.apply(value);
final BlockingQueue queue = new SynchronousQueue();
- Map> responses = Maps.newHashMap();
+ Map> responses = Maps.newHashMap();
for (BlobMetadata md : getAllBlobMetadata.execute(containerName, options)) {
- final ListenableFuture future = client.headFile(containerName + "/"
- + md.getName());
+ final ListenableFuture future = makeListenable(client.headFile(containerName
+ + "/" + md.getName()), userExecutor);
future.addListener(new Runnable() {
public void run() {
try {
@@ -97,8 +97,7 @@ public class FindMD5InUserMetadata implements ContainsValueInListStrategy {
queue.put(true);
}
} else {
- logger.debug("object %s has no content md5", object.getSystemMetadata()
- .getObjectID());
+ logger.debug("object %s has no content md5", object.getSystemMetadata().getObjectID());
}
} catch (InterruptedException e) {
Throwables.propagate(e);
@@ -109,11 +108,11 @@ public class FindMD5InUserMetadata implements ContainsValueInListStrategy {
}, userExecutor);
responses.put(md.getName(), future);
}
- Map exceptions = awaitCompletion(responses, userExecutor, maxTime, logger,
- String.format("searching for md5 in container %s", containerName));
+ Map exceptions = awaitCompletion(responses, userExecutor, maxTime, logger, String.format(
+ "searching for md5 in container %s", containerName));
if (exceptions.size() > 0)
- throw new BlobRuntimeException(String.format("searching for md5 in container %s: %s",
- containerName, exceptions));
+ throw new BlobRuntimeException(String.format("searching for md5 in container %s: %s", containerName,
+ exceptions));
try {
return queue.poll(1, TimeUnit.MICROSECONDS) != null;
} catch (InterruptedException e) {
@@ -121,9 +120,8 @@ public class FindMD5InUserMetadata implements ContainsValueInListStrategy {
return false;
} catch (Exception e) {
Throwables.propagateIfPossible(e, BlobRuntimeException.class);
- throw new BlobRuntimeException(String.format(
- "Error searching for ETAG of value: [%s] in container:%s", value, containerName),
- e);
+ throw new BlobRuntimeException(String.format("Error searching for ETAG of value: [%s] in container:%s", value,
+ containerName), e);
}
}
}
diff --git a/atmos/src/test/java/org/jclouds/atmosonline/saas/internal/StubAtmosStorageAsyncClient.java b/atmos/src/test/java/org/jclouds/atmosonline/saas/internal/StubAtmosStorageAsyncClient.java
index a08f3b31c0..14dbe07d89 100644
--- a/atmos/src/test/java/org/jclouds/atmosonline/saas/internal/StubAtmosStorageAsyncClient.java
+++ b/atmos/src/test/java/org/jclouds/atmosonline/saas/internal/StubAtmosStorageAsyncClient.java
@@ -19,15 +19,18 @@
package org.jclouds.atmosonline.saas.internal;
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.util.concurrent.Futures.compose;
import static com.google.common.util.concurrent.Futures.immediateFailedFuture;
import static com.google.common.util.concurrent.Futures.immediateFuture;
+import static org.jclouds.concurrent.ConcurrentUtils.compose;
import java.net.URI;
import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
import javax.inject.Inject;
+import javax.inject.Named;
+import org.jclouds.Constants;
import org.jclouds.atmosonline.saas.AtmosStorageAsyncClient;
import org.jclouds.atmosonline.saas.blobstore.functions.BlobMetadataToObject;
import org.jclouds.atmosonline.saas.blobstore.functions.BlobToObject;
@@ -48,7 +51,6 @@ import org.jclouds.http.options.GetOptions;
import com.google.common.base.Function;
import com.google.common.base.Throwables;
-import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
/**
@@ -65,13 +67,13 @@ public class StubAtmosStorageAsyncClient implements AtmosStorageAsyncClient {
private final BlobMetadataToObject blob2ObjectInfo;
private final ListOptionsToBlobStoreListOptions container2ContainerListOptions;
private final ResourceMetadataListToDirectoryEntryList resource2ObjectList;
+ private final ExecutorService service;
@Inject
- private StubAtmosStorageAsyncClient(TransientAsyncBlobStore blobStore,
- AtmosObject.Factory objectProvider,
- HttpGetOptionsListToGetOptions httpGetOptionsConverter, ObjectToBlob object2Blob,
- BlobToObject blob2Object, BlobMetadataToObject blob2ObjectInfo,
- ListOptionsToBlobStoreListOptions container2ContainerListOptions,
+ private StubAtmosStorageAsyncClient(TransientAsyncBlobStore blobStore, AtmosObject.Factory objectProvider,
+ HttpGetOptionsListToGetOptions httpGetOptionsConverter, ObjectToBlob object2Blob, BlobToObject blob2Object,
+ BlobMetadataToObject blob2ObjectInfo, ListOptionsToBlobStoreListOptions container2ContainerListOptions,
+ @Named(Constants.PROPERTY_USER_THREADS) ExecutorService service,
ResourceMetadataListToDirectoryEntryList resource2ContainerList) {
this.blobStore = blobStore;
this.objectProvider = objectProvider;
@@ -82,6 +84,7 @@ public class StubAtmosStorageAsyncClient implements AtmosStorageAsyncClient {
this.container2ContainerListOptions = checkNotNull(container2ContainerListOptions,
"container2ContainerListOptions");
this.resource2ObjectList = checkNotNull(resource2ContainerList, "resource2ContainerList");
+ this.service = service;
}
public ListenableFuture createDirectory(String directoryName) {
@@ -94,25 +97,23 @@ public class StubAtmosStorageAsyncClient implements AtmosStorageAsyncClient {
container = directoryName;
path = null;
}
- return Futures.compose(blobStore.createContainerInLocation(null, container),
- new Function() {
+ return compose(blobStore.createContainerInLocation(null, container), new Function() {
- public URI apply(Boolean from) {
- if (path != null) {
- Blob blob = blobStore.newBlob(path + "/");
- blob.getMetadata().setContentType("application/directory");
- blob.setPayload("");
- blobStore.putBlob(container, blob);
- }
- return URI.create("http://stub/containers/" + container);
- }
+ public URI apply(Boolean from) {
+ if (path != null) {
+ Blob blob = blobStore.newBlob(path + "/");
+ blob.getMetadata().setContentType("application/directory");
+ blob.setPayload("");
+ blobStore.putBlob(container, blob);
+ }
+ return URI.create("http://stub/containers/" + container);
+ }
- });
+ }, service);
}
public ListenableFuture createFile(String parent, AtmosObject object) {
- final String uri = "http://stub/containers/" + parent + "/"
- + object.getContentMetadata().getName();
+ final String uri = "http://stub/containers/" + parent + "/" + object.getContentMetadata().getName();
String file = object.getContentMetadata().getName();
String container = parent;
if (parent.indexOf('/') != -1) {
@@ -128,7 +129,7 @@ public class StubAtmosStorageAsyncClient implements AtmosStorageAsyncClient {
return URI.create(uri);
}
- });
+ }, service);
}
public ListenableFuture deletePath(String path) {
@@ -141,7 +142,7 @@ public class StubAtmosStorageAsyncClient implements AtmosStorageAsyncClient {
return null;
}
- });
+ }, service);
} else {
String container = path.substring(0, path.indexOf('/'));
path = path.substring(path.indexOf('/') + 1);
@@ -159,12 +160,11 @@ public class StubAtmosStorageAsyncClient implements AtmosStorageAsyncClient {
else {
String container = path.substring(0, path.indexOf('/'));
path = path.substring(path.indexOf('/') + 1);
- return compose(blobStore.blobMetadata(container, path),
- new Function() {
- public UserMetadata apply(BlobMetadata from) {
- return blob2ObjectInfo.apply(from).getUserMetadata();
- }
- });
+ return compose(blobStore.blobMetadata(container, path), new Function() {
+ public UserMetadata apply(BlobMetadata from) {
+ return blob2ObjectInfo.apply(from).getUserMetadata();
+ }
+ }, service);
}
}
@@ -172,23 +172,21 @@ public class StubAtmosStorageAsyncClient implements AtmosStorageAsyncClient {
String container = path.substring(0, path.indexOf('/'));
path = path.substring(path.indexOf('/') + 1);
try {
- return Futures.compose(blobStore.getBlob(container, path), blob2Object);
+ return compose(blobStore.getBlob(container, path), blob2Object, service);
} catch (Exception e) {
return immediateFailedFuture(Throwables.getRootCause(e));
}
}
- public ListenableFuture> listDirectories(
- ListOptions... optionsList) {
+ public ListenableFuture> listDirectories(ListOptions... optionsList) {
// org.jclouds.blobstore.options.ListOptions options = container2ContainerListOptions
// .apply(optionsList);
- return Futures.compose(blobStore.list(), resource2ObjectList);
+ return compose(blobStore.list(), resource2ObjectList, service);
}
- public ListenableFuture> listDirectory(
- String directoryName, ListOptions... optionsList) {
- org.jclouds.blobstore.options.ListContainerOptions options = container2ContainerListOptions
- .apply(optionsList);
+ public ListenableFuture> listDirectory(String directoryName,
+ ListOptions... optionsList) {
+ org.jclouds.blobstore.options.ListContainerOptions options = container2ContainerListOptions.apply(optionsList);
String container = directoryName;
if (directoryName.indexOf('/') != -1) {
container = directoryName.substring(0, directoryName.indexOf('/'));
@@ -196,7 +194,7 @@ public class StubAtmosStorageAsyncClient implements AtmosStorageAsyncClient {
if (!path.equals(""))
options.inDirectory(path);
}
- return compose(blobStore.list(container, options), resource2ObjectList);
+ return compose(blobStore.list(container, options), resource2ObjectList, service);
}
public AtmosObject newObject() {
@@ -224,7 +222,7 @@ public class StubAtmosStorageAsyncClient implements AtmosStorageAsyncClient {
String container = path.substring(0, path.indexOf('/'));
String blobName = path.substring(path.indexOf('/') + 1);
org.jclouds.blobstore.options.GetOptions getOptions = httpGetOptionsConverter.apply(options);
- return Futures.compose(blobStore.getBlob(container, blobName, getOptions), blob2Object);
+ return compose(blobStore.getBlob(container, blobName, getOptions), blob2Object, service);
}
public ListenableFuture updateFile(String parent, AtmosObject object) {
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/config/EC2ComputeServiceContextModule.java b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/config/EC2ComputeServiceContextModule.java
index 14427df55e..4a6c4e209b 100755
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/config/EC2ComputeServiceContextModule.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/config/EC2ComputeServiceContextModule.java
@@ -18,6 +18,16 @@
*/
package org.jclouds.aws.ec2.compute.config;
+import static com.google.common.collect.Iterables.concat;
+import static com.google.common.collect.Iterables.filter;
+import static com.google.common.collect.Iterables.find;
+import static com.google.common.collect.Iterables.getOnlyElement;
+import static com.google.common.collect.Iterables.toArray;
+import static com.google.common.collect.Iterables.transform;
+import static com.google.common.collect.Maps.newLinkedHashMap;
+import static com.google.common.collect.Maps.uniqueIndex;
+import static com.google.common.collect.Sets.newHashSet;
+import static com.google.common.collect.Sets.newLinkedHashSet;
import static org.jclouds.aws.ec2.options.DescribeImagesOptions.Builder.imageIds;
import static org.jclouds.aws.ec2.options.DescribeImagesOptions.Builder.ownedBy;
import static org.jclouds.aws.ec2.reference.EC2Constants.PROPERTY_EC2_AMI_OWNERS;
@@ -26,17 +36,18 @@ import static org.jclouds.aws.ec2.util.EC2Utils.getAllRunningInstancesInRegion;
import static org.jclouds.aws.ec2.util.EC2Utils.parseHandle;
import static org.jclouds.compute.domain.OsFamily.CENTOS;
import static org.jclouds.compute.domain.OsFamily.UBUNTU;
-import static org.jclouds.concurrent.ConcurrentUtils.awaitCompletion;
+import static org.jclouds.concurrent.ConcurrentUtils.transformParallel;
import java.net.URI;
import java.security.SecureRandom;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
-import java.util.concurrent.Callable;
+import java.util.Map.Entry;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -61,6 +72,7 @@ import org.jclouds.aws.ec2.compute.functions.RegionAndIdToImage;
import org.jclouds.aws.ec2.compute.functions.RunningInstanceToNodeMetadata;
import org.jclouds.aws.ec2.compute.internal.EC2TemplateBuilderImpl;
import org.jclouds.aws.ec2.compute.options.EC2TemplateOptions;
+import org.jclouds.aws.ec2.compute.strategy.DescribeImagesParallel;
import org.jclouds.aws.ec2.compute.strategy.EC2DestroyLoadBalancerStrategy;
import org.jclouds.aws.ec2.compute.strategy.EC2DestroyNodeStrategy;
import org.jclouds.aws.ec2.compute.strategy.EC2LoadBalanceNodesStrategy;
@@ -68,8 +80,8 @@ import org.jclouds.aws.ec2.compute.strategy.EC2RunNodesAndAddToSetStrategy;
import org.jclouds.aws.ec2.domain.InstanceType;
import org.jclouds.aws.ec2.domain.KeyPair;
import org.jclouds.aws.ec2.domain.PlacementGroup;
+import org.jclouds.aws.ec2.domain.Reservation;
import org.jclouds.aws.ec2.domain.RunningInstance;
-import org.jclouds.aws.ec2.domain.Image.ImageType;
import org.jclouds.aws.ec2.functions.RunningInstanceToStorageMappingUnix;
import org.jclouds.aws.ec2.options.DescribeImagesOptions;
import org.jclouds.aws.ec2.predicates.InstancePresent;
@@ -96,7 +108,6 @@ import org.jclouds.compute.strategy.ListNodesStrategy;
import org.jclouds.compute.strategy.LoadBalanceNodesStrategy;
import org.jclouds.compute.strategy.RebootNodeStrategy;
import org.jclouds.compute.strategy.RunNodesAndAddToSetStrategy;
-import org.jclouds.concurrent.ConcurrentUtils;
import org.jclouds.domain.Location;
import org.jclouds.domain.LocationScope;
import org.jclouds.domain.internal.LocationImpl;
@@ -108,6 +119,7 @@ import org.jclouds.rest.internal.RestContextImpl;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
import com.google.common.base.Splitter;
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableMap;
@@ -115,8 +127,6 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.MapMaker;
import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.ListenableFuture;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import com.google.inject.Scopes;
@@ -206,13 +216,13 @@ public class EC2ComputeServiceContextModule extends AbstractModule {
@Named(ComputeServiceConstants.COMPUTE_LOGGER)
protected Logger logger = Logger.NULL;
- private final EC2Client client;
+ private final EC2AsyncClient client;
private final Map regionMap;
private final RunningInstanceToNodeMetadata runningInstanceToNodeMetadata;
private final ExecutorService executor;
@Inject
- protected EC2ListNodesStrategy(EC2Client client, @Region Map regionMap,
+ protected EC2ListNodesStrategy(EC2AsyncClient client, @Region Map regionMap,
RunningInstanceToNodeMetadata runningInstanceToNodeMetadata,
@Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) {
this.client = client;
@@ -222,31 +232,25 @@ public class EC2ComputeServiceContextModule extends AbstractModule {
}
@Override
- public Iterable list() {
+ public Set list() {
return listDetailsOnNodesMatching(NodePredicates.all());
}
@Override
- public Iterable listDetailsOnNodesMatching(Predicate filter) {
- final Set nodes = Sets.newHashSet();
+ public Set listDetailsOnNodesMatching(Predicate filter) {
+ Iterable>> reservations = transformParallel(regionMap
+ .keySet(), new Function>>>() {
- Map> parallelResponses = Maps.newHashMap();
+ @Override
+ public Future>> apply(String from) {
+ return client.getInstanceServices().describeInstancesInRegion(from);
+ }
- for (final String region : regionMap.keySet()) {
- parallelResponses.put(region, ConcurrentUtils.makeListenable(executor.submit(new Callable() {
- @Override
- public Void call() throws Exception {
- Iterables.addAll(nodes, Iterables.transform(Iterables.concat(client.getInstanceServices()
- .describeInstancesInRegion(region)), runningInstanceToNodeMetadata));
- return null;
- }
- }), executor));
- }
- Map exceptions = awaitCompletion(parallelResponses, executor, null, logger, "nodes");
+ }, executor, null, logger, "reservations");
- if (exceptions.size() > 0)
- throw new RuntimeException(String.format("error parsing nodes in regions: %s", exceptions));
- return Iterables.filter(nodes, filter);
+ Iterable instances = concat(concat(reservations));
+ Iterable nodes = filter(transform(instances, runningInstanceToNodeMetadata), filter);
+ return newLinkedHashSet(nodes);
}
}
@@ -268,7 +272,7 @@ public class EC2ComputeServiceContextModule extends AbstractModule {
String region = parts[0];
String instanceId = parts[1];
try {
- RunningInstance runningInstance = Iterables.getOnlyElement(getAllRunningInstancesInRegion(client
+ RunningInstance runningInstance = getOnlyElement(getAllRunningInstancesInRegion(client
.getInstanceServices(), region, instanceId));
return runningInstanceToNodeMetadata.apply(runningInstance);
} catch (NoSuchElementException e) {
@@ -305,7 +309,7 @@ public class EC2ComputeServiceContextModule extends AbstractModule {
protected final Map credentialsMap(CreateUniqueKeyPair in) {
// doesn't seem to clear when someone issues remove(key)
// return new MapMaker().makeComputingMap(in);
- return Maps.newLinkedHashMap();
+ return newLinkedHashMap();
}
@Provides
@@ -314,7 +318,7 @@ public class EC2ComputeServiceContextModule extends AbstractModule {
protected final Map securityGroupMap(CreateSecurityGroupIfNeeded in) {
// doesn't seem to clear when someone issues remove(key)
// return new MapMaker().makeComputingMap(in);
- return Maps.newLinkedHashMap();
+ return newLinkedHashMap();
}
@Provides
@@ -323,7 +327,7 @@ public class EC2ComputeServiceContextModule extends AbstractModule {
protected final Map placementGroupMap(CreatePlacementGroupIfNeeded in) {
// doesn't seem to clear when someone issues remove(key)
// return new MapMaker().makeComputingMap(in);
- return Maps.newLinkedHashMap();
+ return newLinkedHashMap();
}
@Provides
@@ -340,10 +344,10 @@ public class EC2ComputeServiceContextModule extends AbstractModule {
@Provides
@Singleton
Set provideSizes(Set locations, @Named(PROPERTY_EC2_CC_AMIs) String[] ccAmis) {
- Set sizes = Sets.newHashSet();
+ Set sizes = newHashSet();
for (String ccAmi : ccAmis) {
final String region = ccAmi.split("/")[0];
- Location location = Iterables.find(locations, new Predicate() {
+ Location location = find(locations, new Predicate() {
@Override
public boolean apply(Location input) {
@@ -362,11 +366,11 @@ public class EC2ComputeServiceContextModule extends AbstractModule {
Set provideLocations(Map availabilityZoneToRegionMap,
@Provider String providerName) {
Location ec2 = new LocationImpl(LocationScope.PROVIDER, providerName, providerName, null);
- Set locations = Sets.newLinkedHashSet();
- for (String region : Sets.newLinkedHashSet(availabilityZoneToRegionMap.values())) {
+ Set locations = newLinkedHashSet();
+ for (String region : newLinkedHashSet(availabilityZoneToRegionMap.values())) {
locations.add(new LocationImpl(LocationScope.REGION, region, region, ec2));
}
- ImmutableMap idToLocation = Maps.uniqueIndex(locations, new Function() {
+ ImmutableMap idToLocation = uniqueIndex(locations, new Function() {
@Override
public String apply(Location from) {
return from.getId();
@@ -391,7 +395,7 @@ public class EC2ComputeServiceContextModule extends AbstractModule {
String[] amiOwners(@Named(PROPERTY_EC2_AMI_OWNERS) String amiOwners) {
if (amiOwners.trim().equals(""))
return new String[] {};
- return Iterables.toArray(Splitter.on(',').split(amiOwners), String.class);
+ return toArray(Splitter.on(',').split(amiOwners), String.class);
}
@Provides
@@ -400,7 +404,7 @@ public class EC2ComputeServiceContextModule extends AbstractModule {
String[] ccAmis(@Named(PROPERTY_EC2_CC_AMIs) String ccAmis) {
if (ccAmis.trim().equals(""))
return new String[] {};
- return Iterables.toArray(Splitter.on(',').split(ccAmis), String.class);
+ return toArray(Splitter.on(',').split(ccAmis), String.class);
}
@Provides
@@ -416,54 +420,62 @@ public class EC2ComputeServiceContextModule extends AbstractModule {
@Provides
@Singleton
- protected Map provideImages(final EC2Client sync,
- @Region Map regionMap, final LogHolder holder, Function indexer,
- @Named(PROPERTY_EC2_CC_AMIs) String[] ccAmis, @Named(PROPERTY_EC2_AMI_OWNERS) final String[] amiOwners,
- final ImageParser parser, final ConcurrentMap images,
- @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) throws InterruptedException,
- ExecutionException, TimeoutException {
+ protected Map provideImages(@Region Map regionMap,
+ DescribeImagesParallel describer, LogHolder holder, @Named(PROPERTY_EC2_CC_AMIs) String[] ccAmis,
+ @Named(PROPERTY_EC2_AMI_OWNERS) final String[] amiOwners, final ImageParser parser,
+ final ConcurrentMap images) throws InterruptedException, ExecutionException,
+ TimeoutException {
if (amiOwners.length == 0) {
holder.logger.debug(">> no owners specified, skipping image parsing");
} else {
holder.logger.debug(">> providing images");
- Map> parallelResponses = Maps.newHashMap();
- final DescribeImagesOptions options;
- if (amiOwners.length == 1 && amiOwners[0].equals("*"))
- options = new DescribeImagesOptions();
- else
- options = ownedBy(amiOwners);
- for (final String region : regionMap.keySet()) {
- parallelResponses.put(region, ConcurrentUtils.makeListenable(executor.submit(new Callable() {
- @Override
- public Void call() throws Exception {
- Set matchingImages = sync.getAMIServices().describeImagesInRegion(
- region, options);
- for (final org.jclouds.aws.ec2.domain.Image from : matchingImages) {
- Image image = parser.apply(from);
- if (image != null)
- images.put(new RegionAndName(region, image.getProviderId()), image);
- else if (from.getImageType() == ImageType.MACHINE)
- holder.logger.trace("<< image(%s) didn't parse", from.getId());
- }
- return null;
- }
- }), executor));
- }
- Map exceptions = awaitCompletion(parallelResponses, executor, null, holder.logger, "images");
- for (String ccAmi : ccAmis) {
- String region = ccAmi.split("/")[0];
- org.jclouds.aws.ec2.domain.Image from = Iterables.getOnlyElement(sync.getAMIServices()
- .describeImagesInRegion(region, imageIds(ccAmi.split("/")[1])));
- Image image = parser.apply(from);
- if (image != null)
- images.put(new RegionAndName(region, image.getProviderId()), image);
- }
- if (exceptions.size() > 0)
- throw new RuntimeException(String.format("error parsing images in regions: %s", exceptions));
+ Iterable> queries = concat(getDescribeQueriesForOwnersInRegions(
+ regionMap, amiOwners).entrySet(), ccAmisToDescribeQueries(ccAmis).entrySet());
+
+ Iterable parsedImages = filter(transform(describer.apply(queries), parser), Predicates
+ .notNull());
+
+ images.putAll(Maps.uniqueIndex(parsedImages, new Function() {
+
+ @Override
+ public RegionAndName apply(Image from) {
+ return new RegionAndName(from.getLocation().getId(), from.getProviderId());
+ }
+
+ }));
holder.logger.debug("<< images(%d)", images.size());
}
return images;
}
+
+ private Map ccAmisToDescribeQueries(String[] ccAmis) {
+ Map queries = Maps.newLinkedHashMap();
+ for (String from : ccAmis) {
+ queries.put(from.split("/")[0], imageIds(from.split("/")[1]));
+ }
+ return queries;
+ }
+
+ private Map getDescribeQueriesForOwnersInRegions(Map regionMap,
+ final String[] amiOwners) {
+ final DescribeImagesOptions options = getOptionsForOwners(amiOwners);
+
+ return Maps.transformValues(regionMap, new Function() {
+ @Override
+ public DescribeImagesOptions apply(URI from) {
+ return options;
+ }
+ });
+ }
+
+ private DescribeImagesOptions getOptionsForOwners(final String[] amiOwners) {
+ final DescribeImagesOptions options;
+ if (amiOwners.length == 1 && amiOwners[0].equals("*"))
+ options = new DescribeImagesOptions();
+ else
+ options = ownedBy(amiOwners);
+ return options;
+ }
}
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/internal/EC2TemplateBuilderImpl.java b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/internal/EC2TemplateBuilderImpl.java
index 3129e47b92..02a3e3bf9f 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/internal/EC2TemplateBuilderImpl.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/internal/EC2TemplateBuilderImpl.java
@@ -49,9 +49,9 @@ public class EC2TemplateBuilderImpl extends TemplateBuilderImpl {
@Inject
protected EC2TemplateBuilderImpl(Provider> locations, Provider> images,
- Provider> sizes, Location defaultLocation, Provider optionsProvider,
- @Named("DEFAULT") Provider defaultTemplateProvider,
- ConcurrentMap imageMap) {
+ Provider> sizes, Location defaultLocation, Provider optionsProvider,
+ @Named("DEFAULT") Provider defaultTemplateProvider,
+ ConcurrentMap imageMap) {
super(locations, images, sizes, defaultLocation, optionsProvider, defaultTemplateProvider);
this.imageMap = imageMap;
}
@@ -80,7 +80,8 @@ public class EC2TemplateBuilderImpl extends TemplateBuilderImpl {
if (imageId != null) {
String[] regionName = imageId.split("/");
checkArgument(regionName.length == 2,
- "amazon image ids must include the region. ex. us-east-1/ami-7ea24a17");
+ "amazon image ids must include the region ( ex. us-east-1/ami-7ea24a17 ) you specified: "
+ + imageId);
RegionAndName key = new RegionAndName(regionName[0], regionName[1]);
try {
return imageMap.get(key);
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/strategy/DescribeImagesParallel.java b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/strategy/DescribeImagesParallel.java
new file mode 100644
index 0000000000..f963d9cd32
--- /dev/null
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/strategy/DescribeImagesParallel.java
@@ -0,0 +1,79 @@
+/**
+ *
+ * Copyright (C) 2009 Cloud Conscious, LLC.
+ *
+ * ====================================================================
+ * Licensed 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.aws.ec2.compute.strategy;
+
+import static com.google.common.collect.Iterables.concat;
+import static org.jclouds.concurrent.ConcurrentUtils.transformParallel;
+
+import java.util.Set;
+import java.util.Map.Entry;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+
+import javax.annotation.Resource;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.jclouds.Constants;
+import org.jclouds.aws.ec2.EC2AsyncClient;
+import org.jclouds.aws.ec2.options.DescribeImagesOptions;
+import org.jclouds.compute.reference.ComputeServiceConstants;
+import org.jclouds.logging.Logger;
+
+import com.google.common.base.Function;
+
+/**
+ *
+ * @author Adrian Cole
+ */
+@Singleton
+public class DescribeImagesParallel implements
+ Function>, Iterable> {
+ @Resource
+ @Named(ComputeServiceConstants.COMPUTE_LOGGER)
+ protected Logger logger = Logger.NULL;
+
+ protected final EC2AsyncClient sync;
+ final ExecutorService executor;
+
+ @Inject
+ public DescribeImagesParallel(EC2AsyncClient sync, @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) {
+ super();
+ this.sync = sync;
+ this.executor = executor;
+ }
+
+ @Override
+ public Iterable apply(
+ Iterable> queries) {
+ return concat(transformParallel(
+ queries,
+ new Function, Future>>() {
+
+ @Override
+ public Future> apply(
+ Entry from) {
+ return sync.getAMIServices().describeImagesInRegion(from.getKey(), from.getValue());
+ }
+
+ }, executor, null, logger, "amis"));
+ }
+
+}
\ No newline at end of file
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/strategy/EC2RunNodesAndAddToSetStrategy.java b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/strategy/EC2RunNodesAndAddToSetStrategy.java
index 4f51efa8cf..fe133fdf28 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/strategy/EC2RunNodesAndAddToSetStrategy.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/strategy/EC2RunNodesAndAddToSetStrategy.java
@@ -27,6 +27,7 @@ import static org.jclouds.aws.ec2.compute.util.EC2ComputeUtils.instanceToId;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.Future;
import javax.annotation.Resource;
import javax.inject.Inject;
@@ -48,7 +49,6 @@ import org.jclouds.logging.Logger;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner;
import com.google.common.base.Predicate;
-import com.google.common.util.concurrent.ListenableFuture;
/**
* creates futures that correlate to
@@ -56,8 +56,7 @@ import com.google.common.util.concurrent.ListenableFuture;
* @author Adrian Cole
*/
@Singleton
-public class EC2RunNodesAndAddToSetStrategy implements
- RunNodesAndAddToSetStrategy {
+public class EC2RunNodesAndAddToSetStrategy implements RunNodesAndAddToSetStrategy {
@Resource
@Named(ComputeServiceConstants.COMPUTE_LOGGER)
@@ -76,11 +75,10 @@ public class EC2RunNodesAndAddToSetStrategy implements
@Inject
EC2RunNodesAndAddToSetStrategy(
- EC2Client client,
- CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions createKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions,
- @Named("PRESENT") Predicate instancePresent,
- RunningInstanceToNodeMetadata runningInstanceToNodeMetadata,
- ComputeUtils utils) {
+ EC2Client client,
+ CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions createKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions,
+ @Named("PRESENT") Predicate instancePresent,
+ RunningInstanceToNodeMetadata runningInstanceToNodeMetadata, ComputeUtils utils) {
this.client = client;
this.instancePresent = instancePresent;
this.createKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions = createKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions;
@@ -89,12 +87,11 @@ public class EC2RunNodesAndAddToSetStrategy implements
}
@Override
- public Map> execute(String tag, int count,
- Template template, Set goodNodes,
- Map badNodes) {
+ public Map> execute(String tag, int count, Template template, Set goodNodes,
+ Map badNodes) {
- Reservation reservation = createKeyPairAndSecurityGroupsAsNeededThenRunInstances(
- tag, count, template);
+ Reservation reservation = createKeyPairAndSecurityGroupsAsNeededThenRunInstances(tag,
+ count, template);
Iterable ids = transform(reservation, instanceToId);
@@ -104,28 +101,25 @@ public class EC2RunNodesAndAddToSetStrategy implements
all(reservation, instancePresent);
logger.debug("<< present instances(%s)", idsString);
- return utils.runOptionsOnNodesAndAddToGoodSetOrPutExceptionIntoBadMap(
- template.getOptions(), transform(reservation,
- runningInstanceToNodeMetadata), goodNodes, badNodes);
+ return utils.runOptionsOnNodesAndAddToGoodSetOrPutExceptionIntoBadMap(template.getOptions(), transform(
+ reservation, runningInstanceToNodeMetadata), goodNodes, badNodes);
}
@VisibleForTesting
- Reservation createKeyPairAndSecurityGroupsAsNeededThenRunInstances(
- String tag, int count, Template template) {
+ Reservation createKeyPairAndSecurityGroupsAsNeededThenRunInstances(String tag, int count,
+ Template template) {
String region = getRegionFromLocationOrNull(template.getLocation());
String zone = getZoneFromLocationOrNull(template.getLocation());
- RunInstancesOptions instanceOptions = createKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions
- .execute(region, tag, template);
+ RunInstancesOptions instanceOptions = createKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.execute(region,
+ tag, template);
if (logger.isDebugEnabled())
- logger.debug(
- ">> running %d instance region(%s) zone(%s) ami(%s) params(%s)",
- count, region, zone, template.getImage().getProviderId(),
- instanceOptions.buildFormParameters());
+ logger.debug(">> running %d instance region(%s) zone(%s) ami(%s) params(%s)", count, region, zone, template
+ .getImage().getProviderId(), instanceOptions.buildFormParameters());
- return client.getInstanceServices().runInstancesInRegion(region, zone,
- template.getImage().getProviderId(), 1, count, instanceOptions);
+ return client.getInstanceServices().runInstancesInRegion(region, zone, template.getImage().getProviderId(), 1,
+ count, instanceOptions);
}
}
\ No newline at end of file
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/Reservation.java b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/Reservation.java
index 70d19361a1..a24bcd2eec 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/Reservation.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/Reservation.java
@@ -33,8 +33,8 @@ import com.google.inject.internal.Nullable;
* />
* @author Adrian Cole
*/
-public class Reservation extends LinkedHashSet implements Comparable,
- Set {
+public class Reservation extends LinkedHashSet implements Comparable>,
+ Set {
/** The serialVersionUID */
private static final long serialVersionUID = -9051777593518861395L;
@@ -47,9 +47,8 @@ public class Reservation extends LinkedHashSet implements Compa
private final @Nullable
String reservationId;
- public Reservation(String region, Iterable groupIds,
- Iterable instances, @Nullable String ownerId,
- @Nullable String requesterId, @Nullable String reservationId) {
+ public Reservation(String region, Iterable groupIds, Iterable instances,
+ @Nullable String ownerId, @Nullable String requesterId, @Nullable String reservationId) {
this.region = checkNotNull(region, "region");
Iterables.addAll(this.groupIds, checkNotNull(groupIds, "groupIds"));
Iterables.addAll(this, checkNotNull(instances, "instances"));
@@ -65,7 +64,7 @@ public class Reservation extends LinkedHashSet implements Compa
return region;
}
- public int compareTo(Reservation o) {
+ public int compareTo(Reservation o) {
return (this == o) ? 0 : getReservationId().compareTo(o.getReservationId());
}
@@ -117,7 +116,7 @@ public class Reservation extends LinkedHashSet implements Compa
return false;
if (getClass() != obj.getClass())
return false;
- Reservation other = (Reservation) obj;
+ Reservation other = (Reservation) obj;
if (groupIds == null) {
if (other.groupIds != null)
return false;
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/options/CreateImageOptions.java b/aws/core/src/main/java/org/jclouds/aws/ec2/options/CreateImageOptions.java
index 186a0b1728..b533c42f3c 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/options/CreateImageOptions.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/options/CreateImageOptions.java
@@ -32,7 +32,7 @@ import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
* import static org.jclouds.aws.ec2.options.CreateImageOptions.Builder.*
*
* EC2Client connection = // get connection
- * ListenableFuture> images = connection.getAMIServices().createImage(withDescription("123125").noReboot());
+ * Future> images = connection.getAMIServices().createImage(withDescription("123125").noReboot());
*
*
* @author Adrian Cole
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/options/DescribeAvailabilityZonesOptions.java b/aws/core/src/main/java/org/jclouds/aws/ec2/options/DescribeAvailabilityZonesOptions.java
index f121600b6f..9955839581 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/options/DescribeAvailabilityZonesOptions.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/options/DescribeAvailabilityZonesOptions.java
@@ -33,7 +33,7 @@ import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
* import static org.jclouds.aws.ec2.options.DescribeAvailabilityZonesOptions.Builder.*
*
* EC2Client connection = // get connection
- * ListenableFuture> images = connection.getAvailabilityZoneAndRegionServices().describeAvailabilityZones(zones("us-east-1a", "us-east-1b"));
+ * Future> images = connection.getAvailabilityZoneAndRegionServices().describeAvailabilityZones(zones("us-east-1a", "us-east-1b"));
*
*
* @author Adrian Cole
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/options/DescribeImagesOptions.java b/aws/core/src/main/java/org/jclouds/aws/ec2/options/DescribeImagesOptions.java
index bcd143de30..d53e004b01 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/options/DescribeImagesOptions.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/options/DescribeImagesOptions.java
@@ -34,7 +34,7 @@ import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
* import static org.jclouds.aws.ec2.options.DescribeImagesOptions.Builder.*
*
* EC2Client connection = // get connection
- * ListenableFuture> images = connection.getAMIServices().describeImages(executableBy("123125").imageIds(1000, 1004));
+ * Future> images = connection.getAMIServices().describeImages(executableBy("123125").imageIds(1000, 1004));
*
*
* @author Adrian Cole
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/options/DescribeRegionsOptions.java b/aws/core/src/main/java/org/jclouds/aws/ec2/options/DescribeRegionsOptions.java
index 9107d8f201..9626a61240 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/options/DescribeRegionsOptions.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/options/DescribeRegionsOptions.java
@@ -34,7 +34,7 @@ import org.jclouds.aws.ec2.options.internal.BaseEC2RequestOptions;
* import static org.jclouds.aws.ec2.options.DescribeRegionsOptions.Builder.*
*
* EC2Client connection = // get connection
- * ListenableFuture> images = connection.getRegionsAndRegionsServices().describeRegions(regions("us-east-1a", "us-east-1b"));
+ * Future> images = connection.getRegionsAndRegionsServices().describeRegions(regions("us-east-1a", "us-east-1b"));
*
*
* @author Adrian Cole
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/options/RunInstancesOptions.java b/aws/core/src/main/java/org/jclouds/aws/ec2/options/RunInstancesOptions.java
index a388ce36dc..5d03c59bb8 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/options/RunInstancesOptions.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/options/RunInstancesOptions.java
@@ -35,7 +35,7 @@ import org.jclouds.encryption.internal.Base64;
* import static org.jclouds.aws.ec2.options.RunInstancesOptions.Builder.*
*
* EC2Client connection = // get connection
- * ListenableFuture instances = connection.runInstances(executableBy("123125").imageIds(1000, 1004));
+ * Future instances = connection.runInstances(executableBy("123125").imageIds(1000, 1004));
*
*
* @author Adrian Cole
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/services/AMIAsyncClient.java b/aws/core/src/main/java/org/jclouds/aws/ec2/services/AMIAsyncClient.java
index b0c2e0c03f..9f2e51fc06 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/services/AMIAsyncClient.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/services/AMIAsyncClient.java
@@ -23,6 +23,7 @@ import static org.jclouds.aws.ec2.reference.EC2Parameters.VERSION;
import java.util.Map;
import java.util.Set;
+import com.google.common.util.concurrent.ListenableFuture;
import javax.annotation.Nullable;
import javax.ws.rs.FormParam;
@@ -56,8 +57,6 @@ import org.jclouds.rest.annotations.VirtualHost;
import org.jclouds.rest.annotations.XMLResponseParser;
import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
-import com.google.common.util.concurrent.ListenableFuture;
-
/**
* Provides access to AMI Services.
*
@@ -77,7 +76,7 @@ public interface AMIAsyncClient {
@FormParams(keys = ACTION, values = "DescribeImages")
@XMLResponseParser(DescribeImagesResponseHandler.class)
@ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
- ListenableFuture> describeImagesInRegion(
+ ListenableFuture> describeImagesInRegion(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, DescribeImagesOptions... options);
/**
@@ -87,9 +86,8 @@ public interface AMIAsyncClient {
@Path("/")
@FormParams(keys = ACTION, values = "CreateImage")
@XMLResponseParser(ImageIdHandler.class)
- ListenableFuture createImageInRegion(
- @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @FormParam("Name") String name,
- @FormParam("InstanceId") String instanceId, CreateImageOptions... options);
+ ListenableFuture createImageInRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
+ @FormParam("Name") String name, @FormParam("InstanceId") String instanceId, CreateImageOptions... options);
/**
* @see AMIClient#deregisterImageInRegion
@@ -97,8 +95,7 @@ public interface AMIAsyncClient {
@POST
@Path("/")
@FormParams(keys = ACTION, values = "DeregisterImage")
- ListenableFuture deregisterImageInRegion(
- @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
+ ListenableFuture deregisterImageInRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@FormParam("ImageId") String imageId);
/**
@@ -181,7 +178,7 @@ public interface AMIAsyncClient {
@Path("/")
@FormParams(keys = { ACTION, "Attribute" }, values = { "DescribeImageAttribute", "productCodes" })
@XMLResponseParser(ProductCodesHandler.class)
- ListenableFuture> getProductCodesForImageInRegion(
+ ListenableFuture> getProductCodesForImageInRegion(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@FormParam("ImageId") String imageId);
@@ -192,7 +189,7 @@ public interface AMIAsyncClient {
@Path("/")
@FormParams(keys = { ACTION, "Attribute" }, values = { "DescribeImageAttribute", "blockDeviceMapping" })
@XMLResponseParser(BlockDeviceMappingHandler.class)
- ListenableFuture> getBlockDeviceMappingsForImageInRegion(
+ ListenableFuture> getBlockDeviceMappingsForImageInRegion(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@FormParam("ImageId") String imageId);
@@ -203,8 +200,7 @@ public interface AMIAsyncClient {
@Path("/")
@FormParams(keys = { ACTION, "OperationType", "Attribute" }, values = { "ModifyImageAttribute", "add",
"productCodes" })
- ListenableFuture addProductCodesToImageInRegion(
- @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
+ ListenableFuture addProductCodesToImageInRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@BinderParam(BindProductCodesToIndexedFormParams.class) Iterable productCodes,
@FormParam("ImageId") String imageId);
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/services/AMIClient.java b/aws/core/src/main/java/org/jclouds/aws/ec2/services/AMIClient.java
index 44b752051a..4d4037784a 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/services/AMIClient.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/services/AMIClient.java
@@ -57,7 +57,7 @@ public interface AMIClient {
* @see DescribeImagesOptions
*/
@Timeout(duration = 300, timeUnit = TimeUnit.SECONDS)
- Set describeImagesInRegion(@Nullable String region, DescribeImagesOptions... options);
+ Set describeImagesInRegion(@Nullable String region, DescribeImagesOptions... options);
/**
* Returns the Product Codes of an image.
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/services/InstanceAsyncClient.java b/aws/core/src/main/java/org/jclouds/aws/ec2/services/InstanceAsyncClient.java
index b9595c6057..84cbbf8c5e 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/services/InstanceAsyncClient.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/services/InstanceAsyncClient.java
@@ -23,6 +23,7 @@ import static org.jclouds.aws.ec2.reference.EC2Parameters.VERSION;
import java.util.Map;
import java.util.Set;
+import com.google.common.util.concurrent.ListenableFuture;
import javax.annotation.Nullable;
import javax.ws.rs.FormParam;
@@ -61,8 +62,6 @@ import org.jclouds.rest.annotations.VirtualHost;
import org.jclouds.rest.annotations.XMLResponseParser;
import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
-import com.google.common.util.concurrent.ListenableFuture;
-
/**
* Provides access to EC2 Instance Services via their REST API.
*
@@ -82,7 +81,7 @@ public interface InstanceAsyncClient {
@FormParams(keys = ACTION, values = "DescribeInstances")
@XMLResponseParser(DescribeInstancesResponseHandler.class)
@ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
- ListenableFuture> describeInstancesInRegion(
+ ListenableFuture>> describeInstancesInRegion(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@BinderParam(BindInstanceIdsToIndexedFormParams.class) String... instanceIds);
@@ -93,8 +92,7 @@ public interface InstanceAsyncClient {
@Path("/")
@FormParams(keys = ACTION, values = "RunInstances")
@XMLResponseParser(RunInstancesResponseHandler.class)
- ListenableFuture runInstancesInRegion(
- @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
+ ListenableFuture> runInstancesInRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@Nullable @BinderParam(IfNotNullBindAvailabilityZoneToFormParam.class) String nullableAvailabilityZone,
@FormParam("ImageId") String imageId, @FormParam("MinCount") int minCount,
@FormParam("MaxCount") int maxCount, RunInstancesOptions... options);
@@ -105,8 +103,7 @@ public interface InstanceAsyncClient {
@POST
@Path("/")
@FormParams(keys = ACTION, values = "RebootInstances")
- ListenableFuture rebootInstancesInRegion(
- @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
+ ListenableFuture rebootInstancesInRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@BinderParam(BindInstanceIdsToIndexedFormParams.class) String... instanceIds);
/**
@@ -116,7 +113,7 @@ public interface InstanceAsyncClient {
@Path("/")
@FormParams(keys = ACTION, values = "TerminateInstances")
@XMLResponseParser(InstanceStateChangeHandler.class)
- ListenableFuture> terminateInstancesInRegion(
+ ListenableFuture> terminateInstancesInRegion(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@BinderParam(BindInstanceIdsToIndexedFormParams.class) String... instanceIds);
@@ -127,7 +124,7 @@ public interface InstanceAsyncClient {
@Path("/")
@FormParams(keys = ACTION, values = "StopInstances")
@XMLResponseParser(InstanceStateChangeHandler.class)
- ListenableFuture> stopInstancesInRegion(
+ ListenableFuture> stopInstancesInRegion(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region, @FormParam("Force") boolean force,
@BinderParam(BindInstanceIdsToIndexedFormParams.class) String... instanceIds);
@@ -138,7 +135,7 @@ public interface InstanceAsyncClient {
@Path("/")
@FormParams(keys = ACTION, values = "StartInstances")
@XMLResponseParser(InstanceStateChangeHandler.class)
- ListenableFuture> startInstancesInRegion(
+ ListenableFuture> startInstancesInRegion(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@BinderParam(BindInstanceIdsToIndexedFormParams.class) String... instanceIds);
@@ -182,8 +179,7 @@ public interface InstanceAsyncClient {
@Path("/")
@FormParams(keys = { ACTION, "Attribute" }, values = { "DescribeInstanceAttribute", "kernel" })
@XMLResponseParser(StringValueHandler.class)
- ListenableFuture getKernelForInstanceInRegion(
- @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
+ ListenableFuture getKernelForInstanceInRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@FormParam("InstanceId") String instanceId);
/**
@@ -247,8 +243,7 @@ public interface InstanceAsyncClient {
@POST
@Path("/")
@FormParams(keys = { ACTION, "Attribute" }, values = { "ResetInstanceAttribute", "kernel" })
- ListenableFuture resetKernelForInstanceInRegion(
- @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
+ ListenableFuture resetKernelForInstanceInRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@FormParam("InstanceId") String instanceId);
/**
@@ -257,8 +252,7 @@ public interface InstanceAsyncClient {
@POST
@Path("/")
@FormParams(keys = { ACTION, "Attribute" }, values = { "ModifyInstanceAttribute", "userData" })
- ListenableFuture setUserDataForInstanceInRegion(
- @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
+ ListenableFuture setUserDataForInstanceInRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@FormParam("InstanceId") String instanceId,
@FormParam("Value") @ParamParser(ConvertUnencodedBytesToBase64EncodedString.class) byte[] unencodedData);
@@ -268,8 +262,7 @@ public interface InstanceAsyncClient {
@POST
@Path("/")
@FormParams(keys = { ACTION, "Attribute" }, values = { "ModifyInstanceAttribute", "ramdisk" })
- ListenableFuture setRamdiskForInstanceInRegion(
- @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
+ ListenableFuture setRamdiskForInstanceInRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@FormParam("InstanceId") String instanceId, @FormParam("Value") String ramdisk);
/**
@@ -278,8 +271,7 @@ public interface InstanceAsyncClient {
@POST
@Path("/")
@FormParams(keys = { ACTION, "Attribute" }, values = { "ModifyInstanceAttribute", "kernel" })
- ListenableFuture setKernelForInstanceInRegion(
- @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
+ ListenableFuture setKernelForInstanceInRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@FormParam("InstanceId") String instanceId, @FormParam("Value") String kernel);
/**
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/services/InstanceClient.java b/aws/core/src/main/java/org/jclouds/aws/ec2/services/InstanceClient.java
index 59227a8bd3..b8347d9044 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/services/InstanceClient.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/services/InstanceClient.java
@@ -61,7 +61,7 @@ public interface InstanceClient {
* @see
*/
- Set describeInstancesInRegion(@Nullable String region,
+ Set> describeInstancesInRegion(@Nullable String region,
String... instanceIds);
/**
@@ -141,7 +141,7 @@ public interface InstanceClient {
* />
* @see RunInstancesOptions
*/
- Reservation runInstancesInRegion(@Nullable String region,
+ Reservation runInstancesInRegion(@Nullable String region,
@Nullable String nullableAvailabilityZone, String imageId,
int minCount, int maxCount, RunInstancesOptions... options);
@@ -161,7 +161,7 @@ public interface InstanceClient {
* @see
*/
- Set terminateInstancesInRegion(@Nullable String region,
+ Set terminateInstancesInRegion(@Nullable String region,
String... instanceIds);
/**
@@ -199,7 +199,7 @@ public interface InstanceClient {
* @see
*/
- Set stopInstancesInRegion(@Nullable String region,
+ Set stopInstancesInRegion(@Nullable String region,
boolean force, String... instanceIds);
/**
@@ -255,7 +255,7 @@ public interface InstanceClient {
* @see
*/
- Set startInstancesInRegion(@Nullable String region,
+ Set startInstancesInRegion(@Nullable String region,
String... instanceIds);
/**
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/xml/BaseReservationHandler.java b/aws/core/src/main/java/org/jclouds/aws/ec2/xml/BaseReservationHandler.java
index f023aa7014..c39dd9aa86 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/xml/BaseReservationHandler.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/xml/BaseReservationHandler.java
@@ -270,11 +270,12 @@ public abstract class BaseReservationHandler extends HandlerForGeneratedReque
currentText.append(ch, start, length);
}
- protected Reservation newReservation() {
+ protected Reservation newReservation() {
String region = EC2Utils.findRegionInArgsOrNull((GeneratedHttpRequest) request);
if (region == null)
region = defaultRegion;
- Reservation info = new Reservation(region, groupIds, instances, ownerId, requesterId, reservationId);
+ Reservation info = new Reservation(region, groupIds, instances,
+ ownerId, requesterId, reservationId);
this.groupIds = Sets.newLinkedHashSet();
this.instances = Sets.newLinkedHashSet();
this.ownerId = null;
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/xml/DescribeInstancesResponseHandler.java b/aws/core/src/main/java/org/jclouds/aws/ec2/xml/DescribeInstancesResponseHandler.java
index c48f8559c5..151a378445 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/xml/DescribeInstancesResponseHandler.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/xml/DescribeInstancesResponseHandler.java
@@ -24,6 +24,7 @@ import javax.inject.Inject;
import org.jclouds.aws.Region;
import org.jclouds.aws.ec2.domain.Reservation;
+import org.jclouds.aws.ec2.domain.RunningInstance;
import org.jclouds.date.DateService;
import com.google.common.collect.Sets;
@@ -37,8 +38,8 @@ import com.google.common.collect.Sets;
* @see
*/
-public class RunInstancesResponseHandler extends BaseReservationHandler {
+public class RunInstancesResponseHandler extends BaseReservationHandler> {
@Inject
RunInstancesResponseHandler(DateService dateService, @Region String defaultRegion) {
@@ -40,7 +41,7 @@ public class RunInstancesResponseHandler extends BaseReservationHandler getResult() {
return newReservation();
}
diff --git a/aws/core/src/main/java/org/jclouds/aws/s3/S3Client.java b/aws/core/src/main/java/org/jclouds/aws/s3/S3Client.java
index bb4e8bc7a6..4c5a8fcb84 100644
--- a/aws/core/src/main/java/org/jclouds/aws/s3/S3Client.java
+++ b/aws/core/src/main/java/org/jclouds/aws/s3/S3Client.java
@@ -38,14 +38,14 @@ import org.jclouds.aws.s3.options.PutObjectOptions;
import org.jclouds.concurrent.Timeout;
import org.jclouds.http.options.GetOptions;
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.concurrent.Future;
/**
* Provides access to S3 via their REST API.
*
- * All commands return a ListenableFuture of the result from S3. Any exceptions incurred during
+ * All commands return a Future of the result from S3. Any exceptions incurred during
* processing will be wrapped in an {@link ExecutionException} as documented in
- * {@link ListenableFuture#get()}.
+ * {@link Future#get()}.
*
* @author Adrian Cole
* @author James Murty
@@ -85,7 +85,7 @@ public interface S3Client {
* namespace of the object you are retrieving
* @param key
* unique key in the s3Bucket identifying the object
- * @return ListenableFuture reference to a fully populated S3Object including data stored in S3
+ * @return Future reference to a fully populated S3Object including data stored in S3
* or {@link S3Object#NOT_FOUND} if not present.
*
* @throws org.jclouds.http.HttpResponseException
@@ -231,7 +231,7 @@ public interface S3Client {
*
* @param bucketName
* namespace of the objects you wish to list
- * @return ListenableFuture reference to a fully populated S3Bucket including metadata of the
+ * @return Future reference to a fully populated S3Bucket including metadata of the
* S3Objects it contains or {@link BoundedList#NOT_FOUND} if not present.
* @see ListBucketOptions
*
diff --git a/aws/core/src/main/java/org/jclouds/aws/s3/blobstore/S3AsyncBlobStore.java b/aws/core/src/main/java/org/jclouds/aws/s3/blobstore/S3AsyncBlobStore.java
index c633988888..3aaf48d8aa 100644
--- a/aws/core/src/main/java/org/jclouds/aws/s3/blobstore/S3AsyncBlobStore.java
+++ b/aws/core/src/main/java/org/jclouds/aws/s3/blobstore/S3AsyncBlobStore.java
@@ -19,10 +19,11 @@
package org.jclouds.aws.s3.blobstore;
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.util.concurrent.Futures.compose;
+import static org.jclouds.concurrent.ConcurrentUtils.compose;
import java.util.Set;
import java.util.concurrent.ExecutorService;
+import com.google.common.util.concurrent.ListenableFuture;
import javax.inject.Inject;
import javax.inject.Named;
@@ -60,7 +61,6 @@ import org.jclouds.http.options.GetOptions;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
-import com.google.common.util.concurrent.ListenableFuture;
/**
*
@@ -82,41 +82,34 @@ public class S3AsyncBlobStore extends BaseAsyncBlobStore {
@Inject
S3AsyncBlobStore(BlobStoreContext context, BlobUtils blobUtils,
- @Named(Constants.PROPERTY_USER_THREADS) ExecutorService service,
- Location defaultLocation, Set locations, S3AsyncClient async,
- S3Client sync, BucketToResourceMetadata bucket2ResourceMd,
- ContainerToBucketListOptions container2BucketListOptions,
+ @Named(Constants.PROPERTY_USER_THREADS) ExecutorService service, Location defaultLocation,
+ Set locations, S3AsyncClient async, S3Client sync,
+ BucketToResourceMetadata bucket2ResourceMd, ContainerToBucketListOptions container2BucketListOptions,
BucketToResourceList bucket2ResourceList, ObjectToBlob object2Blob,
- BlobToHttpGetOptions blob2ObjectGetOptions, BlobToObject blob2Object,
- ObjectToBlobMetadata object2BlobMd,
+ BlobToHttpGetOptions blob2ObjectGetOptions, BlobToObject blob2Object, ObjectToBlobMetadata object2BlobMd,
Provider fetchBlobMetadataProvider) {
super(context, blobUtils, service, defaultLocation, locations);
this.blob2ObjectGetOptions = checkNotNull(blob2ObjectGetOptions, "blob2ObjectGetOptions");
this.async = checkNotNull(async, "async");
this.sync = checkNotNull(sync, "sync");
this.bucket2ResourceMd = checkNotNull(bucket2ResourceMd, "bucket2ResourceMd");
- this.container2BucketListOptions = checkNotNull(container2BucketListOptions,
- "container2BucketListOptions");
+ this.container2BucketListOptions = checkNotNull(container2BucketListOptions, "container2BucketListOptions");
this.bucket2ResourceList = checkNotNull(bucket2ResourceList, "bucket2ResourceList");
this.object2Blob = checkNotNull(object2Blob, "object2Blob");
this.blob2Object = checkNotNull(blob2Object, "blob2Object");
this.object2BlobMd = checkNotNull(object2BlobMd, "object2BlobMd");
- this.fetchBlobMetadataProvider = checkNotNull(fetchBlobMetadataProvider,
- "fetchBlobMetadataProvider");
+ this.fetchBlobMetadataProvider = checkNotNull(fetchBlobMetadataProvider, "fetchBlobMetadataProvider");
}
/**
* This implementation invokes {@link S3AsyncClient#listOwnedBuckets}
*/
@Override
- public ListenableFuture> list() {
- return compose(
- async.listOwnedBuckets(),
+ public ListenableFuture> list() {
+ return compose(async.listOwnedBuckets(),
new Function, org.jclouds.blobstore.domain.PageSet>() {
- public org.jclouds.blobstore.domain.PageSet apply(
- Set from) {
- return new PageSetImpl(Iterables.transform(from,
- bucket2ResourceMd), null);
+ public org.jclouds.blobstore.domain.PageSet apply(Set from) {
+ return new PageSetImpl(Iterables.transform(from, bucket2ResourceMd), null);
}
}, service);
}
@@ -153,14 +146,13 @@ public class S3AsyncBlobStore extends BaseAsyncBlobStore {
* bucket name
*/
@Override
- public ListenableFuture> list(String container,
- ListContainerOptions options) {
+ // TODO get rid of compose, as it serializes async results when the executor is single-threaded.
+ public ListenableFuture> list(String container, ListContainerOptions options) {
ListBucketOptions httpOptions = container2BucketListOptions.apply(options);
ListenableFuture returnVal = async.listBucket(container, httpOptions);
- ListenableFuture> list = compose(returnVal,
- bucket2ResourceList, service);
- return options.isDetailed() ? compose(list, fetchBlobMetadataProvider.get().setContainerName(
- container), service) : list;
+ ListenableFuture> list = compose(returnVal, bucket2ResourceList, service);
+ return (options.isDetailed()) ? compose(list, fetchBlobMetadataProvider.get().setContainerName(container),
+ service) : list;
}
/**
@@ -193,15 +185,14 @@ public class S3AsyncBlobStore extends BaseAsyncBlobStore {
*/
@Override
public ListenableFuture blobMetadata(String container, String key) {
- return compose(async.headObject(container, key),
- new Function() {
+ return compose(async.headObject(container, key), new Function() {
- @Override
- public BlobMetadata apply(ObjectMetadata from) {
- return object2BlobMd.apply(from);
- }
+ @Override
+ public BlobMetadata apply(ObjectMetadata from) {
+ return object2BlobMd.apply(from);
+ }
- }, service);
+ }, service);
}
/**
@@ -213,8 +204,7 @@ public class S3AsyncBlobStore extends BaseAsyncBlobStore {
* object key
*/
@Override
- public ListenableFuture getBlob(String container, String key,
- org.jclouds.blobstore.options.GetOptions options) {
+ public ListenableFuture getBlob(String container, String key, org.jclouds.blobstore.options.GetOptions options) {
GetOptions httpOptions = blob2ObjectGetOptions.apply(options);
return compose(async.getObject(container, key, httpOptions), object2Blob, service);
}
diff --git a/aws/core/src/main/java/org/jclouds/aws/s3/options/CopyObjectOptions.java b/aws/core/src/main/java/org/jclouds/aws/s3/options/CopyObjectOptions.java
index 7d0e283dd5..1e63747aed 100755
--- a/aws/core/src/main/java/org/jclouds/aws/s3/options/CopyObjectOptions.java
+++ b/aws/core/src/main/java/org/jclouds/aws/s3/options/CopyObjectOptions.java
@@ -58,7 +58,7 @@ import com.google.common.collect.Multimap;
*
* // this will copy the object, provided it wasn't modified since yesterday.
* // it will not use metadata from the source, and instead use what we pass in.
- * ListenableFuture object = connection.copyObject("sourceBucket", "objectName",
+ * Future object = connection.copyObject("sourceBucket", "objectName",
* "destinationBucket", "destinationName",
* overrideMetadataWith(meta).
* ifSourceModifiedSince(new Date().minusDays(1))
diff --git a/aws/core/src/main/java/org/jclouds/aws/s3/options/ListBucketOptions.java b/aws/core/src/main/java/org/jclouds/aws/s3/options/ListBucketOptions.java
index 3a3d9b074a..8ce6e7dd01 100755
--- a/aws/core/src/main/java/org/jclouds/aws/s3/options/ListBucketOptions.java
+++ b/aws/core/src/main/java/org/jclouds/aws/s3/options/ListBucketOptions.java
@@ -33,7 +33,7 @@ import org.jclouds.http.options.BaseHttpRequestOptions;
* import static org.jclouds.aws.s3.commands.options.GetBucketOptions.Builder.*
*
* S3Client connection = // get connection
- * ListenableFuture bucket = connection.listBucket("bucketName",withPrefix("home/users").maxKeys(1000));
+ * Future bucket = connection.listBucket("bucketName",withPrefix("home/users").maxKeys(1000));
*
*
* @author Adrian Cole
diff --git a/aws/core/src/main/java/org/jclouds/aws/s3/options/PutBucketOptions.java b/aws/core/src/main/java/org/jclouds/aws/s3/options/PutBucketOptions.java
index 40e26d1c05..72fa560f44 100755
--- a/aws/core/src/main/java/org/jclouds/aws/s3/options/PutBucketOptions.java
+++ b/aws/core/src/main/java/org/jclouds/aws/s3/options/PutBucketOptions.java
@@ -46,7 +46,7 @@ import com.google.common.collect.Multimap;
* import org.jclouds.aws.s3.S3Client;
*
* S3Client connection = // get connection
- * ListenableFuture createdInEu = connection.putBucketIfNotExists("bucketName",createIn(EU));
+ * Future createdInEu = connection.putBucketIfNotExists("bucketName",createIn(EU));
*
*
* @author Adrian Cole
diff --git a/aws/core/src/main/java/org/jclouds/aws/s3/options/PutObjectOptions.java b/aws/core/src/main/java/org/jclouds/aws/s3/options/PutObjectOptions.java
index aab8c3416e..164894cbfa 100755
--- a/aws/core/src/main/java/org/jclouds/aws/s3/options/PutObjectOptions.java
+++ b/aws/core/src/main/java/org/jclouds/aws/s3/options/PutObjectOptions.java
@@ -46,7 +46,7 @@ import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG;
* import org.jclouds.aws.s3.S3Client;
*
* S3Client connection = // get connection
- * ListenableFuture publicly readable = connection.putObject("bucketName",new S3Object("key","value"), withAcl(CannedAccessPolicy.PUBLIC_READ));
+ * Future publicly readable = connection.putObject("bucketName",new S3Object("key","value"), withAcl(CannedAccessPolicy.PUBLIC_READ));
*
*
* @see
- * adds in functionality to boot a lamp instance:
- * http://alestic.com/2009/06/ec2-user-data-scripts
+ * adds in functionality to boot a lamp instance: http://alestic.com/2009/06/ec2-user-data-scripts
*
* Generally disabled, as it incurs higher fees.
*
@@ -92,49 +91,38 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest {
private RetryablePredicate runningTester;
@BeforeGroups(groups = { "live" })
- public void setupClient() throws InterruptedException, ExecutionException,
- TimeoutException,
- IOException {
- String identity = checkNotNull(System.getProperty("jclouds.test.identity"),
- "jclouds.test.identity");
- String credential = checkNotNull(System.getProperty("jclouds.test.credential"),
- "jclouds.test.credential");
- Injector injector = new RestContextFactory().createContextBuilder(
- "ec2", identity, credential, ImmutableSet. of(new Log4JLoggingModule())).buildInjector();
+ public void setupClient() throws InterruptedException, ExecutionException, TimeoutException, IOException {
+ String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity");
+ String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential");
+ Injector injector = new RestContextFactory().createContextBuilder("ec2", identity, credential,
+ ImmutableSet. of(new Log4JLoggingModule())).buildInjector();
client = injector.getInstance(EC2Client.class);
sshFactory = injector.getInstance(SshClient.Factory.class);
- runningTester = new RetryablePredicate(
- new InstanceStateRunning(client), 180, 5, TimeUnit.SECONDS);
- hasIpTester = new RetryablePredicate(
- new InstanceHasIpAddress(client), 180, 5, TimeUnit.SECONDS);
+ runningTester = new RetryablePredicate(new InstanceStateRunning(client), 180, 5,
+ TimeUnit.SECONDS);
+ hasIpTester = new RetryablePredicate(new InstanceHasIpAddress(client), 180, 5, TimeUnit.SECONDS);
SocketOpen socketOpen = injector.getInstance(SocketOpen.class);
- socketTester = new RetryablePredicate(socketOpen, 180, 1,
- TimeUnit.SECONDS);
+ socketTester = new RetryablePredicate(socketOpen, 180, 1, TimeUnit.SECONDS);
}
@Test(enabled = false)
- void testCreateSecurityGroupIngressCidr() throws InterruptedException,
- ExecutionException, TimeoutException {
+ void testCreateSecurityGroupIngressCidr() throws InterruptedException, ExecutionException, TimeoutException {
securityGroupName = instancePrefix + "ingress";
try {
- client.getSecurityGroupServices().deleteSecurityGroupInRegion(null,
- securityGroupName);
+ client.getSecurityGroupServices().deleteSecurityGroupInRegion(null, securityGroupName);
} catch (Exception e) {
}
- client.getSecurityGroupServices().createSecurityGroupInRegion(null,
- securityGroupName, securityGroupName);
+ client.getSecurityGroupServices().createSecurityGroupInRegion(null, securityGroupName, securityGroupName);
for (int port : new int[] { 80, 443, 22 }) {
- client.getSecurityGroupServices()
- .authorizeSecurityGroupIngressInRegion(null, securityGroupName,
- IpProtocol.TCP, port, port, "0.0.0.0/0");
+ client.getSecurityGroupServices().authorizeSecurityGroupIngressInRegion(null, securityGroupName,
+ IpProtocol.TCP, port, port, "0.0.0.0/0");
}
}
@Test(enabled = false)
- void testCreateKeyPair() throws InterruptedException, ExecutionException,
- TimeoutException {
+ void testCreateKeyPair() throws InterruptedException, ExecutionException, TimeoutException {
String keyName = instancePrefix + "1";
try {
client.getKeyPairServices().deleteKeyPairInRegion(null, keyName);
@@ -143,41 +131,37 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest {
}
client.getKeyPairServices().deleteKeyPairInRegion(null, keyName);
- keyPair = client.getKeyPairServices()
- .createKeyPairInRegion(null, keyName);
+ keyPair = client.getKeyPairServices().createKeyPairInRegion(null, keyName);
assertNotNull(keyPair);
assertNotNull(keyPair.getKeyMaterial());
assertNotNull(keyPair.getKeyFingerprint());
assertEquals(keyPair.getKeyName(), keyName);
}
- @Test(enabled = false, dependsOnMethods = { "testCreateKeyPair",
- "testCreateSecurityGroupIngressCidr" })
+ @Test(enabled = false, dependsOnMethods = { "testCreateKeyPair", "testCreateSecurityGroupIngressCidr" })
public void testCreateRunningInstance() throws Exception {
String script = new ScriptBuilder() // lamp install script
- .addStatement(exec("runurl run.alestic.com/apt/upgrade"))//
- .addStatement(exec("runurl run.alestic.com/install/lamp"))//
- .build(OsFamily.UNIX);
+ .addStatement(exec("runurl run.alestic.com/apt/upgrade"))//
+ .addStatement(exec("runurl run.alestic.com/install/lamp"))//
+ .build(OsFamily.UNIX);
RunningInstance instance = null;
while (instance == null) {
try {
- System.out.printf("%d: running instance%n", System
- .currentTimeMillis());
- Reservation reservation = client.getInstanceServices()
- .runInstancesInRegion(null, null, // allow
- // ec2
- // to
- // chose
- // an
- // availability
- // zone
- "ami-ccf615a5", // alestic ami allows auto-invoke of
- // user data scripts
- 1, // minimum instances
- 1, // maximum instances
- asType(InstanceType.M1_SMALL) // smallest instance size
+ System.out.printf("%d: running instance%n", System.currentTimeMillis());
+ Reservation reservation = client.getInstanceServices().runInstancesInRegion(null, null, // allow
+ // ec2
+ // to
+ // chose
+ // an
+ // availability
+ // zone
+ "ami-ccf615a5", // alestic ami allows auto-invoke of
+ // user data scripts
+ 1, // minimum instances
+ 1, // maximum instances
+ asType(InstanceType.M1_SMALL) // smallest instance size
.withKeyName(keyPair.getKeyName()) // key I
// created
// above
@@ -203,51 +187,36 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest {
verifyInstanceProperties(script);
tryToChangeStuff();
sshPing(instance);
- System.out.printf("%d: %s ssh connection made%n", System
- .currentTimeMillis(), instanceId);
+ System.out.printf("%d: %s ssh connection made%n", System.currentTimeMillis(), instanceId);
}
private void verifyInstanceProperties(String script) {
- assertEquals(script, client.getInstanceServices()
- .getUserDataForInstanceInRegion(null, instanceId));
+ assertEquals(script, client.getInstanceServices().getUserDataForInstanceInRegion(null, instanceId));
- assertEquals(null, client.getInstanceServices()
- .getRootDeviceNameForInstanceInRegion(null, instanceId));
+ assertEquals(null, client.getInstanceServices().getRootDeviceNameForInstanceInRegion(null, instanceId));
- assert client.getInstanceServices().getRamdiskForInstanceInRegion(null,
- instanceId).startsWith("ari-");
+ assert client.getInstanceServices().getRamdiskForInstanceInRegion(null, instanceId).startsWith("ari-");
- assertEquals(false, client.getInstanceServices()
- .isApiTerminationDisabledForInstanceInRegion(null, instanceId));
+ assertEquals(false, client.getInstanceServices().isApiTerminationDisabledForInstanceInRegion(null, instanceId));
- assert client.getInstanceServices().getKernelForInstanceInRegion(null,
- instanceId).startsWith("aki-");
+ assert client.getInstanceServices().getKernelForInstanceInRegion(null, instanceId).startsWith("aki-");
- assertEquals(InstanceType.M1_SMALL, client.getInstanceServices()
- .getInstanceTypeForInstanceInRegion(null, instanceId));
+ assertEquals(InstanceType.M1_SMALL, client.getInstanceServices().getInstanceTypeForInstanceInRegion(null,
+ instanceId));
- assertEquals(InstanceInitiatedShutdownBehavior.TERMINATE, client
- .getInstanceServices()
- .getInstanceInitiatedShutdownBehaviorForInstanceInRegion(null,
- instanceId));
+ assertEquals(InstanceInitiatedShutdownBehavior.TERMINATE, client.getInstanceServices()
+ .getInstanceInitiatedShutdownBehaviorForInstanceInRegion(null, instanceId));
- assertEquals(ImmutableMap. of(), client
- .getInstanceServices().getBlockDeviceMappingForInstanceInRegion(
- null, instanceId));
+ assertEquals(ImmutableMap. of(), client.getInstanceServices()
+ .getBlockDeviceMappingForInstanceInRegion(null, instanceId));
}
private void setApiTerminationDisabledForInstanceInRegion() {
- client.getInstanceServices()
- .setApiTerminationDisabledForInstanceInRegion(null, instanceId,
- true);
- assertEquals(true, client.getInstanceServices()
- .isApiTerminationDisabledForInstanceInRegion(null, instanceId));
- client.getInstanceServices()
- .setApiTerminationDisabledForInstanceInRegion(null, instanceId,
- false);
- assertEquals(false, client.getInstanceServices()
- .isApiTerminationDisabledForInstanceInRegion(null, instanceId));
+ client.getInstanceServices().setApiTerminationDisabledForInstanceInRegion(null, instanceId, true);
+ assertEquals(true, client.getInstanceServices().isApiTerminationDisabledForInstanceInRegion(null, instanceId));
+ client.getInstanceServices().setApiTerminationDisabledForInstanceInRegion(null, instanceId, false);
+ assertEquals(false, client.getInstanceServices().isApiTerminationDisabledForInstanceInRegion(null, instanceId));
}
private void tryToChangeStuff() {
@@ -262,8 +231,7 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest {
private void setUserDataForInstanceInRegion() {
try {
- client.getInstanceServices().setUserDataForInstanceInRegion(null,
- instanceId, "test".getBytes());
+ client.getInstanceServices().setUserDataForInstanceInRegion(null, instanceId, "test".getBytes());
assert false : "shouldn't be allowed, as instance needs to be stopped";
} catch (AWSResponseException e) {
assertEquals("IncorrectInstanceState", e.getError().getCode());
@@ -272,10 +240,8 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest {
private void setRamdiskForInstanceInRegion() {
try {
- String ramdisk = client.getInstanceServices()
- .getRamdiskForInstanceInRegion(null, instanceId);
- client.getInstanceServices().setRamdiskForInstanceInRegion(null,
- instanceId, ramdisk);
+ String ramdisk = client.getInstanceServices().getRamdiskForInstanceInRegion(null, instanceId);
+ client.getInstanceServices().setRamdiskForInstanceInRegion(null, instanceId, ramdisk);
assert false : "shouldn't be allowed, as instance needs to be stopped";
} catch (AWSResponseException e) {
assertEquals("IncorrectInstanceState", e.getError().getCode());
@@ -284,10 +250,8 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest {
private void setKernelForInstanceInRegion() {
try {
- String oldKernel = client.getInstanceServices()
- .getKernelForInstanceInRegion(null, instanceId);
- client.getInstanceServices().setKernelForInstanceInRegion(null,
- instanceId, oldKernel);
+ String oldKernel = client.getInstanceServices().getKernelForInstanceInRegion(null, instanceId);
+ client.getInstanceServices().setKernelForInstanceInRegion(null, instanceId, oldKernel);
assert false : "shouldn't be allowed, as instance needs to be stopped";
} catch (AWSResponseException e) {
assertEquals("IncorrectInstanceState", e.getError().getCode());
@@ -296,8 +260,7 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest {
private void setInstanceTypeForInstanceInRegion() {
try {
- client.getInstanceServices().setInstanceTypeForInstanceInRegion(null,
- instanceId, InstanceType.C1_MEDIUM);
+ client.getInstanceServices().setInstanceTypeForInstanceInRegion(null, instanceId, InstanceType.C1_MEDIUM);
assert false : "shouldn't be allowed, as instance needs to be stopped";
} catch (AWSResponseException e) {
assertEquals("IncorrectInstanceState", e.getError().getCode());
@@ -307,8 +270,7 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest {
private void setBlockDeviceMappingForInstanceInRegion() {
BlockDeviceMapping blockDeviceMapping = new BlockDeviceMapping();
try {
- client.getInstanceServices().setBlockDeviceMappingForInstanceInRegion(
- null, instanceId, blockDeviceMapping);
+ client.getInstanceServices().setBlockDeviceMappingForInstanceInRegion(null, instanceId, blockDeviceMapping);
assert false : "shouldn't be allowed, as instance needs to be ebs based-ami";
} catch (AWSResponseException e) {
assertEquals("InvalidParameterCombination", e.getError().getCode());
@@ -317,9 +279,8 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest {
private void setInstanceInitiatedShutdownBehaviorForInstanceInRegion() {
try {
- client.getInstanceServices()
- .setInstanceInitiatedShutdownBehaviorForInstanceInRegion(null,
- instanceId, InstanceInitiatedShutdownBehavior.STOP);
+ client.getInstanceServices().setInstanceInitiatedShutdownBehaviorForInstanceInRegion(null, instanceId,
+ InstanceInitiatedShutdownBehavior.STOP);
assert false : "shouldn't be allowed, as instance needs to be ebs based-ami";
} catch (AWSResponseException e) {
assertEquals("UnsupportedInstanceAttribute", e.getError().getCode());
@@ -327,22 +288,19 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest {
}
@Test(enabled = false, dependsOnMethods = "testCreateRunningInstance")
- void testReboot() throws InterruptedException, ExecutionException,
- TimeoutException, IOException {
+ void testReboot() throws InterruptedException, ExecutionException, TimeoutException, IOException {
RunningInstance instance = getInstance(instanceId);
- System.out.printf("%d: %s rebooting instance %n", System
- .currentTimeMillis(), instanceId);
+ System.out.printf("%d: %s rebooting instance %n", System.currentTimeMillis(), instanceId);
client.getInstanceServices().rebootInstancesInRegion(null, instanceId);
Thread.sleep(1000);
instance = getInstance(instanceId);
blockUntilWeCanSshIntoInstance(instance);
- SshClient ssh = sshFactory.create(new IPSocket(instance.getIpAddress(),
- 22), "root", keyPair.getKeyMaterial().getBytes());
+ SshClient ssh = sshFactory.create(new IPSocket(instance.getIpAddress(), 22), "root", keyPair.getKeyMaterial()
+ .getBytes());
try {
ssh.connect();
ExecResponse uptime = ssh.exec("uptime");
- assert uptime.getOutput().indexOf("0 min") != -1 : "reboot didn't work: "
- + uptime;
+ assert uptime.getOutput().indexOf("0 min") != -1 : "reboot didn't work: " + uptime;
} finally {
if (ssh != null)
ssh.disconnect();
@@ -350,86 +308,70 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest {
}
@Test(enabled = false, dependsOnMethods = "testReboot")
- void testElasticIpAddress() throws InterruptedException, ExecutionException,
- TimeoutException, IOException {
- address = client.getElasticIPAddressServices().allocateAddressInRegion(
- null);
+ void testElasticIpAddress() throws InterruptedException, ExecutionException, TimeoutException, IOException {
+ address = client.getElasticIPAddressServices().allocateAddressInRegion(null);
assertNotNull(address);
- PublicIpInstanceIdPair compare = Iterables.getLast(client
- .getElasticIPAddressServices().describeAddressesInRegion(null,
- address));
+ PublicIpInstanceIdPair compare = Iterables.getLast(client.getElasticIPAddressServices()
+ .describeAddressesInRegion(null, address));
assertEquals(compare.getPublicIp(), address);
assert compare.getInstanceId() == null;
- client.getElasticIPAddressServices().associateAddressInRegion(null,
- address, instanceId);
+ client.getElasticIPAddressServices().associateAddressInRegion(null, address, instanceId);
- compare = Iterables.getLast(client.getElasticIPAddressServices()
- .describeAddressesInRegion(null, address));
+ compare = Iterables.getLast(client.getElasticIPAddressServices().describeAddressesInRegion(null, address));
assertEquals(compare.getPublicIp(), address);
assertEquals(compare.getInstanceId(), instanceId);
- Reservation reservation = Iterables.getOnlyElement(client
- .getInstanceServices().describeInstancesInRegion(null, instanceId));
+ Reservation reservation = Iterables.getOnlyElement(client.getInstanceServices()
+ .describeInstancesInRegion(null, instanceId));
assertNotNull(Iterables.getOnlyElement(reservation).getIpAddress());
- assertFalse(Iterables.getOnlyElement(reservation).getIpAddress().equals(
- address));
+ assertFalse(Iterables.getOnlyElement(reservation).getIpAddress().equals(address));
doCheckKey(address);
- client.getElasticIPAddressServices().disassociateAddressInRegion(null,
- address);
+ client.getElasticIPAddressServices().disassociateAddressInRegion(null, address);
- compare = Iterables.getLast(client.getElasticIPAddressServices()
- .describeAddressesInRegion(null, address));
+ compare = Iterables.getLast(client.getElasticIPAddressServices().describeAddressesInRegion(null, address));
assertEquals(compare.getPublicIp(), address);
assert compare.getInstanceId() == null;
- reservation = Iterables.getOnlyElement(client.getInstanceServices()
- .describeInstancesInRegion(null, instanceId));
+ reservation = Iterables.getOnlyElement(client.getInstanceServices().describeInstancesInRegion(null, instanceId));
// assert reservation.getRunningInstances().last().getIpAddress() == null;
// TODO
}
- private RunningInstance blockUntilWeCanSshIntoInstance(
- RunningInstance instance) throws UnknownHostException {
- System.out.printf("%d: %s awaiting instance to run %n", System
- .currentTimeMillis(), instance.getId());
+ private RunningInstance blockUntilWeCanSshIntoInstance(RunningInstance instance) throws UnknownHostException {
+ System.out.printf("%d: %s awaiting instance to run %n", System.currentTimeMillis(), instance.getId());
assert runningTester.apply(instance);
instance = getInstance(instance.getId());
- System.out.printf("%d: %s awaiting instance to have ip assigned %n",
- System.currentTimeMillis(), instance.getId());
+ System.out
+ .printf("%d: %s awaiting instance to have ip assigned %n", System.currentTimeMillis(), instance.getId());
assert hasIpTester.apply(instance);
- System.out.printf("%d: %s awaiting ssh service to start%n", System
- .currentTimeMillis(), instance.getIpAddress());
+ System.out.printf("%d: %s awaiting ssh service to start%n", System.currentTimeMillis(), instance.getIpAddress());
assert socketTester.apply(new IPSocket(instance.getIpAddress(), 22));
- System.out.printf("%d: %s ssh service started%n", System
- .currentTimeMillis(), instance.getDnsName());
+ System.out.printf("%d: %s ssh service started%n", System.currentTimeMillis(), instance.getDnsName());
sshPing(instance);
- System.out.printf("%d: %s ssh connection made%n", System
- .currentTimeMillis(), instance.getId());
+ System.out.printf("%d: %s ssh connection made%n", System.currentTimeMillis(), instance.getId());
- System.out.printf("%d: %s awaiting http service to start%n", System
- .currentTimeMillis(), instance.getIpAddress());
+ System.out.printf("%d: %s awaiting http service to start%n", System.currentTimeMillis(), instance.getIpAddress());
assert socketTester.apply(new IPSocket(instance.getIpAddress(), 80));
- System.out.printf("%d: %s http service started%n", System
- .currentTimeMillis(), instance.getDnsName());
+ System.out.printf("%d: %s http service started%n", System.currentTimeMillis(), instance.getDnsName());
return instance;
}
private RunningInstance getInstance(String instanceId) {
// search my identity for the instance I just created
- Set reservations = client.getInstanceServices()
- .describeInstancesInRegion(null, instanceId); // last parameter
+ Set> reservations = client.getInstanceServices()
+ .describeInstancesInRegion(null, instanceId); // last parameter
// (ids) narrows the
// search
@@ -437,8 +379,7 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest {
}
/**
- * this tests "personality" as the file looked up was sent during instance
- * creation
+ * this tests "personality" as the file looked up was sent during instance creation
*
* @throws UnknownHostException
*/
@@ -454,14 +395,12 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest {
}
}
- private void doCheckKey(RunningInstance newDetails)
- throws UnknownHostException {
+ private void doCheckKey(RunningInstance newDetails) throws UnknownHostException {
doCheckKey(newDetails.getIpAddress());
}
private void doCheckKey(String address) {
- SshClient ssh = sshFactory.create(new IPSocket(address, 22), "root",
- keyPair.getKeyMaterial().getBytes());
+ SshClient ssh = sshFactory.create(new IPSocket(address, 22), "root", keyPair.getKeyMaterial().getBytes());
try {
ssh.connect();
ExecResponse hello = ssh.exec("echo hello");
@@ -473,20 +412,15 @@ public class CloudApplicationArchitecturesEC2ClientLiveTest {
}
@AfterTest
- void cleanup() throws InterruptedException, ExecutionException,
- TimeoutException {
+ void cleanup() throws InterruptedException, ExecutionException, TimeoutException {
if (address != null)
- client.getElasticIPAddressServices().releaseAddressInRegion(null,
- address);
+ client.getElasticIPAddressServices().releaseAddressInRegion(null, address);
if (instanceId != null)
- client.getInstanceServices().terminateInstancesInRegion(null,
- instanceId);
+ client.getInstanceServices().terminateInstancesInRegion(null, instanceId);
if (keyPair != null)
- client.getKeyPairServices().deleteKeyPairInRegion(null,
- keyPair.getKeyName());
+ client.getKeyPairServices().deleteKeyPairInRegion(null, keyPair.getKeyName());
if (securityGroupName != null)
- client.getSecurityGroupServices().deleteSecurityGroupInRegion(null,
- securityGroupName);
+ client.getSecurityGroupServices().deleteSecurityGroupInRegion(null, securityGroupName);
}
}
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/EBSBootEC2ClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/EBSBootEC2ClientLiveTest.java
index 4a5888be03..adf5bb79ad 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/EBSBootEC2ClientLiveTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/EBSBootEC2ClientLiveTest.java
@@ -81,8 +81,8 @@ import com.google.inject.Module;
import com.google.inject.internal.ImmutableMap;
/**
- * Adapted from the following sources: {@link http://gist.github.com/249915},
- * {@link http ://www.capsunlock.net/2009/12/create-ebs-boot-ami.html}
+ * Adapted from the following sources: {@link http://gist.github.com/249915}, {@link http
+ * ://www.capsunlock.net/2009/12/create-ebs-boot-ami.html}
*
*
* Generally disabled, as it incurs higher fees.
@@ -123,7 +123,7 @@ public class EBSBootEC2ClientLiveTest {
String identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity");
String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential");
Injector injector = new RestContextFactory().createContextBuilder("ec2", identity, credential,
- ImmutableSet. of(new Log4JLoggingModule())).buildInjector();
+ ImmutableSet. of(new Log4JLoggingModule())).buildInjector();
client = injector.getInstance(EC2Client.class);
sshFactory = injector.getInstance(SshClient.Factory.class);
SocketOpen socketOpen = injector.getInstance(SocketOpen.class);
@@ -139,7 +139,7 @@ public class EBSBootEC2ClientLiveTest {
attachTester = new RetryablePredicate(volumeAttached, 60, 1, TimeUnit.SECONDS);
runningTester = new RetryablePredicate(new InstanceStateRunning(client), 180, 5,
- TimeUnit.SECONDS);
+ TimeUnit.SECONDS);
InstanceStateStopped instanceStateStopped = injector.getInstance(InstanceStateStopped.class);
stoppedTester = new RetryablePredicate(instanceStateStopped, 60, 1, TimeUnit.SECONDS);
@@ -161,11 +161,11 @@ public class EBSBootEC2ClientLiveTest {
client.getSecurityGroupServices().createSecurityGroupInRegion(null, securityGroupName, securityGroupName);
client.getSecurityGroupServices().authorizeSecurityGroupIngressInRegion(null, securityGroupName, IpProtocol.TCP,
- 80, 80, "0.0.0.0/0");
+ 80, 80, "0.0.0.0/0");
client.getSecurityGroupServices().authorizeSecurityGroupIngressInRegion(null, securityGroupName, IpProtocol.TCP,
- 443, 443, "0.0.0.0/0");
+ 443, 443, "0.0.0.0/0");
client.getSecurityGroupServices().authorizeSecurityGroupIngressInRegion(null, securityGroupName, IpProtocol.TCP,
- 22, 22, "0.0.0.0/0");
+ 22, 22, "0.0.0.0/0");
}
@Test(enabled = false)
@@ -194,19 +194,20 @@ public class EBSBootEC2ClientLiveTest {
while (instance == null) {
try {
System.out.printf("%d: running instance%n", System.currentTimeMillis());
- Reservation reservation = client.getInstanceServices().runInstancesInRegion(null, null, // allow
- // ec2
- // to
- // chose
- // an
- // availability
- // zone
- imageId, 1, // minimum instances
- 1, // maximum instances
- withKeyName(keyPair.getKeyName())// key I created above
- .asType(InstanceType.M1_SMALL)// smallest instance
- // size
- .withSecurityGroup(securityGroupName));// group I
+ Reservation reservation = client.getInstanceServices().runInstancesInRegion(
+ null, null, // allow
+ // ec2
+ // to
+ // chose
+ // an
+ // availability
+ // zone
+ imageId, 1, // minimum instances
+ 1, // maximum instances
+ withKeyName(keyPair.getKeyName())// key I created above
+ .asType(InstanceType.M1_SMALL)// smallest instance
+ // size
+ .withSecurityGroup(securityGroupName));// group I
// created
// above
instance = Iterables.getOnlyElement(reservation);
@@ -225,13 +226,13 @@ public class EBSBootEC2ClientLiveTest {
@Test(enabled = false, dependsOnMethods = "testCreateRunningInstance")
void testCreateAndAttachVolume() {
volume = client.getElasticBlockStoreServices().createVolumeInAvailabilityZone(instance.getAvailabilityZone(),
- VOLUME_SIZE);
+ VOLUME_SIZE);
System.out.printf("%d: %s awaiting volume to become available%n", System.currentTimeMillis(), volume.getId());
assert volumeTester.apply(volume);
Attachment attachment = client.getElasticBlockStoreServices().attachVolumeInRegion(instance.getRegion(),
- volume.getId(), instance.getId(), "/dev/sdh");
+ volume.getId(), instance.getId(), "/dev/sdh");
System.out.printf("%d: %s awaiting attachment to complete%n", System.currentTimeMillis(), attachment.getId());
@@ -245,35 +246,35 @@ public class EBSBootEC2ClientLiveTest {
void makeScript() {
mkEbsBoot = new InitBuilder(
- "mkebsboot",// name of the script
- "/tmp",// working directory
- "/tmp/logs",// location of stdout.log and stderr.log
- ImmutableMap.of("imageDir", "/mnt/tmp", "ebsDevice", "/dev/sdh", "ebsMountPoint", "/mnt/ebs"),// variables
- // used
- // inside
- // of
- // the
- // script
- "echo creating a filesystem and mounting the ebs volume",// what to
- // execute
- "{md} {varl}IMAGE_DIR{varr} {varl}EBS_MOUNT_POINT{varr}",
- "rm -rf {varl}IMAGE_DIR{varr}/*",
- "yes| mkfs -t ext3 {varl}EBS_DEVICE{varr} 2>&-",
- "mount {varl}EBS_DEVICE{varr} {varl}EBS_MOUNT_POINT{varr}",
- "echo making a local working copy of the boot disk",
- "rsync -ax --exclude /ubuntu/.bash_history --exclude /home/*/.bash_history --exclude /etc/ssh/ssh_host_* --exclude /etc/ssh/moduli --exclude /etc/udev/rules.d/*persistent-net.rules --exclude /var/lib/ec2/* --exclude=/mnt/* --exclude=/proc/* --exclude=/tmp/* --exclude=/dev/log / {varl}IMAGE_DIR{varr}",
- "echo preparing the local working copy", "touch {varl}IMAGE_DIR{varr}/etc/init.d/ec2-init-user-data",
- "echo copying the local working copy to the ebs mount", "{cd} {varl}IMAGE_DIR{varr}",
- "tar -cSf - * | tar xf - -C {varl}EBS_MOUNT_POINT{varr}", "echo size of ebs",
- "du -sk {varl}EBS_MOUNT_POINT{varr}", "echo size of source", "du -sk {varl}IMAGE_DIR{varr}",
- "rm -rf {varl}IMAGE_DIR{varr}/*", "umount {varl}EBS_MOUNT_POINT{varr}", "echo " + SCRIPT_END)
- .build(OsFamily.UNIX);
+ "mkebsboot",// name of the script
+ "/tmp",// working directory
+ "/tmp/logs",// location of stdout.log and stderr.log
+ ImmutableMap.of("imageDir", "/mnt/tmp", "ebsDevice", "/dev/sdh", "ebsMountPoint", "/mnt/ebs"),// variables
+ // used
+ // inside
+ // of
+ // the
+ // script
+ "echo creating a filesystem and mounting the ebs volume",// what to
+ // execute
+ "{md} {varl}IMAGE_DIR{varr} {varl}EBS_MOUNT_POINT{varr}",
+ "rm -rf {varl}IMAGE_DIR{varr}/*",
+ "yes| mkfs -t ext3 {varl}EBS_DEVICE{varr} 2>&-",
+ "mount {varl}EBS_DEVICE{varr} {varl}EBS_MOUNT_POINT{varr}",
+ "echo making a local working copy of the boot disk",
+ "rsync -ax --exclude /ubuntu/.bash_history --exclude /home/*/.bash_history --exclude /etc/ssh/ssh_host_* --exclude /etc/ssh/moduli --exclude /etc/udev/rules.d/*persistent-net.rules --exclude /var/lib/ec2/* --exclude=/mnt/* --exclude=/proc/* --exclude=/tmp/* --exclude=/dev/log / {varl}IMAGE_DIR{varr}",
+ "echo preparing the local working copy", "touch {varl}IMAGE_DIR{varr}/etc/init.d/ec2-init-user-data",
+ "echo copying the local working copy to the ebs mount", "{cd} {varl}IMAGE_DIR{varr}",
+ "tar -cSf - * | tar xf - -C {varl}EBS_MOUNT_POINT{varr}", "echo size of ebs",
+ "du -sk {varl}EBS_MOUNT_POINT{varr}", "echo size of source", "du -sk {varl}IMAGE_DIR{varr}",
+ "rm -rf {varl}IMAGE_DIR{varr}/*", "umount {varl}EBS_MOUNT_POINT{varr}", "echo " + SCRIPT_END)
+ .build(OsFamily.UNIX);
}
@Test(enabled = false, dependsOnMethods = "testCreateAndAttachVolume")
void testBundleInstance() {
SshClient ssh = sshFactory.create(new IPSocket(instance.getIpAddress(), 22), "ubuntu", keyPair.getKeyMaterial()
- .getBytes());
+ .getBytes());
try {
ssh.connect();
} catch (SshException e) {// try twice in case there is a network timeout
@@ -298,7 +299,7 @@ public class EBSBootEC2ClientLiveTest {
assert !output.getOutput().trim().equals("") : output;
RetryablePredicate scriptTester = new RetryablePredicate(new ScriptTester(ssh, SCRIPT_END),
- 600, 10, TimeUnit.SECONDS);
+ 600, 10, TimeUnit.SECONDS);
scriptTester.apply(script);
} finally {
if (ssh != null)
@@ -328,7 +329,7 @@ public class EBSBootEC2ClientLiveTest {
output = ssh.exec(script + " tailerr");
String stderr = output.getOutput().trim();
throw new RuntimeException(String.format(
- "script %s ended without token: stdout.log: [%s]; stderr.log: [%s]; ", script, stdout, stderr));
+ "script %s ended without token: stdout.log: [%s]; stderr.log: [%s]; ", script, stdout, stderr));
}
}
return false;
@@ -339,7 +340,7 @@ public class EBSBootEC2ClientLiveTest {
@Test(enabled = false, dependsOnMethods = "testBundleInstance")
void testAMIFromBundle() {
volume = Iterables.getOnlyElement(client.getElasticBlockStoreServices().describeVolumesInRegion(
- volume.getRegion(), volume.getId()));
+ volume.getRegion(), volume.getId()));
if (volume.getAttachments().size() > 0) {
// should be cleanly unmounted, so force is not necessary.
client.getElasticBlockStoreServices().detachVolumeInRegion(instance.getRegion(), volume.getId(), false);
@@ -350,31 +351,31 @@ public class EBSBootEC2ClientLiveTest {
// detach
}
snapshot = client.getElasticBlockStoreServices().createSnapshotInRegion(volume.getRegion(), volume.getId(),
- withDescription("EBS Ubuntu Hardy"));
+ withDescription("EBS Ubuntu Hardy"));
System.out.printf("%d: %s awaiting snapshot to complete%n", System.currentTimeMillis(), snapshot.getId());
assert snapshotTester.apply(snapshot);
Image image = Iterables.getOnlyElement(client.getAMIServices().describeImagesInRegion(snapshot.getRegion(),
- imageIds(IMAGE_ID)));
+ imageIds(IMAGE_ID)));
String description = image.getDescription() == null ? "jclouds" : image.getDescription();
System.out.printf("%d: %s creating ami from snapshot%n", System.currentTimeMillis(), snapshot.getId());
String amiId = client.getAMIServices().registerUnixImageBackedByEbsInRegion(
- snapshot.getRegion(),
- "ebsboot-" + image.getId(),
- snapshot.getId(),
- withKernelId(image.getKernelId()).withRamdisk(image.getRamdiskId()).withDescription(description)
- .asArchitecture(Architecture.I386));
+ snapshot.getRegion(),
+ "ebsboot-" + image.getId(),
+ snapshot.getId(),
+ withKernelId(image.getKernelId()).withRamdisk(image.getRamdiskId()).withDescription(description)
+ .asArchitecture(Architecture.I386));
try {
ebsImage = Iterables.getOnlyElement(client.getAMIServices().describeImagesInRegion(snapshot.getRegion(),
- imageIds(amiId)));
+ imageIds(amiId)));
} catch (AWSResponseException e) {
// TODO add a retry handler for this HTTP code 400 and the below error
if (e.getError().getClass().equals("InvalidAMIID.NotFound"))
ebsImage = Iterables.getOnlyElement(client.getAMIServices().describeImagesInRegion(snapshot.getRegion(),
- imageIds(amiId)));
+ imageIds(amiId)));
else
throw e;
}
@@ -402,7 +403,7 @@ public class EBSBootEC2ClientLiveTest {
assertEquals(ebsImage.getRootDeviceType(), RootDeviceType.EBS);
assertEquals(ebsImage.getRootDeviceName(), "/dev/sda1");
assertEquals(ebsImage.getEbsBlockDevices().entrySet(), ImmutableMap.of("/dev/sda1",
- new Image.EbsBlockDevice(snapshot.getId(), VOLUME_SIZE, true)).entrySet());
+ new Image.EbsBlockDevice(snapshot.getId(), VOLUME_SIZE, true)).entrySet());
}
private void tryToChangeStuff() {
@@ -433,12 +434,12 @@ public class EBSBootEC2ClientLiveTest {
private void setInstanceTypeForInstanceInRegion() {
client.getInstanceServices()
- .setInstanceTypeForInstanceInRegion(null, ebsInstance.getId(), InstanceType.C1_MEDIUM);
+ .setInstanceTypeForInstanceInRegion(null, ebsInstance.getId(), InstanceType.C1_MEDIUM);
assertEquals(InstanceType.C1_MEDIUM, client.getInstanceServices().getInstanceTypeForInstanceInRegion(null,
- ebsInstance.getId()));
+ ebsInstance.getId()));
client.getInstanceServices().setInstanceTypeForInstanceInRegion(null, ebsInstance.getId(), InstanceType.M1_SMALL);
assertEquals(InstanceType.M1_SMALL, client.getInstanceServices().getInstanceTypeForInstanceInRegion(null,
- ebsInstance.getId()));
+ ebsInstance.getId()));
}
private void setBlockDeviceMappingForInstanceInRegion() {
@@ -448,10 +449,10 @@ public class EBSBootEC2ClientLiveTest {
blockDeviceMapping.addEbsBlockDevice("/dev/sda1", new RunningInstance.EbsBlockDevice(volumeId, false));
try {
client.getInstanceServices().setBlockDeviceMappingForInstanceInRegion(null, ebsInstance.getId(),
- blockDeviceMapping);
+ blockDeviceMapping);
Map devices = client.getInstanceServices()
- .getBlockDeviceMappingForInstanceInRegion(null, ebsInstance.getId());
+ .getBlockDeviceMappingForInstanceInRegion(null, ebsInstance.getId());
assertEquals(devices.size(), 1);
String deviceName = Iterables.getOnlyElement(devices.keySet());
RunningInstance.EbsBlockDevice device = Iterables.getOnlyElement(devices.values());
@@ -472,15 +473,15 @@ public class EBSBootEC2ClientLiveTest {
try {
client.getInstanceServices().setInstanceInitiatedShutdownBehaviorForInstanceInRegion(null,
- ebsInstance.getId(), InstanceInitiatedShutdownBehavior.STOP);
+ ebsInstance.getId(), InstanceInitiatedShutdownBehavior.STOP);
assertEquals(InstanceInitiatedShutdownBehavior.STOP, client.getInstanceServices()
- .getInstanceInitiatedShutdownBehaviorForInstanceInRegion(null, ebsInstance.getId()));
+ .getInstanceInitiatedShutdownBehaviorForInstanceInRegion(null, ebsInstance.getId()));
client.getInstanceServices().setInstanceInitiatedShutdownBehaviorForInstanceInRegion(null,
- ebsInstance.getId(), InstanceInitiatedShutdownBehavior.TERMINATE);
+ ebsInstance.getId(), InstanceInitiatedShutdownBehavior.TERMINATE);
assertEquals(InstanceInitiatedShutdownBehavior.TERMINATE, client.getInstanceServices()
- .getInstanceInitiatedShutdownBehaviorForInstanceInRegion(null, ebsInstance.getId()));
+ .getInstanceInitiatedShutdownBehaviorForInstanceInRegion(null, ebsInstance.getId()));
System.out.println("OK: setInstanceInitiatedShutdownBehaviorForInstanceInRegion");
} catch (Exception e) {
System.err.println("setInstanceInitiatedShutdownBehaviorForInstanceInRegion");
@@ -489,8 +490,7 @@ public class EBSBootEC2ClientLiveTest {
}
/**
- * this tests "personality" as the file looked up was sent during instance
- * creation
+ * this tests "personality" as the file looked up was sent during instance creation
*
* @throws UnknownHostException
*/
@@ -527,8 +527,8 @@ public class EBSBootEC2ClientLiveTest {
assert runningTester.apply(instance);
// search my identity for the instance I just created
- Set reservations = client.getInstanceServices().describeInstancesInRegion(instance.getRegion(),
- instance.getId()); // last
+ Set> reservations = client.getInstanceServices()
+ .describeInstancesInRegion(instance.getRegion(), instance.getId()); // last
// parameter
// (ids)
// narrows
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/functions/RegionAndIdToImageTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/functions/RegionAndIdToImageTest.java
index ce8d96f8f5..b2a64744b0 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/functions/RegionAndIdToImageTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/functions/RegionAndIdToImageTest.java
@@ -43,6 +43,7 @@ import com.google.common.collect.ImmutableSet;
@Test(groups = "unit", testName = "ec2.RegionAndIdToImageTest")
public class RegionAndIdToImageTest {
+ @SuppressWarnings("unchecked")
@Test
public void testApply() {
@@ -51,11 +52,11 @@ public class RegionAndIdToImageTest {
AMIClient client = createMock(AMIClient.class);
org.jclouds.aws.ec2.domain.Image ec2Image = createMock(org.jclouds.aws.ec2.domain.Image.class);
Image image = createNiceMock(Image.class);
- Set images = ImmutableSet
+ Set images = ImmutableSet
. of(ec2Image);
expect(caller.getAMIServices()).andReturn(client).atLeastOnce();
- expect(client.describeImagesInRegion("region", imageIds("ami"))).andReturn(images);
+ expect(client.describeImagesInRegion("region", imageIds("ami"))).andReturn((Set)images);
expect(parser.apply(ec2Image)).andReturn(image);
replay(caller);
@@ -74,6 +75,7 @@ public class RegionAndIdToImageTest {
}
+ @SuppressWarnings("unchecked")
@Test
public void testApplyNotFound() {
@@ -82,11 +84,11 @@ public class RegionAndIdToImageTest {
AMIClient client = createMock(AMIClient.class);
org.jclouds.aws.ec2.domain.Image ec2Image = createMock(org.jclouds.aws.ec2.domain.Image.class);
Image image = createNiceMock(Image.class);
- Set images = ImmutableSet
+ Set images = ImmutableSet
. of(ec2Image);
expect(caller.getAMIServices()).andReturn(client).atLeastOnce();
- expect(client.describeImagesInRegion("region", imageIds("ami"))).andReturn(images);
+ expect(client.describeImagesInRegion("region", imageIds("ami"))).andReturn((Set)images);
expect(parser.apply(ec2Image)).andThrow(new ResourceNotFoundException());
replay(caller);
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java
index 27e1e94f06..227d0d665f 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java
@@ -58,8 +58,7 @@ import com.google.common.collect.ImmutableSet;
*/
@Test(groups = "unit", testName = "ec2.RunningInstanceToNodeMetadataTest")
public class RunningInstanceToNodeMetadataTest {
- private static class ImageProvider implements
- Provider> {
+ private static class ImageProvider implements Provider> {
private final Set images;
private ImageProvider(org.jclouds.compute.domain.Image jcImage) {
@@ -117,8 +116,8 @@ public class RunningInstanceToNodeMetadataTest {
replay(credentialProvider);
replay(instance);
- RunningInstanceToNodeMetadata parser = new RunningInstanceToNodeMetadata(client,
- credentialsMap, credentialProvider, new ImageProvider(jcImage), imageMap, locations,
+ RunningInstanceToNodeMetadata parser = new RunningInstanceToNodeMetadata(client, credentialsMap,
+ credentialProvider, new ImageProvider(jcImage), imageMap, locations,
new RunningInstanceToStorageMappingUnix());
NodeMetadata metadata = parser.apply(instance);
@@ -168,8 +167,8 @@ public class RunningInstanceToNodeMetadataTest {
expect(jcImage.getProviderId()).andReturn("notImageId").atLeastOnce();
expect(instance.getRegion()).andReturn("us-east-1").atLeastOnce();
- expect(imageMap.get(new RegionAndName("us-east-1", "imageId"))).andThrow(
- new NullPointerException()).atLeastOnce();
+ expect(imageMap.get(new RegionAndName("us-east-1", "imageId"))).andThrow(new NullPointerException())
+ .atLeastOnce();
expect(instance.getInstanceType()).andReturn(InstanceType.C1_XLARGE).atLeastOnce();
@@ -181,8 +180,8 @@ public class RunningInstanceToNodeMetadataTest {
replay(credentialProvider);
replay(instance);
- RunningInstanceToNodeMetadata parser = new RunningInstanceToNodeMetadata(client,
- credentialsMap, credentialProvider, new ImageProvider(jcImage), imageMap, locations,
+ RunningInstanceToNodeMetadata parser = new RunningInstanceToNodeMetadata(client, credentialsMap,
+ credentialProvider, new ImageProvider(jcImage), imageMap, locations,
new RunningInstanceToStorageMappingUnix());
NodeMetadata metadata = parser.apply(instance);
@@ -234,8 +233,7 @@ public class RunningInstanceToNodeMetadataTest {
org.jclouds.compute.domain.Image lateImage = createMock(org.jclouds.compute.domain.Image.class);
- expect(imageMap.get(new RegionAndName("us-east-1", "imageId"))).andReturn(lateImage)
- .atLeastOnce();
+ expect(imageMap.get(new RegionAndName("us-east-1", "imageId"))).andReturn(lateImage).atLeastOnce();
expect(instance.getInstanceType()).andReturn(InstanceType.C1_XLARGE).atLeastOnce();
@@ -248,8 +246,8 @@ public class RunningInstanceToNodeMetadataTest {
replay(credentialProvider);
replay(instance);
- RunningInstanceToNodeMetadata parser = new RunningInstanceToNodeMetadata(client,
- credentialsMap, credentialProvider, new ImageProvider(jcImage), imageMap, locations,
+ RunningInstanceToNodeMetadata parser = new RunningInstanceToNodeMetadata(client, credentialsMap,
+ credentialProvider, new ImageProvider(jcImage), imageMap, locations,
new RunningInstanceToStorageMappingUnix());
NodeMetadata metadata = parser.apply(instance);
@@ -270,8 +268,7 @@ public class RunningInstanceToNodeMetadataTest {
@SuppressWarnings("unchecked")
@Test
- public void testApplyWithNoSecurityGroupCreatesTagOfIdPrefixedByTagAndNullCredentials()
- throws UnknownHostException {
+ public void testApplyWithNoSecurityGroupCreatesTagOfIdPrefixedByTagAndNullCredentials() throws UnknownHostException {
EC2Client client = createMock(EC2Client.class);
AMIClient amiClient = createMock(AMIClient.class);
Map credentialsMap = createMock(Map.class);
@@ -312,8 +309,8 @@ public class RunningInstanceToNodeMetadataTest {
replay(credentialProvider);
replay(instance);
- RunningInstanceToNodeMetadata parser = new RunningInstanceToNodeMetadata(client,
- credentialsMap, credentialProvider, new ImageProvider(jcImage), imageMap, locations,
+ RunningInstanceToNodeMetadata parser = new RunningInstanceToNodeMetadata(client, credentialsMap,
+ credentialProvider, new ImageProvider(jcImage), imageMap, locations,
new RunningInstanceToStorageMappingUnix());
NodeMetadata metadata = parser.apply(instance);
@@ -333,8 +330,7 @@ public class RunningInstanceToNodeMetadataTest {
@SuppressWarnings("unchecked")
@Test
- public void testApplyWithNoKeyPairCreatesTagOfParsedSecurityGroupAndNullCredentials()
- throws UnknownHostException {
+ public void testApplyWithNoKeyPairCreatesTagOfParsedSecurityGroupAndNullCredentials() throws UnknownHostException {
EC2Client client = createMock(EC2Client.class);
AMIClient amiClient = createMock(AMIClient.class);
Map credentialsMap = createMock(Map.class);
@@ -374,8 +370,8 @@ public class RunningInstanceToNodeMetadataTest {
replay(credentialProvider);
replay(instance);
- RunningInstanceToNodeMetadata parser = new RunningInstanceToNodeMetadata(client,
- credentialsMap, credentialProvider, new ImageProvider(jcImage), imageMap, locations,
+ RunningInstanceToNodeMetadata parser = new RunningInstanceToNodeMetadata(client, credentialsMap,
+ credentialProvider, new ImageProvider(jcImage), imageMap, locations,
new RunningInstanceToStorageMappingUnix());
NodeMetadata metadata = parser.apply(instance);
@@ -395,8 +391,7 @@ public class RunningInstanceToNodeMetadataTest {
@SuppressWarnings("unchecked")
@Test
- public void testApplyWithKeyPairCreatesTagOfParsedSecurityGroupAndCredentialsBasedOnIt()
- throws UnknownHostException {
+ public void testApplyWithKeyPairCreatesTagOfParsedSecurityGroupAndCredentialsBasedOnIt() throws UnknownHostException {
EC2Client client = createMock(EC2Client.class);
AMIClient amiClient = createMock(AMIClient.class);
expect(client.getAMIServices()).andReturn(amiClient).atLeastOnce();
@@ -429,7 +424,7 @@ public class RunningInstanceToNodeMetadataTest {
expect(jcImage.getLocation()).andReturn(location).atLeastOnce();
expect(amiClient.describeImagesInRegion(Region.US_EAST_1, imageIds("imageId"))).andReturn(
- ImmutableSet. of(image));
+ (Set) ImmutableSet. of(image));
expect(credentialProvider.execute(image)).andReturn(new Credentials("user", "pass"));
@@ -448,8 +443,8 @@ public class RunningInstanceToNodeMetadataTest {
replay(instance);
replay(jcImage);
- RunningInstanceToNodeMetadata parser = new RunningInstanceToNodeMetadata(client,
- credentialsMap, credentialProvider, new ImageProvider(jcImage), imageMap, locations,
+ RunningInstanceToNodeMetadata parser = new RunningInstanceToNodeMetadata(client, credentialsMap,
+ credentialProvider, new ImageProvider(jcImage), imageMap, locations,
new RunningInstanceToStorageMappingUnix());
NodeMetadata metadata = parser.apply(instance);
@@ -483,8 +478,7 @@ public class RunningInstanceToNodeMetadataTest {
Image image = createMock(Image.class);
expect(instance.getId()).andReturn("id").atLeastOnce();
- expect(instance.getGroupIds()).andReturn(ImmutableSet.of("jclouds1", "jclouds2"))
- .atLeastOnce();
+ expect(instance.getGroupIds()).andReturn(ImmutableSet.of("jclouds1", "jclouds2")).atLeastOnce();
expect(instance.getKeyName()).andReturn("jclouds#tag#us-east-1#50").atLeastOnce();
expect(instance.getInstanceState()).andReturn(InstanceState.RUNNING);
expect(instance.getVirtualizationType()).andReturn("paravirtual");
@@ -505,7 +499,7 @@ public class RunningInstanceToNodeMetadataTest {
expect(jcImage.getLocation()).andReturn(location).atLeastOnce();
expect(amiClient.describeImagesInRegion(Region.US_EAST_1, imageIds("imageId"))).andReturn(
- ImmutableSet. of(image));
+ (Set) ImmutableSet. of(image));
expect(credentialProvider.execute(image)).andReturn(new Credentials("user", "pass"));
@@ -524,8 +518,8 @@ public class RunningInstanceToNodeMetadataTest {
replay(instance);
replay(jcImage);
- RunningInstanceToNodeMetadata parser = new RunningInstanceToNodeMetadata(client,
- credentialsMap, credentialProvider, new ImageProvider(jcImage), imageMap, locations,
+ RunningInstanceToNodeMetadata parser = new RunningInstanceToNodeMetadata(client, credentialsMap,
+ credentialProvider, new ImageProvider(jcImage), imageMap, locations,
new RunningInstanceToStorageMappingUnix());
NodeMetadata metadata = parser.apply(instance);
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/strategy/EC2RunNodesAndAddToSetStrategyTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/strategy/EC2RunNodesAndAddToSetStrategyTest.java
index eb81b63ce0..bbcc49a8ba 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/strategy/EC2RunNodesAndAddToSetStrategyTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/strategy/EC2RunNodesAndAddToSetStrategyTest.java
@@ -60,20 +60,17 @@ public class EC2RunNodesAndAddToSetStrategyTest {
@Test
public void testZoneAsALocation() {
- assertRegionAndZoneForLocation(ZONE_AP_SOUTHEAST_1A,
- Region.AP_SOUTHEAST_1, AvailabilityZone.AP_SOUTHEAST_1A);
+ assertRegionAndZoneForLocation(ZONE_AP_SOUTHEAST_1A, Region.AP_SOUTHEAST_1, AvailabilityZone.AP_SOUTHEAST_1A);
}
@Test
public void testRegionAsALocation() {
- assertRegionAndZoneForLocation(REGION_AP_SOUTHEAST_1,
- Region.AP_SOUTHEAST_1, null);
+ assertRegionAndZoneForLocation(REGION_AP_SOUTHEAST_1, Region.AP_SOUTHEAST_1, null);
}
// // fixtures
- public static Iterable containsNodeMetadata(
- final NodeMetadata in) {
+ public static Iterable containsNodeMetadata(final NodeMetadata in) {
reportMatcher(new IArgumentMatcher() {
@Override
@@ -92,8 +89,8 @@ public class EC2RunNodesAndAddToSetStrategyTest {
return null;
}
- private void assertRegionAndZoneForLocation(Location location,
- String region, String zone) {
+ @SuppressWarnings("unchecked")
+ private void assertRegionAndZoneForLocation(Location location, String region, String zone) {
String imageId = "ami1";
String instanceCreatedId = "instance1";
// setup mocks
@@ -102,37 +99,28 @@ public class EC2RunNodesAndAddToSetStrategyTest {
InstanceClient instanceClient = createMock(InstanceClient.class);
RunInstancesOptions ec2Options = createMock(RunInstancesOptions.class);
RunningInstance instance = createMock(RunningInstance.class);
- Reservation reservation = new Reservation(region, ImmutableSet
- . of(), ImmutableSet. of(instance),
- "ownerId", "requesterId", "reservationId");
+ Reservation reservation = new Reservation(region, ImmutableSet
+ . of(), ImmutableSet. of(instance), "ownerId", "requesterId", "reservationId");
NodeMetadata nodeMetadata = createMock(NodeMetadata.class);
// setup expectations
- expect(strategy.client.getInstanceServices()).andReturn(instanceClient)
- .atLeastOnce();
+ expect(strategy.client.getInstanceServices()).andReturn(instanceClient).atLeastOnce();
expect(
- strategy.createKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions
- .execute(region, input.tag, input.template)).andReturn(
- ec2Options);
- expect(input.template.getLocation()).andReturn(input.location)
- .atLeastOnce();
+ strategy.createKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.execute(region, input.tag,
+ input.template)).andReturn(ec2Options);
+ expect(input.template.getLocation()).andReturn(input.location).atLeastOnce();
expect(input.template.getImage()).andReturn(input.image).atLeastOnce();
expect(input.image.getProviderId()).andReturn(imageId).atLeastOnce();
- expect(
- instanceClient.runInstancesInRegion(region, zone, imageId, 1,
- input.count, ec2Options)).andReturn(reservation);
+ expect(instanceClient.runInstancesInRegion(region, zone, imageId, 1, input.count, ec2Options)).andReturn(
+ (Reservation)reservation);
expect(instance.getId()).andReturn(instanceCreatedId).atLeastOnce();
expect(strategy.instancePresent.apply(instance)).andReturn(true);
- expect(input.template.getOptions()).andReturn(input.options)
- .atLeastOnce();
+ expect(input.template.getOptions()).andReturn(input.options).atLeastOnce();
- expect(strategy.runningInstanceToNodeMetadata.apply(instance)).andReturn(
- nodeMetadata);
+ expect(strategy.runningInstanceToNodeMetadata.apply(instance)).andReturn(nodeMetadata);
expect(
- strategy.utils
- .runOptionsOnNodesAndAddToGoodSetOrPutExceptionIntoBadMap(
- eq(input.options), containsNodeMetadata(nodeMetadata),
- eq(input.nodes), eq(input.badNodes))).andReturn(null);
+ strategy.utils.runOptionsOnNodesAndAddToGoodSetOrPutExceptionIntoBadMap(eq(input.options),
+ containsNodeMetadata(nodeMetadata), eq(input.nodes), eq(input.badNodes))).andReturn(null);
// replay mocks
replay(instanceClient);
@@ -143,8 +131,7 @@ public class EC2RunNodesAndAddToSetStrategyTest {
replayStrategy(strategy);
// run
- strategy.execute(input.tag, input.count, input.template, input.nodes,
- input.badNodes);
+ strategy.execute(input.tag, input.count, input.template, input.nodes, input.badNodes);
// verify mocks
verify(instanceClient);
@@ -155,12 +142,10 @@ public class EC2RunNodesAndAddToSetStrategyTest {
verifyStrategy(strategy);
}
- private static final Location REGION_AP_SOUTHEAST_1 = new LocationImpl(
- LocationScope.REGION, Region.AP_SOUTHEAST_1, Region.AP_SOUTHEAST_1,
- new LocationImpl(LocationScope.PROVIDER, "ec2", "ec2", null));
- private static final Location ZONE_AP_SOUTHEAST_1A = new LocationImpl(
- LocationScope.ZONE, AvailabilityZone.AP_SOUTHEAST_1A,
- AvailabilityZone.AP_SOUTHEAST_1A, REGION_AP_SOUTHEAST_1);
+ private static final Location REGION_AP_SOUTHEAST_1 = new LocationImpl(LocationScope.REGION, Region.AP_SOUTHEAST_1,
+ Region.AP_SOUTHEAST_1, new LocationImpl(LocationScope.PROVIDER, "ec2", "ec2", null));
+ private static final Location ZONE_AP_SOUTHEAST_1A = new LocationImpl(LocationScope.ZONE,
+ AvailabilityZone.AP_SOUTHEAST_1A, AvailabilityZone.AP_SOUTHEAST_1A, REGION_AP_SOUTHEAST_1);
// /////////////////////////////////////////////////////////////////////
@SuppressWarnings("unchecked")
@@ -213,9 +198,8 @@ public class EC2RunNodesAndAddToSetStrategyTest {
Predicate instanceStateRunning = createMock(Predicate.class);
RunningInstanceToNodeMetadata runningInstanceToNodeMetadata = createMock(RunningInstanceToNodeMetadata.class);
ComputeUtils utils = createMock(ComputeUtils.class);
- return new EC2RunNodesAndAddToSetStrategy(client,
- createKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions,
- instanceStateRunning, runningInstanceToNodeMetadata, utils);
+ return new EC2RunNodesAndAddToSetStrategy(client, createKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions,
+ instanceStateRunning, runningInstanceToNodeMetadata, utils);
}
private void replayStrategy(EC2RunNodesAndAddToSetStrategy strategy) {
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/InstanceClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/InstanceClientLiveTest.java
index 8a50b45e26..39867e13b5 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/InstanceClientLiveTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/InstanceClientLiveTest.java
@@ -28,6 +28,7 @@ import org.jclouds.aws.domain.Region;
import org.jclouds.aws.ec2.EC2AsyncClient;
import org.jclouds.aws.ec2.EC2Client;
import org.jclouds.aws.ec2.domain.Reservation;
+import org.jclouds.aws.ec2.domain.RunningInstance;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
import org.jclouds.rest.RestContext;
import org.jclouds.rest.RestContextFactory;
@@ -64,9 +65,9 @@ public class InstanceClientLiveTest {
@Test
void testDescribeInstances() {
- for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1,
- Region.US_WEST_1, Region.AP_SOUTHEAST_1)) {
- Set allResults = client.describeInstancesInRegion(region);
+ for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, Region.US_WEST_1,
+ Region.AP_SOUTHEAST_1)) {
+ Set> allResults = client.describeInstancesInRegion(region);
assertNotNull(allResults);
assert allResults.size() >= 0 : allResults.size();
}
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/xml/DescribeInstancesResponseHandlerTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/xml/DescribeInstancesResponseHandlerTest.java
index 59bad9f49a..ebb08f6dee 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/xml/DescribeInstancesResponseHandlerTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/xml/DescribeInstancesResponseHandlerTest.java
@@ -66,10 +66,10 @@ public class DescribeInstancesResponseHandlerTest extends BaseEC2HandlerTest {
public void testWhenRunning() throws UnknownHostException {
InputStream is = getClass().getResourceAsStream("/ec2/describe_instances_running.xml");
- Set contents = Sets.newLinkedHashSet();
+ Set> contents = Sets.newLinkedHashSet();
- contents.add(new Reservation(defaultRegion, ImmutableSet.of("adriancole.ec2ingress"), ImmutableSet
- .of(new RunningInstance(defaultRegion, ImmutableSet.of("adriancole.ec2ingress"), "0",
+ contents.add(new Reservation(defaultRegion, ImmutableSet.of("adriancole.ec2ingress"),
+ ImmutableSet.of(new RunningInstance(defaultRegion, ImmutableSet.of("adriancole.ec2ingress"), "0",
"ec2-174-129-81-68.compute-1.amazonaws.com", "ami-1fd73376", "i-0799056f",
InstanceState.RUNNING, InstanceType.M1_SMALL, "174.129.81.68", "aki-a71cf9ce",
"adriancole.ec21", dateService.iso8601DateParse("2009-11-09T03:00:34.000Z"), false,
@@ -78,7 +78,7 @@ public class DescribeInstancesResponseHandlerTest extends BaseEC2HandlerTest {
RootDeviceType.INSTANCE_STORE, null, ImmutableMap. of())),
"993194456877", null, "r-a3c508cb"));
- Set result = getReservations(is);
+ Set> result = getReservations(is);
assertEquals(result, contents);
}
@@ -86,23 +86,25 @@ public class DescribeInstancesResponseHandlerTest extends BaseEC2HandlerTest {
public void testApplyInputStream() {
InputStream is = getClass().getResourceAsStream("/ec2/describe_instances.xml");
- Set contents = Sets.newLinkedHashSet();
+ Set> contents = Sets.newLinkedHashSet();
- contents.add(new Reservation(defaultRegion, ImmutableSet.of("default"), ImmutableSet.of(new RunningInstance(
- defaultRegion, ImmutableSet.of("default"), "23", "ec2-72-44-33-4.compute-1.amazonaws.com",
- "ami-6ea54007", "i-28a64341", InstanceState.RUNNING, InstanceType.M1_LARGE, (String) null,
- "aki-ba3adfd3", "example-key-name", dateService.iso8601DateParse("2007-08-07T11:54:42.000Z"), false,
- AvailabilityZone.US_EAST_1B, null, "paravirtual", null, "10-251-50-132.ec2.internal", null, ImmutableSet
- .of("774F4FF8"), "ari-badbad00", null, null, null, RootDeviceType.INSTANCE_STORE, null,
- ImmutableMap. of()), new RunningInstance(defaultRegion, ImmutableSet
- .of("default"), "23", "ec2-72-44-33-6.compute-1.amazonaws.com", "ami-6ea54007", "i-28a64435",
- InstanceState.RUNNING, InstanceType.M1_LARGE, (String) null, "aki-ba3adfd3", "example-key-name",
- dateService.iso8601DateParse("2007-08-07T11:54:42.000Z"), false, AvailabilityZone.US_EAST_1B, null,
- "paravirtual", null, "10-251-50-134.ec2.internal", null, ImmutableSet.of("774F4FF8"), "ari-badbad00",
- null, null, null, RootDeviceType.INSTANCE_STORE, null, ImmutableMap.