diff --git a/README.txt b/README.txt
index 4a000b28d2..d5bc557537 100644
--- a/README.txt
+++ b/README.txt
@@ -19,22 +19,26 @@
Overview:
-jclouds is an open source framework that helps you get started in the cloud
+jclouds is an open source library that helps you get started in the cloud
and reuse your java and clojure development skills. Our api allows you to
-freedom to use portable abstractions or cloud-specific features.
+freedom to use portable abstractions or cloud-specific features. We have
+two abstractions at the moment: compute and blobstore. compute helps you
+bootstrap machines in the cloud. blobstore helps you manage key-value
+data.
our current version is 1.0-beta-7
our dev version is 1.0-SNAPSHOT
-our compute api supports: ec2, gogrid, rackspace, rimuhosting, vcloud, trmk-ecloud,
- trmk-vcloudexpress, eucalyptus, bluelock-vclouddirector,
- bluelock-vcloudexpress, slicehost, stub (in-memory)
+our compute api supports: ec2, gogrid, cloudservers (rackspace), rimuhosting, vcloud,
+ trmk-ecloud, trmk-vcloudexpress, eucalyptus,
+ bluelock-vclouddirector, slicehost, stub (in-memory)
* note * the pom dependency org.jclouds/jclouds-allcompute gives you access to
to all of these providers
-our blobstore api supports: s3, rackspace, azure, atmos online, att synaptic,
- walrus, googlestorage, transient (in-memory), filesystem (on-disk)
+our blobstore api supports: s3, cloudfiles (rackspace), azurestorage, atmosonline,
+ synaptic, peer1-storage, walrus, googlestorage,
+ transient (in-memory), filesystem (on-disk)
* note * the pom dependency org.jclouds/jclouds-allblobstore gives you access to
to all of these providers
diff --git a/atmos/pom.xml b/atmos/pom.xml
index aec222e1a4..3846cd76dd 100644
--- a/atmos/pom.xml
+++ b/atmos/pom.xml
@@ -36,6 +36,10 @@
1.3.0FIXMEFIXME
+ https://cloudonestorage.peer1.com
+ 1.3.0
+ FIXME
+ FIXMEhttps://storage.synaptic.att.com1.3.0FIXME
@@ -107,6 +111,22 @@
test.atmosonline.credential${test.atmosonline.credential}
+
+ test.peer1-storage.endpoint
+ ${test.peer1-storage.endpoint}
+
+
+ test.peer1-storage.apiversion
+ ${test.peer1-storage.apiversion}
+
+
+ test.peer1-storage.identity
+ ${test.peer1-storage.identity}
+
+
+ test.peer1-storage.credential
+ ${test.peer1-storage.credential}
+ test.synaptic.endpoint${test.synaptic.endpoint}
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 2ba7495fb2..ec9a939907 100644
--- a/atmos/src/main/java/org/jclouds/atmosonline/saas/AtmosStorageAsyncClient.java
+++ b/atmos/src/main/java/org/jclouds/atmosonline/saas/AtmosStorageAsyncClient.java
@@ -29,6 +29,7 @@ import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.jclouds.atmosonline.saas.binders.BindMetadataToHeaders;
@@ -103,6 +104,7 @@ public interface AtmosStorageAsyncClient {
@POST
@Path("/{directoryName}/")
@ExceptionParser(ReturnEndpointIfAlreadyExists.class)
+ @Produces(MediaType.APPLICATION_OCTET_STREAM)
@Consumes(MediaType.WILDCARD)
ListenableFuture createDirectory(@PathParam("directoryName") String directoryName);
diff --git a/atmos/src/main/java/org/jclouds/atmosonline/saas/filters/SignRequest.java b/atmos/src/main/java/org/jclouds/atmosonline/saas/filters/SignRequest.java
index 861f84ed80..23a5ef0c3e 100644
--- a/atmos/src/main/java/org/jclouds/atmosonline/saas/filters/SignRequest.java
+++ b/atmos/src/main/java/org/jclouds/atmosonline/saas/filters/SignRequest.java
@@ -148,7 +148,7 @@ public class SignRequest implements HttpRequestFilter {
// TreeSet == Sort the headers alphabetically.
Set headers = new TreeSet(request.getHeaders().keySet());
for (String header : headers) {
- if (header.startsWith("x-emc-")) {
+ if (header.startsWith("x-emc-") && !header.equals(AtmosStorageHeaders.SIGNATURE)) {
// Convert all header names to lowercase.
toSign.append(header.toLowerCase()).append(":");
// For headers with values that span multiple lines, convert them into one line by
diff --git a/atmos/src/test/java/org/jclouds/atmosonline/saas/AtmosStorageAsyncClientTest.java b/atmos/src/test/java/org/jclouds/atmosonline/saas/AtmosStorageAsyncClientTest.java
index d30356c52c..14a229ef48 100644
--- a/atmos/src/test/java/org/jclouds/atmosonline/saas/AtmosStorageAsyncClientTest.java
+++ b/atmos/src/test/java/org/jclouds/atmosonline/saas/AtmosStorageAsyncClientTest.java
@@ -140,7 +140,7 @@ public class AtmosStorageAsyncClientTest extends RestClientTest ALL_S3 = ImmutableSet.of("EU", US_STANDARD,
- US_EAST_1, US_WEST_1, AP_SOUTHEAST_1);
+ public static Set ALL_S3 = ImmutableSet.of(EU, US_STANDARD,
+ US_WEST_1, AP_SOUTHEAST_1);
public static Set ALL_SQS = ImmutableSet.of(EU_WEST_1, US_STANDARD,
US_EAST_1, US_WEST_1, AP_SOUTHEAST_1);
}
\ No newline at end of file
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/EC2PropertiesBuilder.java b/aws/core/src/main/java/org/jclouds/aws/ec2/EC2PropertiesBuilder.java
index b8ad68742f..67dcdf98e5 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/EC2PropertiesBuilder.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/EC2PropertiesBuilder.java
@@ -26,6 +26,7 @@ import static org.jclouds.aws.ec2.reference.EC2Constants.PROPERTY_EC2_CC_AMIs;
import static org.jclouds.aws.ec2.reference.EC2Constants.PROPERTY_ELB_ENDPOINT;
import static org.jclouds.aws.reference.AWSConstants.PROPERTY_AUTH_TAG;
import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG;
+import static org.jclouds.compute.reference.ComputeServiceConstants.PROPERTY_TIMEOUT_NODE_SUSPENDED;
import java.util.Properties;
@@ -49,11 +50,15 @@ public class EC2PropertiesBuilder extends PropertiesBuilder {
properties.setProperty(PROPERTY_EC2_AMI_OWNERS, "137112412989,063491364108,099720109477,411009282317");
// amis that work with the cluster instances
properties.setProperty(PROPERTY_EC2_CC_AMIs, "us-east-1/ami-7ea24a17");
+ // sometimes, like in ec2, stop takes a very long time, perhaps
+ // due to volume management. one example spent 2 minutes moving
+ // from stopping->stopped state on an ec2 micro
+ properties.setProperty(PROPERTY_TIMEOUT_NODE_SUSPENDED, 120 * 1000 + "");
// auth fail sometimes happens in EC2, as the rc.local script that injects the
// authorized key executes after ssh has started
properties.setProperty("jclouds.ssh.max_retries", "7");
properties.setProperty("jclouds.ssh.retryable_messages",
- "Auth fail,invalid data,End of IO Stream Read,Connection reset,socket is not established");
+ "Auth fail,invalid data,End of IO Stream Read,Connection reset,socket is not established");
return properties;
}
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/EC2ComputeService.java b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/EC2ComputeService.java
index 79584776ce..681b81acc3 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/EC2ComputeService.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/EC2ComputeService.java
@@ -24,8 +24,8 @@ import static org.jclouds.aws.ec2.util.EC2Utils.parseHandle;
import static org.jclouds.util.Utils.checkNotEmpty;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.concurrent.ExecutorService;
import javax.inject.Inject;
@@ -55,12 +55,13 @@ import org.jclouds.compute.strategy.DestroyNodeStrategy;
import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
import org.jclouds.compute.strategy.ListNodesStrategy;
import org.jclouds.compute.strategy.RebootNodeStrategy;
-import org.jclouds.compute.strategy.RunNodesAndAddToSetStrategy;
import org.jclouds.compute.strategy.ResumeNodeStrategy;
+import org.jclouds.compute.strategy.RunNodesAndAddToSetStrategy;
import org.jclouds.compute.strategy.SuspendNodeStrategy;
import org.jclouds.compute.util.ComputeUtils;
import org.jclouds.domain.Credentials;
import org.jclouds.domain.Location;
+import org.jclouds.http.HttpResponseException;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Predicate;
@@ -80,23 +81,23 @@ public class EC2ComputeService extends BaseComputeService {
@Inject
protected EC2ComputeService(ComputeServiceContext context, Map credentialStore,
- @Memoized Supplier> images, @Memoized Supplier> sizes,
- @Memoized Supplier> locations, ListNodesStrategy listNodesStrategy,
- GetNodeMetadataStrategy getNodeMetadataStrategy, RunNodesAndAddToSetStrategy runNodesAndAddToSetStrategy,
- RebootNodeStrategy rebootNodeStrategy, DestroyNodeStrategy destroyNodeStrategy,
- ResumeNodeStrategy startNodeStrategy, SuspendNodeStrategy stopNodeStrategy,
- Provider templateBuilderProvider, Provider templateOptionsProvider,
- @Named("NODE_RUNNING") Predicate nodeRunning,
- @Named("NODE_TERMINATED") Predicate nodeTerminated,
- @Named("NODE_SUSPENDED") Predicate nodeSuspended, ComputeUtils utils, Timeouts timeouts,
- @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor, EC2Client ec2Client,
- Map credentialsMap, @Named("SECURITY") Map securityGroupMap,
- @Named("PLACEMENT") Map placementGroupMap,
- @Named("DELETED") Predicate placementGroupDeleted) {
+ @Memoized Supplier> images, @Memoized Supplier> sizes,
+ @Memoized Supplier> locations, ListNodesStrategy listNodesStrategy,
+ GetNodeMetadataStrategy getNodeMetadataStrategy, RunNodesAndAddToSetStrategy runNodesAndAddToSetStrategy,
+ RebootNodeStrategy rebootNodeStrategy, DestroyNodeStrategy destroyNodeStrategy,
+ ResumeNodeStrategy startNodeStrategy, SuspendNodeStrategy stopNodeStrategy,
+ Provider templateBuilderProvider, Provider templateOptionsProvider,
+ @Named("NODE_RUNNING") Predicate nodeRunning,
+ @Named("NODE_TERMINATED") Predicate nodeTerminated,
+ @Named("NODE_SUSPENDED") Predicate nodeSuspended, ComputeUtils utils, Timeouts timeouts,
+ @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor, EC2Client ec2Client,
+ Map credentialsMap, @Named("SECURITY") Map securityGroupMap,
+ @Named("PLACEMENT") Map placementGroupMap,
+ @Named("DELETED") Predicate placementGroupDeleted) {
super(context, credentialStore, images, sizes, locations, listNodesStrategy, getNodeMetadataStrategy,
- runNodesAndAddToSetStrategy, rebootNodeStrategy, destroyNodeStrategy, startNodeStrategy,
- stopNodeStrategy, templateBuilderProvider, templateOptionsProvider, nodeRunning, nodeTerminated,
- nodeSuspended, utils, timeouts, executor);
+ runNodesAndAddToSetStrategy, rebootNodeStrategy, destroyNodeStrategy, startNodeStrategy, stopNodeStrategy,
+ templateBuilderProvider, templateOptionsProvider, nodeRunning, nodeTerminated, nodeSuspended, utils,
+ timeouts, executor);
this.ec2Client = ec2Client;
this.credentialsMap = credentialsMap;
this.securityGroupMap = securityGroupMap;
@@ -108,21 +109,28 @@ public class EC2ComputeService extends BaseComputeService {
void deletePlacementGroup(String region, String tag) {
checkNotEmpty(tag, "tag");
String group = String.format("jclouds#%s#%s", tag, region);
- if (ec2Client.getPlacementGroupServices().describePlacementGroupsInRegion(region, group).size() > 0) {
- logger.debug(">> deleting placementGroup(%s)", group);
- try {
- ec2Client.getPlacementGroupServices().deletePlacementGroupInRegion(region, group);
- checkState(placementGroupDeleted.apply(new PlacementGroup(region, group, "cluster", State.PENDING)), String
- .format("placementGroup region(%s) name(%s) failed to delete", region, group));
- placementGroupMap.remove(new RegionAndName(region, tag));
- logger.debug("<< deleted placementGroup(%s)", group);
- } catch (AWSResponseException e) {
- if (e.getError().getCode().equals("InvalidPlacementGroup.InUse")) {
- logger.debug("<< inUse placementGroup(%s)", group);
- } else {
- throw e;
+ try {
+ if (ec2Client.getPlacementGroupServices().describePlacementGroupsInRegion(region, group).size() > 0) {
+ logger.debug(">> deleting placementGroup(%s)", group);
+ try {
+ ec2Client.getPlacementGroupServices().deletePlacementGroupInRegion(region, group);
+ checkState(placementGroupDeleted.apply(new PlacementGroup(region, group, "cluster", State.PENDING)),
+ String.format("placementGroup region(%s) name(%s) failed to delete", region, group));
+ placementGroupMap.remove(new RegionAndName(region, tag));
+ logger.debug("<< deleted placementGroup(%s)", group);
+ } catch (AWSResponseException e) {
+ if (e.getError().getCode().equals("InvalidPlacementGroup.InUse")) {
+ logger.debug("<< inUse placementGroup(%s)", group);
+ } else {
+ throw e;
+ }
}
}
+ } catch (HttpResponseException e) {
+ // Eucalyptus does not support placement groups yet.
+ if (!(e.getResponse().getStatusCode() == 400 && context.getProviderSpecificContext().getProvider()
+ .equals("eucalyptus")))
+ throw e;
}
}
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 7d8fde80ad..b5e76743b1 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
@@ -22,7 +22,6 @@ package org.jclouds.aws.ec2.compute.config;
import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
import static org.jclouds.compute.domain.OsFamily.AMZN_LINUX;
import static org.jclouds.compute.domain.OsFamily.CENTOS;
-import static org.jclouds.compute.domain.OsFamily.UBUNTU;
import java.util.Map;
@@ -65,12 +64,12 @@ public class EC2ComputeServiceContextModule extends BaseComputeServiceContextMod
@Override
protected TemplateBuilder provideTemplate(Injector injector, TemplateBuilder template) {
String provider = injector.getInstance(Key.get(String.class, Provider.class));
- if ("eucalyptus".equals(provider))
- return template.osFamily(CENTOS);
- else if ("nova".equals(provider))
- return template.osFamily(UBUNTU);
- else
+ if ("ec2".equals(provider))
return template.osFamily(AMZN_LINUX).os64Bit(true);
+ else if ("nova".equals(provider))
+ return super.provideTemplate(injector, template);
+ else
+ return template.osFamily(CENTOS);
}
@Provides
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/ImageParser.java b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/ImageParser.java
index e25b15d4b6..ed81f4ffe8 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/ImageParser.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/ImageParser.java
@@ -21,8 +21,8 @@ package org.jclouds.aws.ec2.compute.functions;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.compute.util.ComputeServiceUtils.parseOsFamilyOrNull;
-import static org.jclouds.compute.util.ComputeServiceUtils.parseVersionOrReturnEmptyString;
+import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
import java.util.regex.Matcher;
@@ -42,6 +42,7 @@ import org.jclouds.compute.domain.OperatingSystem;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy;
+import org.jclouds.compute.util.ComputeServiceUtils;
import org.jclouds.domain.Location;
import org.jclouds.domain.LocationScope;
import org.jclouds.domain.internal.LocationImpl;
@@ -72,32 +73,35 @@ public class ImageParser implements Function> locations;
private final Supplier defaultLocation;
private final String provider;
+ private final Map> osVersionMap;
@Inject
ImageParser(PopulateDefaultLoginCredentialsForImageStrategy credentialProvider,
- @Memoized Supplier> locations, Supplier defaultLocation,
- @Provider String provider) {
+ Map> osVersionMap, @Memoized Supplier> locations,
+ Supplier defaultLocation, @Provider String provider) {
this.credentialProvider = checkNotNull(credentialProvider, "credentialProvider");
this.locations = checkNotNull(locations, "locations");
this.defaultLocation = checkNotNull(defaultLocation, "defaultLocation");
this.provider = checkNotNull(provider, "provider");
+ this.osVersionMap = checkNotNull(osVersionMap, "utils");
}
@Override
@@ -111,12 +115,13 @@ public class ImageParser implements Function of("owner", from.getImageOwnerId(), "rootDeviceType", from
- .getRootDeviceType().toString()));
+ .getRootDeviceType().toString()));
OsFamily osFamily = parseOsFamilyOrNull(provider, from.getImageLocation());
String osName = null;
String osArch = from.getVirtualizationType();
- String osVersion = parseVersionOrReturnEmptyString(osFamily, from.getImageLocation());
+ String osVersion = ComputeServiceUtils.parseVersionOrReturnEmptyString(osFamily, from.getImageLocation(),
+ osVersionMap);
String osDescription = from.getImageLocation();
boolean is64Bit = from.getArchitecture() == Architecture.X86_64;
try {
@@ -126,10 +131,10 @@ public class ImageParser implements Function> {
sizes.add(cc1_4xlarge().location(location).supportsImageIds(ccAmi).build());
}
sizes.addAll(ImmutableSet. of(t1_micro().build(), c1_medium().build(), c1_xlarge().build(), m1_large()
- .build(), "nova".equals(providerName) ? m1_small().supportsImage(any()).build() : m1_small().build(),
+ .build(), !"ec2".equals(providerName) ? m1_small().supportsImage(any()).build() : m1_small().build(),
m1_xlarge().build(), m2_xlarge().build(), m2_2xlarge().build(), m2_4xlarge().build()));
return sizes;
}
diff --git a/aws/core/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java b/aws/core/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java
index 1ecc0d1fcc..c31338a882 100755
--- a/aws/core/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java
+++ b/aws/core/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java
@@ -66,14 +66,13 @@ public class ParseAWSErrorFromXmlContent implements HttpErrorHandler {
public void handleError(HttpCommand command, HttpResponse response) {
HttpRequest request = command.getRequest();
- Exception exception = new HttpResponseException(command, response);
+ Exception exception = null;
try {
AWSError error = null;
String message = null;
if (response.getPayload() != null) {
String contentType = response.getPayload().getContentMetadata().getContentType();
- if (contentType != null
- && (contentType.indexOf("xml") != -1 || contentType.indexOf("unknown") != -1)) {
+ if (contentType != null && (contentType.indexOf("xml") != -1 || contentType.indexOf("unknown") != -1)) {
error = utils.parseAWSErrorFromContent(request, response);
if (error != null) {
message = error.getMessage();
@@ -86,36 +85,39 @@ public class ParseAWSErrorFromXmlContent implements HttpErrorHandler {
}
}
}
- message = message != null ? message : String.format("%s -> %s", request.getRequestLine(), response
- .getStatusLine());
+ message = message != null ? message : String.format("%s -> %s", request.getRequestLine(),
+ response.getStatusLine());
+ if (exception == null)
+ exception = new HttpResponseException(command, response, message);
switch (response.getStatusCode()) {
- case 400:
- if (error != null && error.getCode() != null
- && (error.getCode().endsWith(".NotFound") || error.getCode().endsWith(".Unknown")))
- exception = new ResourceNotFoundException(message, exception);
- else if ((error != null && error.getCode() != null && (error.getCode().equals("IncorrectState") || error
- .getCode().endsWith(".Duplicate")))
- || (message != null && message.indexOf("already exists") != -1))
- exception = new IllegalStateException(message, exception);
- else if (error != null && error.getCode() != null && error.getCode().equals("AuthFailure"))
- exception = new AuthorizationException(command.getRequest(), message);
- else if (message != null && message.indexOf("Failed to bind the following fields") != -1)// Nova
- exception = new IllegalArgumentException(message, exception);
- break;
- case 401:
- case 403:
+ case 400:
+ if (error != null && error.getCode() != null
+ && (error.getCode().endsWith(".NotFound") || error.getCode().endsWith(".Unknown")))
+ exception = new ResourceNotFoundException(message, exception);
+ else if ((error != null && error.getCode() != null && (error.getCode().equals("IncorrectState") || error
+ .getCode().endsWith(".Duplicate"))) || (message != null && message.indexOf("already exists") != -1))
+ exception = new IllegalStateException(message, exception);
+ else if (error != null && error.getCode() != null && error.getCode().equals("AuthFailure"))
exception = new AuthorizationException(command.getRequest(), message);
- break;
- case 404:
- if (!command.getRequest().getMethod().equals("DELETE")) {
- String container = request.getEndpoint().getHost();
- String key = request.getEndpoint().getPath();
- if (key == null || key.equals("/"))
- exception = new ContainerNotFoundException(container, message);
- else
- exception = new KeyNotFoundException(container, key, message);
- }
- break;
+ else if (message != null && message.indexOf("Failed to bind the following fields") != -1)// Nova
+ exception = new IllegalArgumentException(message, exception);
+ break;
+ case 401:
+ case 403:
+ exception = new AuthorizationException(command.getRequest(), message);
+ break;
+ case 404:
+ if (!command.getRequest().getMethod().equals("DELETE")) {
+ String container = request.getEndpoint().getHost();
+ String key = request.getEndpoint().getPath();
+ if (key == null || key.equals("/"))
+ exception = new ContainerNotFoundException(container, message);
+ else
+ exception = new KeyNotFoundException(container, key, message);
+ }
+ break;
+ case 409:
+ exception = new IllegalStateException(message, exception);
}
} finally {
releasePayload(response);
diff --git a/aws/core/src/main/java/org/jclouds/aws/s3/S3PropertiesBuilder.java b/aws/core/src/main/java/org/jclouds/aws/s3/S3PropertiesBuilder.java
index b0ef49ccce..c66cafbd57 100644
--- a/aws/core/src/main/java/org/jclouds/aws/s3/S3PropertiesBuilder.java
+++ b/aws/core/src/main/java/org/jclouds/aws/s3/S3PropertiesBuilder.java
@@ -60,20 +60,15 @@ public class S3PropertiesBuilder extends PropertiesBuilder {
}
protected Properties addEndpoints(Properties properties) {
- properties.setProperty(PROPERTY_REGIONS, Joiner.on(',').join(Region.US_STANDARD,
- Region.US_EAST_1, Region.US_WEST_1, "EU", Region.AP_SOUTHEAST_1));
- properties.setProperty(PROPERTY_DEFAULT_REGIONS, Joiner.on(',').join(Region.US_STANDARD,
- Region.US_EAST_1));
+ properties.setProperty(PROPERTY_REGIONS,
+ Joiner.on(',').join(Region.US_STANDARD, Region.US_WEST_1, "EU", Region.AP_SOUTHEAST_1));
+ properties.setProperty(PROPERTY_DEFAULT_REGIONS, Region.US_STANDARD);
properties.setProperty(PROPERTY_ENDPOINT, "https://s3.amazonaws.com");
- properties.setProperty(PROPERTY_ENDPOINT + "." + Region.US_STANDARD,
- "https://s3.amazonaws.com");
- properties
- .setProperty(PROPERTY_ENDPOINT + "." + Region.US_EAST_1, "https://s3.amazonaws.com");
- properties.setProperty(PROPERTY_ENDPOINT + "." + Region.US_WEST_1,
- "https://s3-us-west-1.amazonaws.com");
+ properties.setProperty(PROPERTY_ENDPOINT + "." + Region.US_STANDARD, "https://s3.amazonaws.com");
+ properties.setProperty(PROPERTY_ENDPOINT + "." + Region.US_WEST_1, "https://s3-us-west-1.amazonaws.com");
properties.setProperty(PROPERTY_ENDPOINT + "." + "EU", "https://s3-eu-west-1.amazonaws.com");
- properties.setProperty(PROPERTY_ENDPOINT + "." + Region.AP_SOUTHEAST_1,
- "https://s3-ap-southeast-1.amazonaws.com");
+ properties
+ .setProperty(PROPERTY_ENDPOINT + "." + Region.AP_SOUTHEAST_1, "https://s3-ap-southeast-1.amazonaws.com");
return properties;
}
@@ -92,8 +87,8 @@ public class S3PropertiesBuilder extends PropertiesBuilder {
protected void setMetaPrefix() {
if (properties.getProperty(PROPERTY_USER_METADATA_PREFIX) == null) {
- properties.setProperty(PROPERTY_USER_METADATA_PREFIX, String.format("x-%s-meta-",
- properties.getProperty(PROPERTY_HEADER_TAG)));
+ properties.setProperty(PROPERTY_USER_METADATA_PREFIX,
+ String.format("x-%s-meta-", properties.getProperty(PROPERTY_HEADER_TAG)));
}
}
diff --git a/aws/core/src/main/java/org/jclouds/aws/s3/blobstore/functions/BucketToResourceMetadata.java b/aws/core/src/main/java/org/jclouds/aws/s3/blobstore/functions/BucketToResourceMetadata.java
index 1a91201aff..a1a891be0b 100644
--- a/aws/core/src/main/java/org/jclouds/aws/s3/blobstore/functions/BucketToResourceMetadata.java
+++ b/aws/core/src/main/java/org/jclouds/aws/s3/blobstore/functions/BucketToResourceMetadata.java
@@ -71,19 +71,21 @@ public class BucketToResourceMetadata implements Function locations = this.locations.get();
final String region = client.getBucketLocation(from.getName());
+ assert region != null : String.format("could not get region for %s", from.getName());
if (region != null) {
try {
- return Iterables.find(locations.get(), new Predicate() {
+ return Iterables.find(locations, new Predicate() {
@Override
public boolean apply(Location input) {
- return input.getId().equals(region.toString());
+ return input.getId().equalsIgnoreCase(region.toString());
}
});
} catch (NoSuchElementException e) {
- logger.error("could not get location for region %s in %s", region, locations.get());
+ logger.error("could not get location for region %s in %s", region, locations);
}
} else {
logger.error("could not get region for %s", from.getName());
diff --git a/aws/core/src/main/java/org/jclouds/aws/s3/xml/LocationConstraintHandler.java b/aws/core/src/main/java/org/jclouds/aws/s3/xml/LocationConstraintHandler.java
index bfb2b0d5ba..d0b89f9eb3 100644
--- a/aws/core/src/main/java/org/jclouds/aws/s3/xml/LocationConstraintHandler.java
+++ b/aws/core/src/main/java/org/jclouds/aws/s3/xml/LocationConstraintHandler.java
@@ -50,8 +50,8 @@ public class LocationConstraintHandler extends ParseSax.HandlerWithResult of("jclouds#" + tag + "#"
- + instance.getRegion(), tag));
+ assertEquals(Sets.newTreeSet(instance.getGroupIds()),
+ ImmutableSortedSet. of("jclouds#" + tag + "#" + instance.getRegion(), tag));
// make sure our dummy group has no rules
SecurityGroup group = Iterables.getOnlyElement(securityGroupClient.describeSecurityGroupsInRegion(null,
- "jclouds#" + tag + "#" + instance.getRegion()));
+ "jclouds#" + tag + "#" + instance.getRegion()));
assert group.getIpPermissions().size() == 0 : group;
// try to run a script with the original keyPair
- runScriptWithCreds(tag, first.getOperatingSystem(), new Credentials(first.getCredentials().identity, result
- .getKeyMaterial()));
+ runScriptWithCreds(tag, first.getOperatingSystem(),
+ new Credentials(first.getCredentials().identity, result.getKeyMaterial()));
} finally {
client.destroyNodesMatching(NodePredicates.withTag(tag));
@@ -168,11 +168,11 @@ public class EC2ComputeServiceLiveTest extends BaseComputeServiceLiveTest {
assertEquals(instance.getMonitoringState(), MonitoringState.ENABLED);
RestContext monitoringContext = new RestContextFactory().createContext(
- "cloudwatch", identity, credential, ImmutableSet. of(new Log4JLoggingModule()));
+ "cloudwatch", identity, credential, ImmutableSet. of(new Log4JLoggingModule()));
try {
Set datapoints = monitoringContext.getApi().getMetricStatisticsInRegion(instance.getRegion(),
- "CPUUtilization", before, new Date(), 60, "Average");
+ "CPUUtilization", before, new Date(), 60, "Average");
assert datapoints != null;
} finally {
monitoringContext.close();
@@ -182,13 +182,13 @@ public class EC2ComputeServiceLiveTest extends BaseComputeServiceLiveTest {
@Test(enabled = true, dependsOnMethods = "testCompareSizes")
public void testExtendedOptionsNoKeyPair() throws Exception {
SecurityGroupClient securityGroupClient = EC2Client.class.cast(context.getProviderSpecificContext().getApi())
- .getSecurityGroupServices();
+ .getSecurityGroupServices();
KeyPairClient keyPairClient = EC2Client.class.cast(context.getProviderSpecificContext().getApi())
- .getKeyPairServices();
+ .getKeyPairServices();
InstanceClient instanceClient = EC2Client.class.cast(context.getProviderSpecificContext().getApi())
- .getInstanceServices();
+ .getInstanceServices();
String tag = this.tag + "optionsnokey";
@@ -215,12 +215,12 @@ public class EC2ComputeServiceLiveTest extends BaseComputeServiceLiveTest {
assertEquals(instance.getKeyName(), null);
// make sure we made our dummy group and also let in the user's group
- assertEquals(instance.getGroupIds(), ImmutableSet. of(tag, String.format("jclouds#%s#%s", tag,
- instance.getRegion())));
+ assertEquals(Sets.newTreeSet(instance.getGroupIds()),
+ ImmutableSortedSet. of(tag, String.format("jclouds#%s#%s", tag, instance.getRegion())));
// make sure our dummy group has no rules
- SecurityGroup group = Iterables.getOnlyElement(securityGroupClient.describeSecurityGroupsInRegion(null, String
- .format("jclouds#%s#%s", tag, instance.getRegion())));
+ SecurityGroup group = Iterables.getOnlyElement(securityGroupClient.describeSecurityGroupsInRegion(null,
+ String.format("jclouds#%s#%s", tag, instance.getRegion())));
assert group.getIpPermissions().size() == 0 : group;
} finally {
@@ -242,13 +242,13 @@ public class EC2ComputeServiceLiveTest extends BaseComputeServiceLiveTest {
return;
}
SecurityGroupClient securityGroupClient = EC2Client.class.cast(context.getProviderSpecificContext().getApi())
- .getSecurityGroupServices();
+ .getSecurityGroupServices();
KeyPairClient keyPairClient = EC2Client.class.cast(context.getProviderSpecificContext().getApi())
- .getKeyPairServices();
+ .getKeyPairServices();
InstanceClient instanceClient = EC2Client.class.cast(context.getProviderSpecificContext().getApi())
- .getInstanceServices();
+ .getInstanceServices();
String tag = this.tag + "optionswithsubnetid";
@@ -295,12 +295,12 @@ public class EC2ComputeServiceLiveTest extends BaseComputeServiceLiveTest {
private RunningInstance getInstance(InstanceClient instanceClient, String id) {
RunningInstance instance = Iterables.getOnlyElement(Iterables.getOnlyElement(instanceClient
- .describeInstancesInRegion(null, id)));
+ .describeInstancesInRegion(null, id)));
return instance;
}
private void cleanupExtendedStuff(SecurityGroupClient securityGroupClient, KeyPairClient keyPairClient, String tag)
- throws InterruptedException {
+ throws InterruptedException {
try {
for (SecurityGroup group : securityGroupClient.describeSecurityGroupsInRegion(null))
if (group.getName().startsWith("jclouds#" + tag) || group.getName().equals(tag)) {
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2TemplateBuilderLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2TemplateBuilderLiveTest.java
index da449863fa..70f5eb92f9 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2TemplateBuilderLiveTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2TemplateBuilderLiveTest.java
@@ -19,24 +19,24 @@
package org.jclouds.aws.ec2.compute;
-import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
import static org.testng.Assert.assertEquals;
import java.io.IOException;
import java.util.Properties;
-import org.jclouds.Constants;
import org.jclouds.aws.ec2.domain.InstanceType;
import org.jclouds.aws.ec2.reference.EC2Constants;
+import org.jclouds.compute.BaseTemplateBuilderLiveTest;
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.compute.ComputeServiceContextFactory;
+import org.jclouds.compute.OsFamilyVersion64Bit;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.domain.Template;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
@@ -45,147 +45,106 @@ import com.google.inject.Module;
* @author Adrian Cole
*/
@Test(groups = "live", testName = "ec2.EC2TemplateBuilderLiveTest")
-public class EC2TemplateBuilderLiveTest {
- protected String provider = "ec2";
- protected String identity;
- protected String credential;
- protected String endpoint;
- protected String apiversion;
+public class EC2TemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
- @BeforeClass
- protected void setupCredentials() {
- identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
- credential = System.getProperty("test." + provider + ".credential");
- endpoint = System.getProperty("test." + provider + ".endpoint");
- apiversion = System.getProperty("test." + provider + ".apiversion");
+ public EC2TemplateBuilderLiveTest() {
+ provider = "ec2";
}
- protected Properties setupProperties() {
- Properties overrides = new Properties();
- overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true");
- overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true");
- overrides.setProperty(provider + ".identity", identity);
- if (credential != null)
- overrides.setProperty(provider + ".credential", credential);
- if (endpoint != null)
- overrides.setProperty(provider + ".endpoint", endpoint);
- if (apiversion != null)
- overrides.setProperty(provider + ".apiversion", apiversion);
- return overrides;
+ @Override
+ protected Predicate defineUnsupportedOperatingSystems() {
+ return new Predicate() {
+
+ @Override
+ public boolean apply(OsFamilyVersion64Bit input) {
+ return input.family == OsFamily.RHEL || //
+ (input.family == OsFamily.CENTOS && !input.version.matches("5.[42]")) || //
+ (input.family == OsFamily.WINDOWS && !input.version.matches("200[38]"));
+ }
+
+ };
}
@Test
public void testTemplateBuilderM1SMALLWithDescription() {
- ComputeServiceContext newContext = null;
- try {
- newContext = new ComputeServiceContextFactory().createContext(provider, ImmutableSet
- . of(new Log4JLoggingModule()), setupProperties());
- Template template = newContext.getComputeService().templateBuilder().hardwareId(InstanceType.M1_SMALL)
- .osVersionMatches("10.10").imageDescriptionMatches("ubuntu-images").osFamily(OsFamily.UBUNTU).build();
+ Template template = context.getComputeService().templateBuilder().hardwareId(InstanceType.M1_SMALL)
+ .osVersionMatches("10.10").imageDescriptionMatches("ubuntu-images").osFamily(OsFamily.UBUNTU).build();
+
+ assert (template.getImage().getProviderId().startsWith("ami-")) : template;
+ assertEquals(template.getImage().getOperatingSystem().getVersion(), "10.10");
+ assertEquals(template.getImage().getOperatingSystem().is64Bit(), false);
+ assertEquals(template.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
+ assertEquals(template.getImage().getVersion(), "20101106");
+ assertEquals(template.getImage().getUserMetadata().get("rootDeviceType"), "instance-store");
+ assertEquals(template.getLocation().getId(), "us-east-1");
+ assertEquals(getCores(template.getHardware()), 1.0d);
+ assertEquals(template.getHardware().getId(), InstanceType.M1_SMALL);
- System.out.println(template.getHardware());
- assert (template.getImage().getProviderId().startsWith("ami-")) : template;
- assertEquals(template.getImage().getOperatingSystem().getVersion(), "10.10");
- assertEquals(template.getImage().getOperatingSystem().is64Bit(), false);
- assertEquals(template.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
- assertEquals(template.getImage().getVersion(), "20101027");
- assertEquals(template.getImage().getUserMetadata().get("rootDeviceType"), "instance-store");
- assertEquals(template.getLocation().getId(), "us-east-1");
- assertEquals(getCores(template.getHardware()), 1.0d);
- assertEquals(template.getHardware().getId(), InstanceType.M1_SMALL);
- } finally {
- if (newContext != null)
- newContext.close();
- }
}
@Test
public void testTemplateBuilderCanUseImageIdAndhardwareId() {
- ComputeServiceContext newContext = null;
- try {
- newContext = new ComputeServiceContextFactory().createContext(provider, ImmutableSet
- . of(new Log4JLoggingModule()), setupProperties());
- Template template = newContext.getComputeService().templateBuilder().imageId("us-east-1/ami-ccb35ea5")
- .hardwareId(InstanceType.M2_2XLARGE).build();
+ Template template = context.getComputeService().templateBuilder().imageId("us-east-1/ami-ccb35ea5")
+ .hardwareId(InstanceType.M2_2XLARGE).build();
+
+ System.out.println(template.getHardware());
+ assert (template.getImage().getProviderId().startsWith("ami-")) : template;
+ assertEquals(template.getImage().getOperatingSystem().getVersion(), "5.4");
+ assertEquals(template.getImage().getOperatingSystem().is64Bit(), true);
+ assertEquals(template.getImage().getOperatingSystem().getFamily(), OsFamily.CENTOS);
+ assertEquals(template.getImage().getVersion(), "4.4.10");
+ assertEquals(template.getImage().getUserMetadata().get("rootDeviceType"), "instance-store");
+ assertEquals(template.getLocation().getId(), "us-east-1");
+ assertEquals(getCores(template.getHardware()), 4.0d);
+ assertEquals(template.getHardware().getId(), InstanceType.M2_2XLARGE);
- System.out.println(template.getHardware());
- assert (template.getImage().getProviderId().startsWith("ami-")) : template;
- assertEquals(template.getImage().getOperatingSystem().getVersion(), "5.4");
- assertEquals(template.getImage().getOperatingSystem().is64Bit(), true);
- assertEquals(template.getImage().getOperatingSystem().getFamily(), OsFamily.CENTOS);
- assertEquals(template.getImage().getVersion(), "4.4.10");
- assertEquals(template.getImage().getUserMetadata().get("rootDeviceType"), "instance-store");
- assertEquals(template.getLocation().getId(), "us-east-1");
- assertEquals(getCores(template.getHardware()), 4.0d);
- assertEquals(template.getHardware().getId(), InstanceType.M2_2XLARGE);
- } finally {
- if (newContext != null)
- newContext.close();
- }
}
@Test
public void testDefaultTemplateBuilder() throws IOException {
- ComputeServiceContext newContext = null;
- try {
- newContext = new ComputeServiceContextFactory().createContext(provider, ImmutableSet
- . of(new Log4JLoggingModule()), setupProperties());
- Template defaultTemplate = newContext.getComputeService().templateBuilder().build();
- assert (defaultTemplate.getImage().getProviderId().startsWith("ami-")) : defaultTemplate;
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "0.9.9-beta");
- assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.AMZN_LINUX);
- assertEquals(defaultTemplate.getImage().getUserMetadata().get("rootDeviceType"), "ebs");
- assertEquals(defaultTemplate.getLocation().getId(), "us-east-1");
- assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
+ Template defaultTemplate = context.getComputeService().templateBuilder().build();
+ assert (defaultTemplate.getImage().getProviderId().startsWith("ami-")) : defaultTemplate;
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "0.9.9-beta");
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.AMZN_LINUX);
+ assertEquals(defaultTemplate.getImage().getUserMetadata().get("rootDeviceType"), "ebs");
+ assertEquals(defaultTemplate.getLocation().getId(), "us-east-1");
+ assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
- } finally {
- if (newContext != null)
- newContext.close();
- }
}
@Test
public void testTemplateBuilderMicro() throws IOException {
- ComputeServiceContext newContext = null;
- try {
- newContext = new ComputeServiceContextFactory().createContext(provider, ImmutableSet
- . of(new Log4JLoggingModule()), setupProperties());
- Template microTemplate = newContext.getComputeService().templateBuilder().hardwareId(InstanceType.T1_MICRO)
- .build();
- System.out.println(microTemplate.getHardware());
+ Template microTemplate = context.getComputeService().templateBuilder().hardwareId(InstanceType.T1_MICRO).build();
+
+ assert (microTemplate.getImage().getProviderId().startsWith("ami-")) : microTemplate;
+ assertEquals(microTemplate.getImage().getOperatingSystem().getVersion(), "9.10");
+ assertEquals(microTemplate.getImage().getOperatingSystem().is64Bit(), false);
+ assertEquals(microTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
+ assertEquals(microTemplate.getImage().getUserMetadata().get("rootDeviceType"), "ebs");
+ assertEquals(microTemplate.getLocation().getId(), "us-east-1");
+ assertEquals(getCores(microTemplate.getHardware()), 1.0d);
- assert (microTemplate.getImage().getProviderId().startsWith("ami-")) : microTemplate;
- assertEquals(microTemplate.getImage().getOperatingSystem().getVersion(), "9.10");
- assertEquals(microTemplate.getImage().getOperatingSystem().is64Bit(), false);
- assertEquals(microTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
- assertEquals(microTemplate.getImage().getUserMetadata().get("rootDeviceType"), "ebs");
- assertEquals(microTemplate.getLocation().getId(), "us-east-1");
- assertEquals(getCores(microTemplate.getHardware()), 1.0d);
- } finally {
- if (newContext != null)
- newContext.close();
- }
}
@Test
public void testTemplateBuilderWithNoOwnersParsesImageOnDemand() throws IOException {
- ComputeServiceContext newContext = null;
+ ComputeServiceContext context = null;
try {
Properties overrides = setupProperties();
// set owners to nothing
overrides.setProperty(EC2Constants.PROPERTY_EC2_AMI_OWNERS, "");
- newContext = new ComputeServiceContextFactory().createContext(provider, ImmutableSet
- . of(new Log4JLoggingModule()), overrides);
+ context = new ComputeServiceContextFactory().createContext(provider,
+ ImmutableSet. of(new Log4JLoggingModule()), overrides);
- assertEquals(newContext.getComputeService().listImages().size(), 0);
+ assertEquals(context.getComputeService().listImages().size(), 0);
- Template template = newContext.getComputeService().templateBuilder().imageId("us-east-1/ami-ccb35ea5").build();
+ Template template = context.getComputeService().templateBuilder().imageId("us-east-1/ami-ccb35ea5").build();
System.out.println(template.getHardware());
assert (template.getImage().getProviderId().startsWith("ami-")) : template;
assertEquals(template.getImage().getOperatingSystem().getVersion(), "5.4");
@@ -199,11 +158,11 @@ public class EC2TemplateBuilderLiveTest {
// is 64bit
// ensure we cache the new image for next time
- assertEquals(newContext.getComputeService().listImages().size(), 1);
+ assertEquals(context.getComputeService().listImages().size(), 1);
} finally {
- if (newContext != null)
- newContext.close();
+ if (context != null)
+ context.close();
}
}
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EucalyptusComputeServiceLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EucalyptusComputeServiceLiveTestDisabled.java
similarity index 74%
rename from aws/core/src/test/java/org/jclouds/aws/ec2/compute/EucalyptusComputeServiceLiveTest.java
rename to aws/core/src/test/java/org/jclouds/aws/ec2/compute/EucalyptusComputeServiceLiveTestDisabled.java
index 48bea286b2..a61b0659a3 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EucalyptusComputeServiceLiveTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EucalyptusComputeServiceLiveTestDisabled.java
@@ -28,13 +28,14 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/**
+ * Disabled until we have an environment with enough room to run a few nodes simultaneously.
*
* @author Adrian Cole
*/
-@Test(groups = "live", sequential = true, testName = "ec2.EucalyptusComputeServiceLiveTest")
-public class EucalyptusComputeServiceLiveTest extends EC2ComputeServiceLiveTest {
+@Test(groups = "live", enabled = true, sequential = true, testName = "ec2.EucalyptusComputeServiceLiveTest")
+public class EucalyptusComputeServiceLiveTestDisabled extends EC2ComputeServiceLiveTest {
- public EucalyptusComputeServiceLiveTest() {
+ public EucalyptusComputeServiceLiveTestDisabled() {
provider = "eucalyptus";
}
@@ -45,12 +46,18 @@ public class EucalyptusComputeServiceLiveTest extends EC2ComputeServiceLiveTest
tag = "euc";
}
+ @Override
+ @Test(enabled = false)
+ public void testExtendedOptionsAndLogin() throws Exception {
+ // euc does not support monitoring
+ }
+
@Override
protected void assertDefaultWorks() {
Template defaultTemplate = client.templateBuilder().build();
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.CENTOS);
- assertEquals(getCores(defaultTemplate.getHardware()), 2.0d);
+ assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
}
}
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/functions/ImageParserTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/functions/ImageParserTest.java
index a5f0443a5f..99aa26d442 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/functions/ImageParserTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/functions/ImageParserTest.java
@@ -21,18 +21,23 @@ package org.jclouds.aws.ec2.compute.functions;
import static org.testng.Assert.assertEquals;
+import java.util.Map;
import java.util.Set;
import org.jclouds.aws.ec2.compute.strategy.EC2PopulateDefaultLoginCredentialsForImageStrategy;
import org.jclouds.aws.ec2.domain.Image;
import org.jclouds.aws.ec2.xml.DescribeImagesResponseHandlerTest;
+import org.jclouds.compute.config.BaseComputeServiceContextModule;
import org.jclouds.compute.domain.ImageBuilder;
import org.jclouds.compute.domain.OperatingSystemBuilder;
import org.jclouds.compute.domain.OsFamily;
+import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.domain.Credentials;
import org.jclouds.domain.Location;
import org.jclouds.domain.LocationScope;
import org.jclouds.domain.internal.LocationImpl;
+import org.jclouds.json.Json;
+import org.jclouds.json.config.GsonModule;
import org.testng.annotations.Test;
import com.google.common.base.Predicates;
@@ -42,6 +47,7 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
import com.google.gson.Gson;
+import com.google.inject.Guice;
/**
* @author Adrian Cole
@@ -141,6 +147,10 @@ public class ImageParserTest {
assertEquals(
new Gson().toJson(Iterables.get(result, 1)),
"{\"operatingSystem\":{\"family\":\"UBUNTU\",\"arch\":\"paravirtual\",\"version\":\"9.10\",\"description\":\"411009282317/RightImage_Ubuntu_9.10_x64_v4.5.3_EBS_Alpha\",\"is64Bit\":true},\"version\":\"4.5.3_EBS_Alpha\",\"description\":\"RightImage_Ubuntu_9.10_x64_v4.5.3_EBS_Alpha\",\"defaultCredentials\":{\"identity\":\"root\"},\"id\":\"us-east-1/ami-c19db6b5\",\"type\":\"IMAGE\",\"providerId\":\"ami-c19db6b5\",\"location\":{\"scope\":\"REGION\",\"id\":\"us-east-1\",\"description\":\"us-east-1\"},\"userMetadata\":{\"owner\":\"411009282317\",\"rootDeviceType\":\"ebs\"}}");
+
+ assertEquals(
+ new Gson().toJson(Iterables.get(result, 2)),
+ "{\"operatingSystem\":{\"family\":\"WINDOWS\",\"arch\":\"hvm\",\"version\":\"2003\",\"description\":\"411009282317/RightImage Windows_2003_i386_v5.4.3\",\"is64Bit\":false},\"version\":\"5.4.3\",\"description\":\"Built by RightScale\",\"defaultCredentials\":{\"identity\":\"root\"},\"id\":\"us-east-1/ami-710c2605\",\"type\":\"IMAGE\",\"providerId\":\"ami-710c2605\",\"location\":{\"scope\":\"REGION\",\"id\":\"us-east-1\",\"description\":\"us-east-1\"},\"userMetadata\":{\"owner\":\"411009282317\",\"rootDeviceType\":\"ebs\"}}");
}
public void testParseEucalyptusImage() {
@@ -208,8 +218,13 @@ public class ImageParserTest {
static Location defaultLocation = new LocationImpl(LocationScope.REGION, "us-east-1", "us-east-1", null);
public static Set convertImages(String resource) {
+
+ Map> map = new BaseComputeServiceContextModule() {
+ }.provideOsVersionMap(new ComputeServiceConstants.ReferenceData(), Guice.createInjector(new GsonModule())
+ .getInstance(Json.class));
+
Set result = DescribeImagesResponseHandlerTest.parseImages(resource);
- ImageParser parser = new ImageParser(new EC2PopulateDefaultLoginCredentialsForImageStrategy(),
+ ImageParser parser = new ImageParser(new EC2PopulateDefaultLoginCredentialsForImageStrategy(), map,
Suppliers.> ofInstance(ImmutableSet. of(defaultLocation)),
Suppliers.ofInstance(defaultLocation), "ec2");
return Sets.newLinkedHashSet(Iterables.filter(Iterables.transform(result, parser), Predicates.notNull()));
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java
index 0012e32267..673ef2b69b 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java
@@ -36,12 +36,13 @@ import org.jclouds.aws.domain.Region;
import org.jclouds.aws.ec2.EC2AsyncClient;
import org.jclouds.aws.ec2.EC2Client;
import org.jclouds.aws.ec2.domain.Image;
-import org.jclouds.aws.ec2.domain.RootDeviceType;
import org.jclouds.aws.ec2.domain.Image.ImageType;
+import org.jclouds.aws.ec2.domain.RootDeviceType;
import org.jclouds.compute.ComputeServiceContextFactory;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
import org.jclouds.rest.RestContext;
import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeGroups;
import org.testng.annotations.Test;
@@ -74,13 +75,12 @@ public class AMIClientLiveTest {
protected String endpoint;
protected String apiversion;
+ @BeforeClass
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
- credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
- + ".credential");
- endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint");
- apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider
- + ".apiversion");
+ credential = System.getProperty("test." + provider + ".credential");
+ endpoint = System.getProperty("test." + provider + ".endpoint");
+ apiversion = System.getProperty("test." + provider + ".apiversion");
}
protected Properties setupProperties() {
@@ -88,9 +88,12 @@ public class AMIClientLiveTest {
overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true");
overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true");
overrides.setProperty(provider + ".identity", identity);
- overrides.setProperty(provider + ".credential", credential);
- overrides.setProperty(provider + ".endpoint", endpoint);
- overrides.setProperty(provider + ".apiversion", apiversion);
+ if (credential != null)
+ overrides.setProperty(provider + ".credential", credential);
+ if (endpoint != null)
+ overrides.setProperty(provider + ".endpoint", endpoint);
+ if (apiversion != null)
+ overrides.setProperty(provider + ".apiversion", apiversion);
return overrides;
}
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java
index a6e86813b4..3ef0c93d3c 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java
@@ -27,10 +27,10 @@ import static org.testng.Assert.assertNotNull;
import java.net.URI;
import java.util.Iterator;
+import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
import java.util.SortedMap;
-import java.util.Map.Entry;
import org.jclouds.Constants;
import org.jclouds.aws.domain.Region;
@@ -41,13 +41,13 @@ import org.jclouds.compute.ComputeServiceContextFactory;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
import org.jclouds.rest.RestContext;
import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeGroups;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
import com.google.inject.Module;
/**
@@ -66,13 +66,12 @@ public class AvailabilityZoneAndRegionClientLiveTest {
protected String endpoint;
protected String apiversion;
+ @BeforeClass
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
- credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
- + ".credential");
- endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint");
- apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider
- + ".apiversion");
+ credential = System.getProperty("test." + provider + ".credential");
+ endpoint = System.getProperty("test." + provider + ".endpoint");
+ apiversion = System.getProperty("test." + provider + ".apiversion");
}
protected Properties setupProperties() {
@@ -80,9 +79,12 @@ public class AvailabilityZoneAndRegionClientLiveTest {
overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true");
overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true");
overrides.setProperty(provider + ".identity", identity);
- overrides.setProperty(provider + ".credential", credential);
- overrides.setProperty(provider + ".endpoint", endpoint);
- overrides.setProperty(provider + ".apiversion", apiversion);
+ if (credential != null)
+ overrides.setProperty(provider + ".credential", credential);
+ if (endpoint != null)
+ overrides.setProperty(provider + ".endpoint", endpoint);
+ if (apiversion != null)
+ overrides.setProperty(provider + ".apiversion", apiversion);
return overrides;
}
@@ -90,26 +92,25 @@ public class AvailabilityZoneAndRegionClientLiveTest {
public void setupClient() {
setupCredentials();
Properties overrides = setupProperties();
- context = new ComputeServiceContextFactory().createContext(provider, ImmutableSet. of(new Log4JLoggingModule()),
- overrides).getProviderSpecificContext();
+ context = new ComputeServiceContextFactory().createContext(provider,
+ ImmutableSet. of(new Log4JLoggingModule()), overrides).getProviderSpecificContext();
client = context.getApi().getAvailabilityZoneAndRegionServices();
}
public void testDescribeAvailabilityZones() {
- for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1,
- Region.US_WEST_1, Region.AP_SOUTHEAST_1)) {
- Set allResults = Sets.newLinkedHashSet(client
- .describeAvailabilityZonesInRegion(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.describeAvailabilityZonesInRegion(region);
assertNotNull(allResults);
assert allResults.size() >= 2 : allResults.size();
Iterator iterator = allResults.iterator();
String id1 = iterator.next().getZone();
String id2 = iterator.next().getZone();
- Set twoResults = Sets.newLinkedHashSet(client
- .describeAvailabilityZonesInRegion(region, availabilityZones(id1, id2)));
+ Set twoResults = client.describeAvailabilityZonesInRegion(region,
+ availabilityZones(id1, id2));
assertNotNull(twoResults);
assertEquals(twoResults.size(), 2);
- iterator = twoResults.iterator();
+ iterator = allResults.iterator();
assertEquals(iterator.next().getZone(), id1);
assertEquals(iterator.next().getZone(), id2);
}
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticBlockStoreClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticBlockStoreClientLiveTest.java
index 2736288474..daabd9d99d 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticBlockStoreClientLiveTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticBlockStoreClientLiveTest.java
@@ -30,7 +30,6 @@ import java.util.SortedSet;
import java.util.concurrent.TimeUnit;
import org.jclouds.Constants;
-import org.jclouds.aws.AWSResponseException;
import org.jclouds.aws.domain.Region;
import org.jclouds.aws.ec2.EC2AsyncClient;
import org.jclouds.aws.ec2.EC2Client;
@@ -44,6 +43,7 @@ import org.jclouds.logging.log4j.config.Log4JLoggingModule;
import org.jclouds.predicates.RetryablePredicate;
import org.jclouds.rest.RestContext;
import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeGroups;
import org.testng.annotations.Test;
@@ -71,13 +71,12 @@ public class ElasticBlockStoreClientLiveTest {
protected String endpoint;
protected String apiversion;
+ @BeforeClass
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
- credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
- + ".credential");
- endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint");
- apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider
- + ".apiversion");
+ credential = System.getProperty("test." + provider + ".credential");
+ endpoint = System.getProperty("test." + provider + ".endpoint");
+ apiversion = System.getProperty("test." + provider + ".apiversion");
}
protected Properties setupProperties() {
@@ -85,9 +84,12 @@ public class ElasticBlockStoreClientLiveTest {
overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true");
overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true");
overrides.setProperty(provider + ".identity", identity);
- overrides.setProperty(provider + ".credential", credential);
- overrides.setProperty(provider + ".endpoint", endpoint);
- overrides.setProperty(provider + ".apiversion", apiversion);
+ if (credential != null)
+ overrides.setProperty(provider + ".credential", credential);
+ if (endpoint != null)
+ overrides.setProperty(provider + ".endpoint", endpoint);
+ if (apiversion != null)
+ overrides.setProperty(provider + ".apiversion", apiversion);
return overrides;
}
@@ -95,15 +97,15 @@ public class ElasticBlockStoreClientLiveTest {
public void setupClient() {
setupCredentials();
Properties overrides = setupProperties();
- context = new ComputeServiceContextFactory().createContext(provider, ImmutableSet. of(new Log4JLoggingModule()),
- overrides).getProviderSpecificContext();
+ context = new ComputeServiceContextFactory().createContext(provider,
+ ImmutableSet. of(new Log4JLoggingModule()), overrides).getProviderSpecificContext();
client = context.getApi().getElasticBlockStoreServices();
}
@Test
void testDescribeVolumes() {
for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, Region.US_WEST_1,
- Region.AP_SOUTHEAST_1)) {
+ Region.AP_SOUTHEAST_1)) {
SortedSet allResults = Sets.newTreeSet(client.describeVolumesInRegion(region));
assertNotNull(allResults);
if (allResults.size() >= 1) {
@@ -136,11 +138,11 @@ public class ElasticBlockStoreClientLiveTest {
void testCreateSnapshotInRegion() {
Snapshot snapshot = client.createSnapshotInRegion(null, volumeId);
Predicate snapshotted = new RetryablePredicate(new SnapshotCompleted(client), 600, 10,
- TimeUnit.SECONDS);
+ TimeUnit.SECONDS);
assert snapshotted.apply(snapshot);
Snapshot result = Iterables.getOnlyElement(client.describeSnapshotsInRegion(snapshot.getRegion(),
- snapshotIds(snapshot.getId())));
+ snapshotIds(snapshot.getId())));
assertEquals(result.getProgress(), 100);
this.snapshot = result;
@@ -152,7 +154,7 @@ public class ElasticBlockStoreClientLiveTest {
assertNotNull(volume);
Predicate availabile = new RetryablePredicate(new VolumeAvailable(client), 600, 10,
- TimeUnit.SECONDS);
+ TimeUnit.SECONDS);
assert availabile.apply(volume);
Volume result = Iterables.getOnlyElement(client.describeVolumesInRegion(snapshot.getRegion(), volume.getId()));
@@ -166,12 +168,12 @@ public class ElasticBlockStoreClientLiveTest {
@Test(dependsOnMethods = "testCreateSnapshotInRegion")
void testCreateVolumeFromSnapshotInAvailabilityZoneWithSize() {
- Volume volume = client.createVolumeFromSnapshotInAvailabilityZone(AvailabilityZone.US_EAST_1B, 2, snapshot
- .getId());
+ Volume volume = client.createVolumeFromSnapshotInAvailabilityZone(AvailabilityZone.US_EAST_1B, 2,
+ snapshot.getId());
assertNotNull(volume);
Predicate availabile = new RetryablePredicate(new VolumeAvailable(client), 600, 10,
- TimeUnit.SECONDS);
+ TimeUnit.SECONDS);
assert availabile.apply(volume);
Volume result = Iterables.getOnlyElement(client.describeVolumesInRegion(snapshot.getRegion(), volume.getId()));
@@ -197,13 +199,13 @@ public class ElasticBlockStoreClientLiveTest {
@Test
void testDescribeSnapshots() {
for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, Region.US_WEST_1,
- Region.AP_SOUTHEAST_1)) {
+ Region.AP_SOUTHEAST_1)) {
SortedSet allResults = Sets.newTreeSet(client.describeSnapshotsInRegion(region));
assertNotNull(allResults);
if (allResults.size() >= 1) {
Snapshot snapshot = allResults.last();
- Snapshot result = Iterables.getOnlyElement(client.describeSnapshotsInRegion(region, snapshotIds(snapshot
- .getId())));
+ Snapshot result = Iterables.getOnlyElement(client.describeSnapshotsInRegion(region,
+ snapshotIds(snapshot.getId())));
assertNotNull(result);
assertEquals(result, snapshot);
}
@@ -246,12 +248,7 @@ public class ElasticBlockStoreClientLiveTest {
@Test(dependsOnMethods = "testGetCreateVolumePermissionForSnapshot")
void testDeleteSnapshotInRegion() {
client.deleteSnapshotInRegion(snapshot.getRegion(), snapshot.getId());
- try {
- client.describeSnapshotsInRegion(snapshot.getRegion(), snapshotIds(snapshot.getId()));
- assert false : "shoud have exception";
- } catch (AWSResponseException e) {
- assertEquals(e.getError().getCode(), "InvalidSnapshot.NotFound");
- }
+ assert client.describeSnapshotsInRegion(snapshot.getRegion(), snapshotIds(snapshot.getId())).size() == 0;
}
@AfterTest
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/PlacementGroupClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/PlacementGroupClientLiveTest.java
index 9062ce171c..d13b7aa6f5 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/PlacementGroupClientLiveTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/PlacementGroupClientLiveTest.java
@@ -56,7 +56,9 @@ import org.jclouds.compute.domain.Template;
import org.jclouds.compute.predicates.NodePredicates;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
import org.jclouds.predicates.RetryablePredicate;
+import org.jclouds.ssh.jsch.config.JschSshClientModule;
import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeGroups;
import org.testng.annotations.Test;
@@ -85,13 +87,12 @@ public class PlacementGroupClientLiveTest {
protected String endpoint;
protected String apiversion;
+ @BeforeClass
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
- credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
- + ".credential");
- endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint");
- apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider
- + ".apiversion");
+ credential = System.getProperty("test." + provider + ".credential");
+ endpoint = System.getProperty("test." + provider + ".endpoint");
+ apiversion = System.getProperty("test." + provider + ".apiversion");
}
protected Properties setupProperties() {
@@ -99,9 +100,12 @@ public class PlacementGroupClientLiveTest {
overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true");
overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true");
overrides.setProperty(provider + ".identity", identity);
- overrides.setProperty(provider + ".credential", credential);
- overrides.setProperty(provider + ".endpoint", endpoint);
- overrides.setProperty(provider + ".apiversion", apiversion);
+ if (credential != null)
+ overrides.setProperty(provider + ".credential", credential);
+ if (endpoint != null)
+ overrides.setProperty(provider + ".endpoint", endpoint);
+ if (apiversion != null)
+ overrides.setProperty(provider + ".apiversion", apiversion);
return overrides;
}
@@ -109,14 +113,14 @@ public class PlacementGroupClientLiveTest {
public void setupClient() throws FileNotFoundException, IOException {
setupCredentials();
Properties overrides = setupProperties();
- context = new ComputeServiceContextFactory().createContext(provider, ImmutableSet
- . of(new Log4JLoggingModule()), overrides);
+ context = new ComputeServiceContextFactory().createContext(provider,
+ ImmutableSet. of(new Log4JLoggingModule(), new JschSshClientModule()), overrides);
keyPair = setupKeyPair();
client = EC2Client.class.cast(context.getProviderSpecificContext().getApi());
availableTester = new RetryablePredicate(new PlacementGroupAvailable(client), 60, 1,
- TimeUnit.SECONDS);
+ TimeUnit.SECONDS);
deletedTester = new RetryablePredicate(new PlacementGroupDeleted(client), 60, 1, TimeUnit.SECONDS);
}
@@ -125,12 +129,12 @@ public class PlacementGroupClientLiveTest {
void testDescribe() {
for (String region : newArrayList(Region.US_EAST_1)) {
SortedSet allResults = newTreeSet(client.getPlacementGroupServices()
- .describePlacementGroupsInRegion(region));
+ .describePlacementGroupsInRegion(region));
assertNotNull(allResults);
if (allResults.size() >= 1) {
PlacementGroup group = allResults.last();
SortedSet result = newTreeSet(client.getPlacementGroupServices()
- .describePlacementGroupsInRegion(region, group.getName()));
+ .describePlacementGroupsInRegion(region, group.getName()));
assertNotNull(result);
PlacementGroup compare = result.last();
assertEquals(compare, group);
@@ -159,7 +163,7 @@ public class PlacementGroupClientLiveTest {
private void verifyPlacementGroup(String groupName) {
assert availableTester.apply(new PlacementGroup(Region.US_EAST_1, groupName, "cluster", State.PENDING)) : group;
Set oneResult = client.getPlacementGroupServices().describePlacementGroupsInRegion(null,
- groupName);
+ groupName);
assertNotNull(oneResult);
assertEquals(oneResult.size(), 1);
group = oneResult.iterator().next();
@@ -169,6 +173,7 @@ public class PlacementGroupClientLiveTest {
}
public void testStartCCInstance() throws Exception {
+
Set extends Hardware> sizes = context.getComputeService().listHardwareProfiles();
assert any(sizes, new Predicate() {
@@ -194,17 +199,19 @@ public class PlacementGroupClientLiveTest {
assertEquals(template.getImage().getId(), "us-east-1/ami-7ea24a17");
template.getOptions().installPrivateKey(keyPair.get("private")).authorizePublicKey(keyPair.get("public"))
- .runScript(buildScript(template.getImage().getOperatingSystem()));
+ .runScript(buildScript(template.getImage().getOperatingSystem()));
String tag = PREFIX + "cccluster";
context.getComputeService().destroyNodesMatching(NodePredicates.withTag(tag));
+ // TODO make this not lookup an explicit region
+ client.getPlacementGroupServices().deletePlacementGroupInRegion(null, "jclouds#" + tag + "#us-east-1");
try {
Set extends NodeMetadata> nodes = context.getComputeService().runNodesWithTag(tag, 1, template);
NodeMetadata node = getOnlyElement(nodes);
getOnlyElement(getOnlyElement(client.getInstanceServices().describeInstancesInRegion(null,
- node.getProviderId())));
+ node.getProviderId())));
} catch (RunNodesException e) {
System.err.println(e.getNodeErrors().keySet());
diff --git a/aws/core/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java b/aws/core/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java
index 221bea329d..1c296ddb62 100644
--- a/aws/core/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java
@@ -68,6 +68,12 @@ public class ParseAWSErrorFromXmlContentTest {
assertCodeMakes("GET", URI.create("https://amazonaws.com/foo"), 400, "",
"IncorrectState", IllegalStateException.class);
}
+
+ @Test
+ public void test409SetsIllegalStateException() {
+ assertCodeMakes("PUT", URI.create("https://adriancole-blobstore011.s3.amazonaws.com/"), 409, "",
+ "OperationAbortedA conflicting conditional operation is currently in progress against this resource. Please try again.F716E81C3D814E59SDprHxWzG/YXzanVnV7VTz/wP+6fRt1dS+q00kH1rz248YOOSddkFiTXF04XtqNO", IllegalStateException.class);
+ }
@Test
public void test400WithInvalidGroupDuplicateIllegalStateException() {
diff --git a/aws/core/src/test/java/org/jclouds/aws/s3/services/BucketsLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/s3/services/BucketsLiveTest.java
index 559e9eaf7c..da9db89386 100644
--- a/aws/core/src/test/java/org/jclouds/aws/s3/services/BucketsLiveTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/s3/services/BucketsLiveTest.java
@@ -39,17 +39,17 @@ import java.util.concurrent.TimeoutException;
import org.jclouds.aws.domain.Region;
import org.jclouds.aws.s3.S3Client;
import org.jclouds.aws.s3.domain.AccessControlList;
+import org.jclouds.aws.s3.domain.AccessControlList.CanonicalUserGrantee;
+import org.jclouds.aws.s3.domain.AccessControlList.EmailAddressGrantee;
+import org.jclouds.aws.s3.domain.AccessControlList.Grant;
+import org.jclouds.aws.s3.domain.AccessControlList.GroupGranteeURI;
+import org.jclouds.aws.s3.domain.AccessControlList.Permission;
import org.jclouds.aws.s3.domain.BucketLogging;
import org.jclouds.aws.s3.domain.BucketMetadata;
import org.jclouds.aws.s3.domain.CannedAccessPolicy;
import org.jclouds.aws.s3.domain.ListBucketResponse;
import org.jclouds.aws.s3.domain.Payer;
import org.jclouds.aws.s3.domain.S3Object;
-import org.jclouds.aws.s3.domain.AccessControlList.CanonicalUserGrantee;
-import org.jclouds.aws.s3.domain.AccessControlList.EmailAddressGrantee;
-import org.jclouds.aws.s3.domain.AccessControlList.Grant;
-import org.jclouds.aws.s3.domain.AccessControlList.GroupGranteeURI;
-import org.jclouds.aws.s3.domain.AccessControlList.Permission;
import org.jclouds.aws.s3.internal.StubS3AsyncClient;
import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest;
import org.jclouds.util.Utils;
@@ -90,7 +90,7 @@ public class BucketsLiveTest extends BaseBlobStoreIntegrationTest {
}
public void testPrivateAclIsDefaultForBucket() throws InterruptedException, ExecutionException, TimeoutException,
- IOException {
+ IOException {
String bucketName = getContainerName();
try {
AccessControlList acl = getApi().getBucketACL(bucketName);
@@ -105,7 +105,7 @@ public class BucketsLiveTest extends BaseBlobStoreIntegrationTest {
}
public void testUpdateBucketACL() throws InterruptedException, ExecutionException, TimeoutException, IOException,
- Exception {
+ Exception {
String bucketName = getContainerName();
try {
// Confirm the bucket is private
@@ -221,9 +221,9 @@ public class BucketsLiveTest extends BaseBlobStoreIntegrationTest {
assertNull(getApi().getBucketLogging(bucketName));
setupAclForBucketLoggingTarget(targetBucket);
- final BucketLogging logging = new BucketLogging(targetBucket, "access_log-", ImmutableSet
- . of(new Grant(new EmailAddressGrantee(StubS3AsyncClient.TEST_ACL_EMAIL),
- Permission.FULL_CONTROL)));
+ final BucketLogging logging = new BucketLogging(targetBucket, "access_log-",
+ ImmutableSet. of(new Grant(new EmailAddressGrantee(StubS3AsyncClient.TEST_ACL_EMAIL),
+ Permission.FULL_CONTROL)));
getApi().enableBucketLogging(bucketName, logging);
@@ -231,6 +231,7 @@ public class BucketsLiveTest extends BaseBlobStoreIntegrationTest {
public void run() {
try {
BucketLogging newLogging = getApi().getBucketLogging(bucketName);
+ assert newLogging !=null;
AccessControlList acl = new AccessControlList();
for (Grant grant : newLogging.getTargetGrants()) { // TODO: add permission
// checking features to
@@ -277,7 +278,7 @@ public class BucketsLiveTest extends BaseBlobStoreIntegrationTest {
public void testEu() throws Exception {
final String bucketName = getScratchContainerName();
try {
- getApi().putBucketInRegion(Region.EU_WEST_1, bucketName + "eu", withBucketAcl(CannedAccessPolicy.PUBLIC_READ));
+ getApi().putBucketInRegion(Region.EU, bucketName + "eu", withBucketAcl(CannedAccessPolicy.PUBLIC_READ));
assertConsistencyAware(new Runnable() {
public void run() {
try {
@@ -288,7 +289,7 @@ public class BucketsLiveTest extends BaseBlobStoreIntegrationTest {
}
}
});
- assertEquals(Region.EU_WEST_1, getApi().getBucketLocation(bucketName + "eu"));
+ assertEquals(Region.EU, getApi().getBucketLocation(bucketName + "eu"));
// TODO: I believe that the following should work based on the above acl assertion passing.
// However, it fails on 403
// URL url = new URL(String.format("http://%s.s3.amazonaws.com", bucketName));
@@ -298,7 +299,6 @@ public class BucketsLiveTest extends BaseBlobStoreIntegrationTest {
}
}
-
void bucketExists() throws Exception {
String bucketName = getContainerName();
try {
@@ -334,7 +334,7 @@ public class BucketsLiveTest extends BaseBlobStoreIntegrationTest {
}
public void testListBucketDelimiter() throws InterruptedException, ExecutionException, TimeoutException,
- UnsupportedEncodingException {
+ UnsupportedEncodingException {
String bucketName = getContainerName();
try {
String prefix = "apps";
@@ -352,7 +352,7 @@ public class BucketsLiveTest extends BaseBlobStoreIntegrationTest {
}
public void testListBucketPrefix() throws InterruptedException, ExecutionException, TimeoutException,
- UnsupportedEncodingException {
+ UnsupportedEncodingException {
String bucketName = getContainerName();
try {
String prefix = "apps";
@@ -370,7 +370,7 @@ public class BucketsLiveTest extends BaseBlobStoreIntegrationTest {
}
public void testListBucketMaxResults() throws InterruptedException, ExecutionException, TimeoutException,
- UnsupportedEncodingException {
+ UnsupportedEncodingException {
String bucketName = getContainerName();
try {
addAlphabetUnderRoot(bucketName);
diff --git a/aws/core/src/test/java/org/jclouds/aws/sqs/SQSClientLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/sqs/SQSClientLiveTest.java
index 77692c30ba..53b57d3186 100644
--- a/aws/core/src/test/java/org/jclouds/aws/sqs/SQSClientLiveTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/sqs/SQSClientLiveTest.java
@@ -68,10 +68,9 @@ public class SQSClientLiveTest {
protected void setupCredentials() {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
- + ".credential");
- endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint");
- apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider
- + ".apiversion");
+ + ".credential");
+ endpoint = System.getProperty("test." + provider + ".endpoint");
+ apiversion = System.getProperty("test." + provider + ".apiversion");
}
protected Properties setupProperties() {
@@ -79,9 +78,12 @@ public class SQSClientLiveTest {
overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true");
overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true");
overrides.setProperty(provider + ".identity", identity);
- overrides.setProperty(provider + ".credential", credential);
- overrides.setProperty(provider + ".endpoint", endpoint);
- overrides.setProperty(provider + ".apiversion", apiversion);
+ if (credential != null)
+ overrides.setProperty(provider + ".credential", credential);
+ if (endpoint != null)
+ overrides.setProperty(provider + ".endpoint", endpoint);
+ if (apiversion != null)
+ overrides.setProperty(provider + ".apiversion", apiversion);
return overrides;
}
@@ -90,14 +92,14 @@ public class SQSClientLiveTest {
setupCredentials();
Properties overrides = setupProperties();
context = new RestContextFactory().createContext(provider, ImmutableSet. of(new Log4JLoggingModule()),
- overrides);
+ overrides);
this.client = context.getApi();
}
@Test
void testListQueuesInRegion() throws InterruptedException {
for (String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, Region.US_WEST_1,
- Region.AP_SOUTHEAST_1)) {
+ Region.AP_SOUTHEAST_1)) {
SortedSet allResults = Sets.newTreeSet(client.listQueuesInRegion(region));
assertNotNull(allResults);
if (allResults.size() >= 1) {
@@ -114,7 +116,7 @@ public class SQSClientLiveTest {
String queueName = PREFIX + "1";
for (final String region : Lists.newArrayList(null, Region.EU_WEST_1, Region.US_EAST_1, Region.US_WEST_1,
- Region.AP_SOUTHEAST_1)) {
+ Region.AP_SOUTHEAST_1)) {
try {
SortedSet result = Sets.newTreeSet(client.listQueuesInRegion(region, queuePrefix(queueName)));
if (result.size() >= 1) {
@@ -182,7 +184,7 @@ public class SQSClientLiveTest {
assertion.run();
if (i > 0)
System.err.printf("%d attempts and %dms asserting %s%n", i + 1, System.currentTimeMillis() - start,
- assertion.getClass().getSimpleName());
+ assertion.getClass().getSimpleName());
return;
} catch (AssertionError e) {
error = e;
diff --git a/aws/core/src/test/resources/ec2/rightscale_images.xml b/aws/core/src/test/resources/ec2/rightscale_images.xml
index 042ef5ce1b..8fdf40a769 100644
--- a/aws/core/src/test/resources/ec2/rightscale_images.xml
+++ b/aws/core/src/test/resources/ec2/rightscale_images.xml
@@ -41,5 +41,54 @@
+
+ ami-710c2605
+ 411009282317/RightImage Windows_2003_i386_v5.4.3
+ available
+ 411009282317
+ true
+ i386
+ machine
+ windows
+ RightImage Windows_2003_i386_v5.4.3
+ Built by RightScale
+ ebs
+ /dev/sda1
+
+
+ /dev/sda1
+
+ snap-9460affd
+ 35
+ true
+
+
+
+ hvm
+
+
+ ami-c6a882b2
+ 411009282317/RightImage_Windows_2008_x64_v5.5.5
+ 411009282317
+ true
+ x86_64
+ machine
+ windows
+ RightImage_Windows_2008_x64_v5.5.5
+ Built by RightScale
+ ebs
+ /dev/sda1
+
+
+ /dev/sda1
+
+ snap-68b26c01
+ 80
+ true
+
+
+
+ hvm
+
diff --git a/aws/core/src/test/resources/log4j.xml b/aws/core/src/test/resources/log4j.xml
index 1d36e512fd..5b548a0f48 100644
--- a/aws/core/src/test/resources/log4j.xml
+++ b/aws/core/src/test/resources/log4j.xml
@@ -162,12 +162,10 @@
-
diff --git a/azure/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java b/azure/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java
index cf0cbd58ce..73a52773af 100644
--- a/azure/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java
+++ b/azure/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java
@@ -68,12 +68,20 @@ public class ParseAzureStorageErrorFromXmlContent implements HttpErrorHandler {
try {
if (response.getPayload() != null) {
String contentType = response.getPayload().getContentMetadata().getContentType();
- if (contentType != null && (contentType.indexOf("xml") != -1 || contentType.indexOf("unknown") != -1)) {
- AzureStorageError error = utils.parseAzureStorageErrorFromContent(command, response, response
+ if (contentType != null && (contentType.indexOf("xml") != -1 || contentType.indexOf("unknown") != -1)
+ && !new Long(0).equals(response.getPayload().getContentMetadata().getContentLength())) {
+ try {
+ AzureStorageError error = utils.parseAzureStorageErrorFromContent(command, response, response
.getPayload().getInput());
- if (error != null) {
- message = error.getMessage();
- exception = new AzureStorageResponseException(command, response, error);
+ if (error != null) {
+ message = error.getMessage();
+ exception = new AzureStorageResponseException(command, response, error);
+ }
+ } catch (RuntimeException e) {
+ try {
+ message = Utils.toStringAndClose(response.getPayload().getInput());
+ } catch (IOException e1) {
+ }
}
} else {
try {
@@ -83,29 +91,28 @@ public class ParseAzureStorageErrorFromXmlContent implements HttpErrorHandler {
}
}
message = message != null ? message : String.format("%s -> %s", command.getRequest().getRequestLine(),
- response.getStatusLine());
+ response.getStatusLine());
switch (response.getStatusCode()) {
- case 401:
- exception = new AuthorizationException(command.getRequest(), message);
- break;
- case 404:
-
- if (!command.getRequest().getMethod().equals("DELETE")) {
- String path = command.getRequest().getEndpoint().getPath();
- Matcher matcher = CONTAINER_PATH.matcher(path);
+ case 401:
+ exception = new AuthorizationException(command.getRequest(), message);
+ break;
+ case 404:
+ if (!command.getRequest().getMethod().equals("DELETE")) {
+ String path = command.getRequest().getEndpoint().getPath();
+ Matcher matcher = CONTAINER_PATH.matcher(path);
+ if (matcher.find()) {
+ exception = new ContainerNotFoundException(matcher.group(1), message);
+ } else {
+ matcher = CONTAINER_KEY_PATH.matcher(path);
if (matcher.find()) {
- exception = new ContainerNotFoundException(matcher.group(1), message);
- } else {
- matcher = CONTAINER_KEY_PATH.matcher(path);
- if (matcher.find()) {
- exception = new KeyNotFoundException(matcher.group(1), matcher.group(2), message);
- }
+ exception = new KeyNotFoundException(matcher.group(1), matcher.group(2), message);
}
}
- break;
- case 411:
- exception = new IllegalArgumentException(message);
- break;
+ }
+ break;
+ case 411:
+ exception = new IllegalArgumentException(message);
+ break;
}
} finally {
releasePayload(response);
diff --git a/azure/src/test/java/org/jclouds/azure/storage/handlers/ParseAzureErrorFromXmlContentTest.java b/azure/src/test/java/org/jclouds/azure/storage/handlers/ParseAzureErrorFromXmlContentTest.java
index 5f19192af7..76df0346b2 100644
--- a/azure/src/test/java/org/jclouds/azure/storage/handlers/ParseAzureErrorFromXmlContentTest.java
+++ b/azure/src/test/java/org/jclouds/azure/storage/handlers/ParseAzureErrorFromXmlContentTest.java
@@ -28,6 +28,7 @@ import static org.easymock.classextension.EasyMock.verify;
import java.net.URI;
import org.easymock.IArgumentMatcher;
+import org.jclouds.azure.storage.AzureStorageResponseException;
import org.jclouds.azure.storage.filters.SharedKeyLiteAuthentication;
import org.jclouds.http.HttpCommand;
import org.jclouds.http.HttpRequest;
@@ -49,14 +50,33 @@ public class ParseAzureErrorFromXmlContentTest {
@Test
public void test411WithTextHtmlIllegalArgumentException() {
- assertCodeMakes("PUT", URI
- .create("https://jclouds.blob.core.windows.net/adriancole-azureblob-413790770?restype=container"), 411,
- "Length Required", "text/html; charset=us-ascii", "Length Required\r\n",
- IllegalArgumentException.class);
+ assertCodeMakes("PUT",
+ URI.create("https://jclouds.blob.core.windows.net/adriancole-azureblob-413790770?restype=container"), 411,
+ "Length Required", "text/html; charset=us-ascii", "Length Required\r\n",
+ IllegalArgumentException.class);
+ }
+
+ @Test
+ public void test304WithNoContentIllegalArgumentException() {
+ assertCodeMakes("GET", URI.create("https://jclouds.blob.core.windows.net/adriancole-blobstore0/apples"), 411,
+ "HTTP/1.1 304 The condition specified using HTTP conditional header(s) is not met.", "application/unknown",
+ "", IllegalArgumentException.class);
+ }
+
+ @Test
+ public void test412WithTextHtmlHttpResponseException() {
+ assertCodeMakes(
+ "GET",
+ URI.create("https://jclouds.blob.core.windows.net/adriancole-blobstore2?restype=container&comp=list&prefix=apps/apps/apps/&include=metadata"),
+ 412,
+ "HTTP/1.1 412 The condition specified using HTTP conditional header(s) is not met.",
+ "application/xml",
+ "ConditionNotMetThe condition specified using HTTP conditional header(s) is not met.\nRequestId:921efcad-84bc-4e0a-863d-24810d1096e1\nTime:2010-11-04T15:03:07.8694513Z",
+ AzureStorageResponseException.class);
}
private void assertCodeMakes(String method, URI uri, int statusCode, String message, String contentType,
- String content, Class extends Exception> expected) {
+ String content, Class extends Exception> expected) {
ParseAzureStorageErrorFromXmlContent function = Guice.createInjector(new SaxParserModule(), new AbstractModule() {
@@ -70,7 +90,7 @@ public class ParseAzureErrorFromXmlContentTest {
HttpCommand command = createMock(HttpCommand.class);
HttpRequest request = new HttpRequest(method, uri);
HttpResponse response = new HttpResponse(statusCode, message, Payloads.newInputStreamPayload(Utils
- .toInputStream(content)));
+ .toInputStream(content)));
response.getPayload().getContentMetadata().setContentType(contentType);
expect(command.getRequest()).andReturn(request).atLeastOnce();
diff --git a/blobstore/src/main/clojure/org/jclouds/blobstore.clj b/blobstore/src/main/clojure/org/jclouds/blobstore.clj
index 8b626ff69a..3807697c1a 100644
--- a/blobstore/src/main/clojure/org/jclouds/blobstore.clj
+++ b/blobstore/src/main/clojure/org/jclouds/blobstore.clj
@@ -21,7 +21,8 @@
"A clojure binding for the jclouds BlobStore.
Current supported services are:
- [transient, filesystem, s3, azureblob, atmos, cloudfiles, walrus, googlestorage]
+ [transient, filesystem, s3, azureblob, atmos, cloudfiles, walrus,
+ googlestorage, synaptic, peer1-storage]
Here's a quick example of how to viewresources in rackspace
diff --git a/compute/src/main/java/org/jclouds/compute/ComputeService.java b/compute/src/main/java/org/jclouds/compute/ComputeService.java
index 5df136488f..11da882153 100755
--- a/compute/src/main/java/org/jclouds/compute/ComputeService.java
+++ b/compute/src/main/java/org/jclouds/compute/ComputeService.java
@@ -137,7 +137,7 @@ public interface ComputeService {
* default, equivalent to {@code templateBuilder().any().options(templateOptions)}.
*/
Set extends NodeMetadata> runNodesWithTag(String tag, int count, TemplateOptions templateOptions)
- throws RunNodesException;
+ throws RunNodesException;
/**
* Like {@link ComputeService#runNodesWithTag(String,int,TemplateOptions)}, except that the
@@ -148,6 +148,10 @@ public interface ComputeService {
/**
* resume the node from {@link org.jclouds.compute.domain.NodeState#SUSPENDED suspended} state,
* given its id.
+ *
+ *
note
+ *
+ * affected nodes may not resume with the same IP address(es)
*/
void resumeNode(String id);
@@ -155,6 +159,10 @@ public interface ComputeService {
* nodes matching the filter are treated as a logical set. Using the resume command, you can save
* time by resumeing the nodes in parallel.
*
+ *
note
+ *
+ * affected nodes may not resume with the same IP address(es)
+ *
* @throws UnsupportedOperationException
* if the underlying provider doesn't support suspend/resume
*/
@@ -164,6 +172,10 @@ public interface ComputeService {
* suspend the node, given its id. This will result in
* {@link org.jclouds.compute.domain.NodeState#SUSPENDED suspended} state.
*
+ *
note
+ *
+ * affected nodes may not resume with the same IP address(es)
+ *
* @throws UnsupportedOperationException
* if the underlying provider doesn't support suspend/resume
*/
@@ -173,6 +185,9 @@ public interface ComputeService {
* nodes matching the filter are treated as a logical set. Using the suspend command, you can
* save time by suspending the nodes in parallel.
*
+ *
note
+ *
+ * affected nodes may not resume with the same IP address(es)
*/
void suspendNodesMatching(Predicate filter);
@@ -224,7 +239,7 @@ public interface ComputeService {
* @see org.jclouds.compute.predicates.NodePredicates#runningWithTag(String)
*/
Map extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate filter, Payload runScript)
- throws RunScriptOnNodesException;
+ throws RunScriptOnNodesException;
/**
* Run the script on all nodes with the specific tag.
@@ -243,6 +258,6 @@ public interface ComputeService {
* @see org.jclouds.io.Payloads
*/
Map extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate filter,
- Payload runScript, RunScriptOptions options) throws RunScriptOnNodesException;
+ Payload runScript, RunScriptOptions options) throws RunScriptOnNodesException;
}
diff --git a/compute/src/main/java/org/jclouds/compute/Utils.java b/compute/src/main/java/org/jclouds/compute/Utils.java
index 3d25c26635..345fb6ee37 100644
--- a/compute/src/main/java/org/jclouds/compute/Utils.java
+++ b/compute/src/main/java/org/jclouds/compute/Utils.java
@@ -44,4 +44,5 @@ public interface Utils extends org.jclouds.rest.Utils {
* @return function that gets an ssh client for a node that is available via ssh.
*/
Function sshForNode();
+
}
diff --git a/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java b/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java
index 5eb304e647..c8826d6570 100644
--- a/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java
+++ b/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java
@@ -35,9 +35,12 @@ import org.jclouds.compute.domain.ComputeMetadata;
import org.jclouds.compute.domain.Hardware;
import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.NodeMetadata;
+import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.domain.TemplateBuilder;
import org.jclouds.compute.functions.CreateSshClientOncePortIsListeningOnNode;
+import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.domain.Location;
+import org.jclouds.json.Json;
import org.jclouds.rest.AuthorizationException;
import org.jclouds.rest.suppliers.RetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
import org.jclouds.ssh.SshClient;
@@ -70,13 +73,20 @@ public abstract class BaseComputeServiceContextModule extends AbstractModule {
bind(LoadBalancerService.class).toProvider(Providers. of(null)).in(Scopes.SINGLETON);
}
+ @Provides
+ @Singleton
+ public Map> provideOsVersionMap(ComputeServiceConstants.ReferenceData data, Json json) {
+ return json.fromJson(data.osVersionMapJson, new TypeLiteral
+ *
+ *
NOTE: the order of invocation of configuration methods does not matter.
+ *
+ * @author Inderjeet Singh
+ * @author Joel Leitch
+ */
+public final class JcloudsGsonBuilder {
+ private static final InnerClassExclusionStrategy innerClassExclusionStrategy =
+ new InnerClassExclusionStrategy();
+ private static final ExposeAnnotationSerializationExclusionStrategy
+ exposeAnnotationSerializationExclusionStrategy =
+ new ExposeAnnotationSerializationExclusionStrategy();
+ private static final ExposeAnnotationDeserializationExclusionStrategy
+ exposeAnnotationDeserializationExclusionStrategy =
+ new ExposeAnnotationDeserializationExclusionStrategy();
+
+ private final Collection exclusionStrategies =
+ new HashSet();
+
+ private double ignoreVersionsAfter;
+ private ModifierBasedExclusionStrategy modifierBasedExclusionStrategy;
+ private boolean serializeInnerClasses;
+ private boolean excludeFieldsWithoutExposeAnnotation;
+ private LongSerializationPolicy longSerializationPolicy;
+ private FieldNamingStrategy2 fieldNamingPolicy;
+ private final ParameterizedTypeHandlerMap> instanceCreators;
+ private final ParameterizedTypeHandlerMap> serializers;
+ private final ParameterizedTypeHandlerMap> deserializers;
+ private boolean serializeNulls;
+ private String datePattern;
+ private int dateStyle;
+ private int timeStyle;
+ private boolean serializeSpecialFloatingPointValues;
+ private boolean escapeHtmlChars;
+ private boolean prettyPrinting;
+ private boolean generateNonExecutableJson;
+
+ /**
+ * Creates a JcloudsGsonBuilder instance that can be used to build Gson with various configuration
+ * settings. JcloudsGsonBuilder follows the builder pattern, and it is typically used by first
+ * invoking various configuration methods to set desired options, and finally calling
+ * {@link #create()}.
+ */
+ public JcloudsGsonBuilder() {
+ // add default exclusion strategies
+ exclusionStrategies.add(Gson.DEFAULT_ANON_LOCAL_CLASS_EXCLUSION_STRATEGY);
+ exclusionStrategies.add(Gson.DEFAULT_SYNTHETIC_FIELD_EXCLUSION_STRATEGY);
+
+ // setup default values
+ ignoreVersionsAfter = VersionConstants.IGNORE_VERSIONS;
+ serializeInnerClasses = true;
+ prettyPrinting = false;
+ escapeHtmlChars = true;
+ modifierBasedExclusionStrategy = Gson.DEFAULT_MODIFIER_BASED_EXCLUSION_STRATEGY;
+ excludeFieldsWithoutExposeAnnotation = false;
+ longSerializationPolicy = LongSerializationPolicy.DEFAULT;
+ fieldNamingPolicy = Gson.DEFAULT_NAMING_POLICY;
+ instanceCreators = new ParameterizedTypeHandlerMap>();
+ serializers = new ParameterizedTypeHandlerMap>();
+ deserializers = new ParameterizedTypeHandlerMap>();
+ serializeNulls = false;
+ dateStyle = DateFormat.DEFAULT;
+ timeStyle = DateFormat.DEFAULT;
+ serializeSpecialFloatingPointValues = false;
+ generateNonExecutableJson = false;
+ }
+
+ /**
+ * Configures Gson to enable versioning support.
+ *
+ * @param ignoreVersionsAfter any field or type marked with a version higher than this value
+ * are ignored during serialization or deserialization.
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ */
+ public JcloudsGsonBuilder setVersion(double ignoreVersionsAfter) {
+ this.ignoreVersionsAfter = ignoreVersionsAfter;
+ return this;
+ }
+
+ /**
+ * Configures Gson to excludes all class fields that have the specified modifiers. By default,
+ * Gson will exclude all fields marked transient or static. This method will override that
+ * behavior.
+ *
+ * @param modifiers the field modifiers. You must use the modifiers specified in the
+ * {@link java.lang.reflect.Modifier} class. For example,
+ * {@link java.lang.reflect.Modifier#TRANSIENT},
+ * {@link java.lang.reflect.Modifier#STATIC}.
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ */
+ public JcloudsGsonBuilder excludeFieldsWithModifiers(int... modifiers) {
+ modifierBasedExclusionStrategy = new ModifierBasedExclusionStrategy(modifiers);
+ return this;
+ }
+
+ /**
+ * Makes the output JSON non-executable in Javascript by prefixing the generated JSON with some
+ * special text. This prevents attacks from third-party sites through script sourcing. See
+ * Gson Issue 42
+ * for details.
+ *
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ * @since 1.3
+ */
+ public JcloudsGsonBuilder generateNonExecutableJson() {
+ this.generateNonExecutableJson = true;
+ return this;
+ }
+
+ /**
+ * Configures Gson to exclude all fields from consideration for serialization or deserialization
+ * that do not have the {@link com.google.gson.annotations.Expose} annotation.
+ *
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ */
+ public JcloudsGsonBuilder excludeFieldsWithoutExposeAnnotation() {
+ excludeFieldsWithoutExposeAnnotation = true;
+ return this;
+ }
+
+ /**
+ * Configure Gson to serialize null fields. By default, Gson omits all fields that are null
+ * during serialization.
+ *
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ * @since 1.2
+ */
+ public JcloudsGsonBuilder serializeNulls() {
+ this.serializeNulls = true;
+ return this;
+ }
+
+ /**
+ * Configures Gson to exclude inner classes during serialization.
+ *
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ * @since 1.3
+ */
+ public JcloudsGsonBuilder disableInnerClassSerialization() {
+ serializeInnerClasses = false;
+ return this;
+ }
+
+ /**
+ * Configures Gson to apply a specific serialization policy for {@code Long} and {@code long}
+ * objects.
+ *
+ * @param serializationPolicy the particular policy to use for serializing longs.
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ * @since 1.3
+ */
+ public JcloudsGsonBuilder setLongSerializationPolicy(LongSerializationPolicy serializationPolicy) {
+ this.longSerializationPolicy = serializationPolicy;
+ return this;
+ }
+
+ /**
+ * Configures Gson to apply a specific naming policy to an object's field during serialization
+ * and deserialization.
+ *
+ * @param namingConvention the JSON field naming convention to use for serialization and
+ * deserialization.
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ */
+ public JcloudsGsonBuilder setFieldNamingPolicy(FieldNamingPolicy namingConvention) {
+ return setFieldNamingStrategy(namingConvention.getFieldNamingPolicy());
+ }
+
+ /**
+ * Configures Gson to apply a specific naming policy strategy to an object's field during
+ * serialization and deserialization.
+ *
+ * @param fieldNamingStrategy the actual naming strategy to apply to the fields
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ * @since 1.3
+ */
+ public JcloudsGsonBuilder setFieldNamingStrategy(FieldNamingStrategy fieldNamingStrategy) {
+ return setFieldNamingStrategy(new FieldNamingStrategy2Adapter(fieldNamingStrategy));
+ }
+
+ /**
+ * Configures Gson to apply a specific naming policy strategy to an object's field during
+ * serialization and deserialization.
+ *
+ * @param fieldNamingStrategy the actual naming strategy to apply to the fields
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ */
+ JcloudsGsonBuilder setFieldNamingStrategy(FieldNamingStrategy2 fieldNamingStrategy) {
+ this.fieldNamingPolicy =
+ new SerializedNameAnnotationInterceptingNamingPolicy(fieldNamingStrategy);
+ return this;
+ }
+
+ /**
+ * Configures Gson to apply a set of exclusion strategies during both serialization and
+ * deserialization. Each of the {@code strategies} will be applied as a disjunction rule.
+ * This means that if one of the {@code strategies} suggests that a field (or class) should be
+ * skipped then that field (or object) is skipped during serializaiton/deserialization.
+ *
+ * @param strategies the set of strategy object to apply during object (de)serialization.
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ * @since 1.4
+ */
+ public JcloudsGsonBuilder setExclusionStrategies(ExclusionStrategy... strategies) {
+ for (ExclusionStrategy strategy : strategies) {
+ exclusionStrategies.add(strategy);
+ }
+ return this;
+ }
+
+ /**
+ * Configures Gson to output Json that fits in a page for pretty printing. This option only
+ * affects Json serialization.
+ *
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ */
+ public JcloudsGsonBuilder setPrettyPrinting() {
+ prettyPrinting = true;
+ return this;
+ }
+
+ /**
+ * By default, Gson escapes HTML characters such as < > etc. Use this option to configure
+ * Gson to pass-through HTML characters as is.
+ *
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ * @since 1.3
+ */
+ public JcloudsGsonBuilder disableHtmlEscaping() {
+ this.escapeHtmlChars = false;
+ return this;
+ }
+
+ /**
+ * Configures Gson to serialize {@code Date} objects according to the pattern provided. You can
+ * call this method or {@link #setDateFormat(int)} multiple times, but only the last invocation
+ * will be used to decide the serialization format.
+ *
+ *
Note that this pattern must abide by the convention provided by {@code SimpleDateFormat}
+ * class. See the documentation in {@link java.text.SimpleDateFormat} for more information on
+ * valid date and time patterns.
+ *
+ * @param pattern the pattern that dates will be serialized/deserialized to/from
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ * @since 1.2
+ */
+ public JcloudsGsonBuilder setDateFormat(String pattern) {
+ // TODO(Joel): Make this fail fast if it is an invalid date format
+ this.datePattern = pattern;
+ return this;
+ }
+
+ /**
+ * Configures Gson to to serialize {@code Date} objects according to the style value provided.
+ * You can call this method or {@link #setDateFormat(String)} multiple times, but only the last
+ * invocation will be used to decide the serialization format.
+ *
+ *
Note that this style value should be one of the predefined constants in the
+ * {@code DateFormat} class. See the documentation in {@link java.text.DateFormat} for more
+ * information on the valid style constants.
+ *
+ * @param style the predefined date style that date objects will be serialized/deserialized
+ * to/from
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ * @since 1.2
+ */
+ public JcloudsGsonBuilder setDateFormat(int style) {
+ this.dateStyle = style;
+ this.datePattern = null;
+ return this;
+ }
+
+ /**
+ * Configures Gson to to serialize {@code Date} objects according to the style value provided.
+ * You can call this method or {@link #setDateFormat(String)} multiple times, but only the last
+ * invocation will be used to decide the serialization format.
+ *
+ *
Note that this style value should be one of the predefined constants in the
+ * {@code DateFormat} class. See the documentation in {@link java.text.DateFormat} for more
+ * information on the valid style constants.
+ *
+ * @param dateStyle the predefined date style that date objects will be serialized/deserialized
+ * to/from
+ * @param timeStyle the predefined style for the time portion of the date objects
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ * @since 1.2
+ */
+ public JcloudsGsonBuilder setDateFormat(int dateStyle, int timeStyle) {
+ this.dateStyle = dateStyle;
+ this.timeStyle = timeStyle;
+ this.datePattern = null;
+ return this;
+ }
+
+ /**
+ * Configures Gson for custom serialization or deserialization. This method combines the
+ * registration of an {@link InstanceCreator}, {@link JsonSerializer}, and a
+ * {@link JsonDeserializer}. It is best used when a single object {@code typeAdapter} implements
+ * all the required interfaces for custom serialization with Gson. If an instance creator,
+ * serializer or deserializer was previously registered for the specified {@code type}, it is
+ * overwritten.
+ *
+ * @param type the type definition for the type adapter being registered
+ * @param typeAdapter This object must implement at least one of the {@link InstanceCreator},
+ * {@link JsonSerializer}, and a {@link JsonDeserializer} interfaces.
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ */
+ public JcloudsGsonBuilder registerTypeAdapter(Type type, Object typeAdapter) {
+ Preconditions.checkArgument(typeAdapter instanceof JsonSerializer>
+ || typeAdapter instanceof JsonDeserializer> || typeAdapter instanceof InstanceCreator>);
+ if (typeAdapter instanceof InstanceCreator>) {
+ registerInstanceCreator(type, (InstanceCreator>) typeAdapter);
+ }
+ if (typeAdapter instanceof JsonSerializer>) {
+ registerSerializer(type, (JsonSerializer>) typeAdapter);
+ }
+ if (typeAdapter instanceof JsonDeserializer>) {
+ registerDeserializer(type, (JsonDeserializer>) typeAdapter);
+ }
+ return this;
+ }
+
+ /**
+ * Configures Gson to use a custom {@link InstanceCreator} for the specified type. If an instance
+ * creator was previously registered for the specified class, it is overwritten. Since this method
+ * takes a type instead of a Class object, it can be used to register a specific handler for a
+ * generic type corresponding to a raw type.
+ *
+ * @param the type for which instance creator is being registered
+ * @param typeOfT The Type definition for T
+ * @param instanceCreator the instance creator for T
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ */
+ private JcloudsGsonBuilder registerInstanceCreator(Type typeOfT,
+ InstanceCreator extends T> instanceCreator) {
+ instanceCreators.register(typeOfT, instanceCreator);
+ return this;
+ }
+
+ /**
+ * Configures Gson to use a custom JSON serializer for the specified type. You should use this
+ * method if you want to register different serializers for different generic types corresponding
+ * to a raw type.
+ *
+ * @param the type for which the serializer is being registered
+ * @param typeOfT The type definition for T
+ * @param serializer the custom serializer
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ */
+ private JcloudsGsonBuilder registerSerializer(Type typeOfT, final JsonSerializer serializer) {
+ serializers.register(typeOfT, serializer);
+ return this;
+ }
+
+ /**
+ * Configures Gson to use a custom JSON deserializer for the specified type. You should use this
+ * method if you want to register different deserializers for different generic types
+ * corresponding to a raw type.
+ *
+ * @param the type for which the deserializer is being registered
+ * @param typeOfT The type definition for T
+ * @param deserializer the custom deserializer
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ */
+ private JcloudsGsonBuilder registerDeserializer(Type typeOfT, JsonDeserializer deserializer) {
+ deserializers.register(typeOfT, new JsonDeserializerExceptionWrapper(deserializer));
+ return this;
+ }
+
+ /**
+ * Configures Gson for custom serialization or deserialization for an inheritance type hierarchy.
+ * This method combines the registration of an {@link InstanceCreator}, {@link JsonSerializer},
+ * and a {@link JsonDeserializer}. It is best used when a single object {@code typeAdapter}
+ * implements all the required interfaces for custom serialization with Gson.
+ * If an instance creator, serializer or deserializer was previously registered for the specified
+ * type hierarchy, it is overwritten. If an instance creator, serializer or deserializer is
+ * registered for a specific type in the type hierarchy, it will be invoked instead of the one
+ * registered for the type hierarchy.
+ *
+ * @param baseType the class definition for the type adapter being registered for the base class
+ * or interface
+ * @param typeAdapter This object must implement at least one of the {@link InstanceCreator},
+ * {@link JsonSerializer}, and a {@link JsonDeserializer} interfaces.
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ * @since 1.5
+ */
+ JcloudsGsonBuilder registerTypeHierarchyAdapter(Class> baseType, Object typeAdapter) {
+ Preconditions.checkArgument(typeAdapter instanceof JsonSerializer>
+ || typeAdapter instanceof JsonDeserializer> || typeAdapter instanceof InstanceCreator>);
+ if (typeAdapter instanceof InstanceCreator>) {
+ registerInstanceCreatorForTypeHierarchy(baseType, (InstanceCreator>) typeAdapter);
+ }
+ if (typeAdapter instanceof JsonSerializer>) {
+ registerSerializerForTypeHierarchy(baseType, (JsonSerializer>) typeAdapter);
+ }
+ if (typeAdapter instanceof JsonDeserializer>) {
+ registerDeserializerForTypeHierarchy(baseType, (JsonDeserializer>) typeAdapter);
+ }
+ return this;
+ }
+
+ private JcloudsGsonBuilder registerInstanceCreatorForTypeHierarchy(Class> classOfT,
+ InstanceCreator extends T> instanceCreator) {
+ instanceCreators.registerForTypeHierarchy(classOfT, instanceCreator);
+ return this;
+ }
+
+ private JcloudsGsonBuilder registerSerializerForTypeHierarchy(Class> classOfT,
+ final JsonSerializer serializer) {
+ serializers.registerForTypeHierarchy(classOfT, serializer);
+ return this;
+ }
+
+ private JcloudsGsonBuilder registerDeserializerForTypeHierarchy(Class> classOfT,
+ JsonDeserializer deserializer) {
+ deserializers.registerForTypeHierarchy(classOfT,
+ new JsonDeserializerExceptionWrapper(deserializer));
+ return this;
+ }
+
+ /**
+ * Section 2.4 of JSON specification disallows
+ * special double values (NaN, Infinity, -Infinity). However,
+ * Javascript
+ * specification (see section 4.3.20, 4.3.22, 4.3.23) allows these values as valid Javascript
+ * values. Moreover, most JavaScript engines will accept these special values in JSON without
+ * problem. So, at a practical level, it makes sense to accept these values as valid JSON even
+ * though JSON specification disallows them.
+ *
+ *
Gson always accepts these special values during deserialization. However, it outputs
+ * strictly compliant JSON. Hence, if it encounters a float value {@link Float#NaN},
+ * {@link Float#POSITIVE_INFINITY}, {@link Float#NEGATIVE_INFINITY}, or a double value
+ * {@link Double#NaN}, {@link Double#POSITIVE_INFINITY}, {@link Double#NEGATIVE_INFINITY}, it
+ * will throw an {@link IllegalArgumentException}. This method provides a way to override the
+ * default behavior when you know that the JSON receiver will be able to handle these special
+ * values.
+ *
+ * @return a reference to this {@code JcloudsGsonBuilder} object to fulfill the "Builder" pattern
+ * @since 1.3
+ */
+ public JcloudsGsonBuilder serializeSpecialFloatingPointValues() {
+ this.serializeSpecialFloatingPointValues = true;
+ return this;
+ }
+
+ /**
+ * Creates a {@link Gson} instance based on the current configuration. This method is free of
+ * side-effects to this {@code JcloudsGsonBuilder} instance and hence can be called multiple times.
+ *
+ * @return an instance of Gson configured with the options currently set in this builder
+ */
+ public Gson create() {
+ List serializationStrategies =
+ new LinkedList(exclusionStrategies);
+ List deserializationStrategies =
+ new LinkedList(exclusionStrategies);
+
+ serializationStrategies.add(modifierBasedExclusionStrategy);
+ deserializationStrategies.add(modifierBasedExclusionStrategy);
+
+ if (!serializeInnerClasses) {
+ serializationStrategies.add(innerClassExclusionStrategy);
+ deserializationStrategies.add(innerClassExclusionStrategy);
+ }
+ if (ignoreVersionsAfter != VersionConstants.IGNORE_VERSIONS) {
+ serializationStrategies.add(new VersionExclusionStrategy(ignoreVersionsAfter));
+ deserializationStrategies.add(new VersionExclusionStrategy(ignoreVersionsAfter));
+ }
+ if (excludeFieldsWithoutExposeAnnotation) {
+ serializationStrategies.add(exposeAnnotationSerializationExclusionStrategy);
+ deserializationStrategies.add(exposeAnnotationDeserializationExclusionStrategy);
+ }
+ ExclusionStrategy serializationExclusionStrategy =
+ new DisjunctionExclusionStrategy(serializationStrategies);
+ ExclusionStrategy deserializationExclusionStrategy =
+ new DisjunctionExclusionStrategy(deserializationStrategies);
+
+ ParameterizedTypeHandlerMap> customSerializers = serializers.copyOf();
+ ParameterizedTypeHandlerMap> customDeserializers = deserializers.copyOf();
+ addTypeAdaptersForDate(datePattern, dateStyle, timeStyle, customSerializers,
+ customDeserializers);
+
+ customSerializers.registerIfAbsent(JcloudsDefaultTypeAdapters.getDefaultSerializers(
+ serializeSpecialFloatingPointValues, longSerializationPolicy));
+
+ customDeserializers.registerIfAbsent(JcloudsDefaultTypeAdapters.getDefaultDeserializers());
+
+ ParameterizedTypeHandlerMap> customInstanceCreators =
+ instanceCreators.copyOf();
+ customInstanceCreators.registerIfAbsent(JcloudsDefaultTypeAdapters.getDefaultInstanceCreators());
+
+ customSerializers.makeUnmodifiable();
+ customDeserializers.makeUnmodifiable();
+ instanceCreators.makeUnmodifiable();
+
+ MappedObjectConstructor objConstructor = new MappedObjectConstructor(customInstanceCreators);
+
+ JsonFormatter formatter = prettyPrinting ?
+ new JsonPrintFormatter(escapeHtmlChars) : new JsonCompactFormatter(escapeHtmlChars);
+ Gson gson = new Gson(serializationExclusionStrategy, deserializationExclusionStrategy,
+ fieldNamingPolicy, objConstructor, formatter, serializeNulls, customSerializers,
+ customDeserializers, generateNonExecutableJson);
+ return gson;
+ }
+
+ private static void addTypeAdaptersForDate(String datePattern, int dateStyle, int timeStyle,
+ ParameterizedTypeHandlerMap> serializers,
+ ParameterizedTypeHandlerMap> deserializers) {
+ DefaultDateTypeAdapter dateTypeAdapter = null;
+ if (datePattern != null && !"".equals(datePattern.trim())) {
+ dateTypeAdapter = new DefaultDateTypeAdapter(datePattern);
+ } else if (dateStyle != DateFormat.DEFAULT && timeStyle != DateFormat.DEFAULT) {
+ dateTypeAdapter = new DefaultDateTypeAdapter(dateStyle, timeStyle);
+ }
+
+ if (dateTypeAdapter != null) {
+ if (!serializers.hasSpecificHandlerFor(Date.class)) {
+ serializers.register(Date.class, dateTypeAdapter);
+ }
+ if (!deserializers.hasSpecificHandlerFor(Date.class)) {
+ deserializers.register(Date.class, dateTypeAdapter);
+ }
+ }
+ }
+}
diff --git a/core/src/main/java/org/jclouds/concurrent/internal/SyncProxy.java b/core/src/main/java/org/jclouds/concurrent/internal/SyncProxy.java
index fa5e52477e..9594a7ecff 100644
--- a/core/src/main/java/org/jclouds/concurrent/internal/SyncProxy.java
+++ b/core/src/main/java/org/jclouds/concurrent/internal/SyncProxy.java
@@ -35,6 +35,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import org.jclouds.concurrent.Timeout;
+import org.jclouds.http.HttpResponseException;
import org.jclouds.internal.ClassMethodArgs;
import org.jclouds.rest.AuthorizationException;
import org.jclouds.rest.ResourceNotFoundException;
@@ -57,7 +58,7 @@ public class SyncProxy implements InvocationHandler {
@SuppressWarnings("unchecked")
public static T proxy(Class clazz, SyncProxy proxy) throws IllegalArgumentException, SecurityException,
- NoSuchMethodException {
+ NoSuchMethodException {
return (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class>[] { clazz }, proxy);
}
@@ -72,8 +73,8 @@ public class SyncProxy implements InvocationHandler {
@Inject
public SyncProxy(Class> declaring, Object async,
- @Named("sync") ConcurrentMap delegateMap, Map, Class>> sync2Async)
- throws SecurityException, NoSuchMethodException {
+ @Named("sync") ConcurrentMap delegateMap, Map, Class>> sync2Async)
+ throws SecurityException, NoSuchMethodException {
this.delegateMap = delegateMap;
this.delegate = async;
this.declaring = declaring;
@@ -92,7 +93,7 @@ public class SyncProxy implements InvocationHandler {
Method delegatedMethod = delegate.getClass().getMethod(method.getName(), method.getParameterTypes());
if (!Arrays.equals(delegatedMethod.getExceptionTypes(), method.getExceptionTypes()))
throw new IllegalArgumentException(String.format(
- "method %s has different typed exceptions than delegated method %s", method, delegatedMethod));
+ "method %s has different typed exceptions than delegated method %s", method, delegatedMethod));
if (delegatedMethod.getReturnType().isAssignableFrom(ListenableFuture.class)) {
if (method.isAnnotationPresent(Timeout.class)) {
Timeout methodTimeout = method.getAnnotation(Timeout.class);
@@ -124,7 +125,7 @@ public class SyncProxy implements InvocationHandler {
} else if (method.isAnnotationPresent(Delegate.class)) {
Class> asyncClass = sync2Async.get(method.getReturnType());
checkState(asyncClass != null, "please configure corresponding async class for " + method.getReturnType()
- + " in your RestClientModule");
+ + " in your RestClientModule");
Object returnVal = delegateMap.get(new ClassMethodArgs(asyncClass, method, args));
return returnVal;
} else if (syncMethodMap.containsKey(method)) {
@@ -132,7 +133,7 @@ public class SyncProxy implements InvocationHandler {
} else {
try {
return ((ListenableFuture>) methodMap.get(method).invoke(delegate, args)).get(timeoutMap.get(method),
- TimeUnit.NANOSECONDS);
+ TimeUnit.NANOSECONDS);
} catch (ProvisionException e) {
throw throwTypedExceptionOrCause(method.getExceptionTypes(), e);
} catch (ExecutionException e) {
@@ -143,6 +144,7 @@ public class SyncProxy implements InvocationHandler {
}
}
+ // Note this needs to be kept up-to-date with all top-level exceptions jclouds works against
@SuppressWarnings("unchecked")
public static Exception throwTypedExceptionOrCause(Class[] exceptionTypes, Exception exception) throws Exception {
for (Class type : exceptionTypes) {
@@ -154,6 +156,7 @@ public class SyncProxy implements InvocationHandler {
Throwables.propagateIfInstanceOf(exception, IllegalStateException.class);
Throwables.propagateIfInstanceOf(exception, AuthorizationException.class);
Throwables.propagateIfInstanceOf(exception, ResourceNotFoundException.class);
+ Throwables.propagateIfInstanceOf(exception, HttpResponseException.class);
Throwables.throwCause(exception, true);
return exception;
}
diff --git a/core/src/main/java/org/jclouds/http/HttpResponseException.java b/core/src/main/java/org/jclouds/http/HttpResponseException.java
index f7e035657a..d938a8e2a9 100644
--- a/core/src/main/java/org/jclouds/http/HttpResponseException.java
+++ b/core/src/main/java/org/jclouds/http/HttpResponseException.java
@@ -19,8 +19,13 @@
package org.jclouds.http;
+import java.io.IOException;
+
import javax.annotation.Nullable;
+import org.jclouds.io.payloads.StringPayload;
+import org.jclouds.util.Utils;
+
/**
* Represents an error obtained from an HttpResponse.
*
@@ -34,15 +39,14 @@ public class HttpResponseException extends RuntimeException {
protected final HttpResponse response;
private String content;
- public HttpResponseException(String message, HttpCommand command,
- @Nullable HttpResponse response, Throwable cause) {
+ public HttpResponseException(String message, HttpCommand command, @Nullable HttpResponse response, Throwable cause) {
super(message, cause);
this.command = command;
this.response = response;
}
- public HttpResponseException(String message, HttpCommand command,
- @Nullable HttpResponse response, String content, Throwable cause) {
+ public HttpResponseException(String message, HttpCommand command, @Nullable HttpResponse response, String content,
+ Throwable cause) {
super(message, cause);
this.command = command;
this.response = response;
@@ -50,15 +54,13 @@ public class HttpResponseException extends RuntimeException {
}
public HttpResponseException(HttpCommand command, HttpResponse response, Throwable cause) {
- this(String.format("command: %1$s failed with response: %2$s", command.getRequest()
- .getRequestLine(), response.getStatusLine()), command, response, cause);
+ this(String.format("command: %1$s failed with response: %2$s", command.getRequest().getRequestLine(),
+ response.getStatusLine()), command, response, cause);
}
- public HttpResponseException(HttpCommand command, HttpResponse response, String content,
- Throwable cause) {
- this(String.format("command: %1$s failed with response: %2$s; content: [%3$s]", command
- .getRequest().getRequestLine(), response.getStatusLine()), command, response,
- content, cause);
+ public HttpResponseException(HttpCommand command, HttpResponse response, String content, Throwable cause) {
+ this(String.format("command: %1$s failed with response: %2$s; content: [%3$s]", command.getRequest()
+ .getRequestLine(), response.getStatusLine()), command, response, content, cause);
}
public HttpResponseException(String message, HttpCommand command, @Nullable HttpResponse response) {
@@ -67,8 +69,7 @@ public class HttpResponseException extends RuntimeException {
this.response = response;
}
- public HttpResponseException(String message, HttpCommand command,
- @Nullable HttpResponse response, String content) {
+ public HttpResponseException(String message, HttpCommand command, @Nullable HttpResponse response, String content) {
super(message);
this.command = command;
this.response = response;
@@ -76,14 +77,29 @@ public class HttpResponseException extends RuntimeException {
}
public HttpResponseException(HttpCommand command, HttpResponse response) {
- this(String.format("command: %1$s failed with response: %2$s", command.getRequest()
- .getRequestLine(), response.getStatusLine()), command, response);
+ this(String.format("request: %s %sfailed with response: %s", command.getRequest().getRequestLine(),
+ requestPayloadIfStringOrFormIfNotReturnEmptyString(command.getRequest()), response.getStatusLine()),
+ command, response);
+ }
+
+ static String requestPayloadIfStringOrFormIfNotReturnEmptyString(HttpRequest request) {
+ if (request.getPayload() != null
+ && ("application/x-www-form-urlencoded".equals(request.getPayload().getContentMetadata().getContentType()) || request
+ .getPayload() instanceof StringPayload)
+ && request.getPayload().getContentMetadata().getContentLength() != null
+ && request.getPayload().getContentMetadata().getContentLength() < 1024) {
+ try {
+ return String.format(" [%s] ", request.getPayload() instanceof StringPayload ? request.getPayload()
+ .getRawContent() : Utils.toStringAndClose(request.getPayload().getInput()));
+ } catch (IOException e) {
+ }
+ }
+ return "";
}
public HttpResponseException(HttpCommand command, HttpResponse response, String content) {
- this(String.format("command: %1$s failed with response: %2$s; content: [%3$s]", command
- .getRequest().getRequestLine(), response.getStatusLine(), content), command,
- response, content);
+ this(String.format("command: %s failed with response: %s; content: [%s]", command.getRequest().getRequestLine(),
+ response.getStatusLine(), content), command, response, content);
}
public HttpCommand getCommand() {
diff --git a/core/src/main/java/org/jclouds/http/functions/ParseSax.java b/core/src/main/java/org/jclouds/http/functions/ParseSax.java
index cb2045e2c1..d313e468ca 100644
--- a/core/src/main/java/org/jclouds/http/functions/ParseSax.java
+++ b/core/src/main/java/org/jclouds/http/functions/ParseSax.java
@@ -26,12 +26,10 @@ import static com.google.common.io.Closeables.closeQuietly;
import java.io.InputStream;
import java.io.StringReader;
-import javax.annotation.Resource;
import javax.inject.Inject;
import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpResponse;
-import org.jclouds.logging.Logger;
import org.jclouds.rest.InvocationContext;
import org.jclouds.rest.internal.GeneratedHttpRequest;
import org.jclouds.util.Utils;
@@ -41,6 +39,7 @@ import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler;
import com.google.common.base.Function;
+import com.google.common.base.Throwables;
/**
* This object will parse the body of an HttpResponse and return the result of type back to the
@@ -52,8 +51,6 @@ public class ParseSax implements Function, InvocationContext
private final XMLReader parser;
private final HandlerWithResult handler;
- @Resource
- protected Logger logger = Logger.NULL;
private HttpRequest request;
public static interface Factory {
@@ -71,7 +68,7 @@ public class ParseSax implements Function, InvocationContext
checkNotNull(from, "http response");
checkNotNull(from.getPayload(), "payload in " + from);
} catch (NullPointerException e) {
- return addRequestDetailsToException(e);
+ return addDetailsAndPropagate(from, e);
}
if (from.getStatusCode() >= 300)
return convertStreamToStringAndParse(from);
@@ -82,7 +79,7 @@ public class ParseSax implements Function, InvocationContext
try {
return parse(Utils.toStringAndClose(from.getPayload().getInput()));
} catch (Exception e) {
- return addRequestDetailsToException(e);
+ return addDetailsAndPropagate(from, e);
}
}
@@ -91,7 +88,7 @@ public class ParseSax implements Function, InvocationContext
checkNotNull(from, "xml string");
checkArgument(from.indexOf('<') >= 0, String.format("not an xml document [%s] ", from));
} catch (RuntimeException e) {
- return addRequestDetailsToException(e);
+ return addDetailsAndPropagate(null, e);
}
return parse(new InputSource(new StringReader(from)));
}
@@ -113,31 +110,39 @@ public class ParseSax implements Function, InvocationContext
parser.parse(from);
return getHandler().getResult();
} catch (Exception e) {
- return addRequestDetailsToException(e);
+ return addDetailsAndPropagate(null, e);
}
}
- private T addRequestDetailsToException(Exception e) {
- String exceptionMessage = e.getMessage();
+ public T addDetailsAndPropagate(HttpResponse response, Exception e) {
+ StringBuilder message = new StringBuilder();
+ if (request != null) {
+ message.append("request: ").append(request.getRequestLine());
+ }
+ if (response != null) {
+ if (message.length() != 0)
+ message.append("; ");
+ message.append("response: ").append(response.getStatusLine());
+ }
if (e instanceof SAXParseException) {
SAXParseException parseException = (SAXParseException) e;
String systemId = parseException.getSystemId();
if (systemId == null) {
systemId = "";
}
- exceptionMessage = String.format("Error on line %d of document %s: %s", systemId, parseException
- .getLineNumber(), parseException.getMessage());
+ if (message.length() != 0)
+ message.append("; ");
+ message.append(String.format("error at %d:%d in document %s", parseException.getColumnNumber(),
+ parseException.getLineNumber(), systemId));
}
- if (request != null) {
- StringBuilder message = new StringBuilder();
- message.append("Error parsing input for ").append(request.getRequestLine()).append(": ");
- message.append(exceptionMessage);
- logger.error(e, message.toString());
+ if (message.length() != 0) {
+ message.append("; cause: ").append(e.toString());
throw new RuntimeException(message.toString(), e);
} else {
- logger.error(e, exceptionMessage.toString());
- throw new RuntimeException(exceptionMessage.toString(), e);
+ Throwables.propagate(e);
+ return null;
}
+
}
public HandlerWithResult getHandler() {
diff --git a/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java
index 47bad3d042..58d016fe1b 100644
--- a/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java
+++ b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java
@@ -227,7 +227,7 @@ public class JavaUrlHttpCommandExecutorService extends BaseHttpCommandExecutorSe
connection.setRequestProperty(HttpHeaders.CONTENT_LENGTH, "0");
// for some reason POST/PUT undoes the content length header above.
if (connection.getRequestMethod().equals("POST") || connection.getRequestMethod().equals("PUT"))
- connection.setChunkedStreamingMode(0);
+ connection.setFixedLengthStreamingMode(0);
}
return connection;
diff --git a/core/src/main/java/org/jclouds/json/config/GsonModule.java b/core/src/main/java/org/jclouds/json/config/GsonModule.java
index 257171505a..55c3836b9b 100644
--- a/core/src/main/java/org/jclouds/json/config/GsonModule.java
+++ b/core/src/main/java/org/jclouds/json/config/GsonModule.java
@@ -38,8 +38,8 @@ import org.jclouds.json.internal.GsonWrapper;
import com.google.common.collect.Maps;
import com.google.common.primitives.Bytes;
import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import com.google.gson.JcloudsCompactFormatter;
+import com.google.gson.JcloudsGsonBuilder;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
@@ -64,9 +64,9 @@ public class GsonModule extends AbstractModule {
@Provides
@Singleton
Gson provideGson(JsonBallAdapter jsonObjectAdapter, DateAdapter adapter, ByteListAdapter byteListAdapter,
- ByteArrayAdapter byteArrayAdapter, JsonAdapterBindings bindings) throws SecurityException,
- NoSuchFieldException, IllegalArgumentException, IllegalAccessException {
- GsonBuilder builder = new GsonBuilder();
+ ByteArrayAdapter byteArrayAdapter, JsonAdapterBindings bindings) throws ClassNotFoundException, Exception {
+ JcloudsGsonBuilder builder = new JcloudsGsonBuilder();
+
builder.registerTypeAdapter(JsonBall.class, jsonObjectAdapter);
builder.registerTypeAdapter(Date.class, adapter);
builder.registerTypeAdapter(new TypeToken>() {
@@ -105,7 +105,7 @@ public class GsonModule extends AbstractModule {
@Override
public List deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
- throws JsonParseException {
+ throws JsonParseException {
return Bytes.asList(CryptoStreams.hex(json.getAsString()));
}
@@ -121,7 +121,7 @@ public class GsonModule extends AbstractModule {
@Override
public byte[] deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
- throws JsonParseException {
+ throws JsonParseException {
return CryptoStreams.hex(json.getAsString());
}
@@ -145,7 +145,7 @@ public class GsonModule extends AbstractModule {
}
public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
- throws JsonParseException {
+ throws JsonParseException {
String toParse = json.getAsJsonPrimitive().getAsString();
try {
return dateService.iso8601DateParse(toParse);
@@ -170,7 +170,7 @@ public class GsonModule extends AbstractModule {
}
public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
- throws JsonParseException {
+ throws JsonParseException {
String toParse = json.getAsJsonPrimitive().getAsString();
Date toReturn = dateService.cDateParse(toParse);
return toReturn;
@@ -191,7 +191,7 @@ public class GsonModule extends AbstractModule {
}
public JsonBall deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
- throws JsonParseException {
+ throws JsonParseException {
return new JsonBall(json.toString());
}
@@ -205,7 +205,7 @@ public class GsonModule extends AbstractModule {
}
public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
- throws JsonParseException {
+ throws JsonParseException {
long toParse = json.getAsJsonPrimitive().getAsLong();
if (toParse == -1)
return null;
diff --git a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
index 4ee32f93f4..3b61dd877a 100755
--- a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
+++ b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
@@ -33,7 +33,7 @@ import static com.google.common.collect.Sets.difference;
import static com.google.common.collect.Sets.newHashSet;
import static com.google.common.collect.Sets.newTreeSet;
import static java.util.Arrays.asList;
-import static javax.ws.rs.core.HttpHeaders.ACCEPT;
+import static javax.ws.rs.core.HttpHeaders.*;
import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE;
import static javax.ws.rs.core.HttpHeaders.HOST;
import static org.jclouds.http.HttpUtils.makeQueryLine;
@@ -128,6 +128,7 @@ import org.jclouds.rest.functions.MapHttp4xxCodesToExceptions;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.MapMaker;
@@ -470,6 +471,9 @@ public class RestAnnotationProcessor {
payload = new MultipartForm(BOUNDARY, parts);
} else if (formParams.size() > 0) {
payload = Payloads.newUrlEncodedFormPayload(formParams, skips);
+ } else if (headers.containsKey(CONTENT_TYPE)) {
+ payload = Payloads.newByteArrayPayload(new byte[]{});
+ payload.getContentMetadata().setContentType(Iterables.get(headers.get(CONTENT_TYPE),0));
}
if (payload != null) {
request.setPayload(payload);
diff --git a/core/src/main/resources/rest.properties b/core/src/main/resources/rest.properties
index 2bba3f8452..9108d8ad63 100644
--- a/core/src/main/resources/rest.properties
+++ b/core/src/main/resources/rest.properties
@@ -104,7 +104,11 @@ synaptic.contextbuilder=org.jclouds.atmosonline.saas.AtmosStorageContextBuilder
synaptic.endpoint=https://storage.synaptic.att.com
synaptic.apiversion=1.3.0
-# TODO peer1 and hostedsolutions use atmos
+peer1-storage.contextbuilder=org.jclouds.atmosonline.saas.AtmosStorageContextBuilder
+peer1-storage.endpoint=https://storage.synaptic.att.com
+peer1-storage.apiversion=1.3.0
+
+# TODO hostedsolutions use atmos
cloudfiles.contextbuilder=org.jclouds.rackspace.cloudfiles.CloudFilesContextBuilder
cloudfiles.propertiesbuilder=org.jclouds.rackspace.cloudfiles.CloudFilesPropertiesBuilder
diff --git a/core/src/test/java/org/jclouds/http/functions/ParseSaxTest.java b/core/src/test/java/org/jclouds/http/functions/ParseSaxTest.java
new file mode 100644
index 0000000000..c1df2737f9
--- /dev/null
+++ b/core/src/test/java/org/jclouds/http/functions/ParseSaxTest.java
@@ -0,0 +1,141 @@
+/**
+ *
+ * Copyright (C) 2010 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.http.functions;
+
+import static org.easymock.EasyMock.expect;
+import static org.easymock.classextension.EasyMock.createMock;
+import static org.easymock.classextension.EasyMock.replay;
+import static org.easymock.classextension.EasyMock.verify;
+import static org.testng.Assert.assertEquals;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
+
+import org.jclouds.http.HttpRequest;
+import org.jclouds.http.HttpResponse;
+import org.testng.annotations.Test;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXParseException;
+
+public class ParseSaxTest extends BaseHandlerTest {
+ public static class TestHandler extends ParseSax.HandlerWithResult {
+ @Override
+ public String getResult() {
+ return "";
+ }
+ }
+
+ ParseSax createParser() {
+ return factory.create(injector.getInstance(TestHandler.class));
+ }
+
+ @Test
+ public void testAddDetailsAndPropagateOkWhenRequestWithNoDataAndRuntimeExceptionThrowsOriginalException()
+ throws ExecutionException, InterruptedException, TimeoutException, IOException {
+
+ ParseSax parser = createParser();
+ Exception input = new RuntimeException("foo");
+
+ try {
+ parser.addDetailsAndPropagate(null, input);
+ } catch (RuntimeException e) {
+ assertEquals(e, input);
+ }
+ }
+
+ @Test
+ public void testAddDetailsAndPropagateOkWhenRequestWithNoDataAndExceptionPropagates() throws ExecutionException,
+ InterruptedException, TimeoutException, IOException {
+
+ ParseSax parser = createParser();
+ Exception input = new Exception("foo");
+
+ try {
+ parser.addDetailsAndPropagate(null, input);
+ } catch (RuntimeException e) {
+ assertEquals(e.getMessage(), "java.lang.Exception: foo");
+ assertEquals(e.getCause(), input);
+ }
+ }
+
+ @Test
+ public void testAddDetailsAndPropagateOkWhenRequestIsNotNullAndResponseIsNull() throws ExecutionException,
+ InterruptedException, TimeoutException, IOException {
+
+ ParseSax parser = createParser();
+ HttpRequest request = new HttpRequest("GET", URI.create("http://foohost"));
+ Exception input = new Exception("foo");
+
+ try {
+ parser.setContext(request);
+ parser.addDetailsAndPropagate(null, input);
+ } catch (RuntimeException e) {
+ assertEquals(e.getMessage(), "request: GET http://foohost HTTP/1.1; cause: java.lang.Exception: foo");
+ assertEquals(e.getCause(), input);
+ }
+ }
+
+ @Test
+ public void testAddDetailsAndPropagateOkWithValidRequestResponse() throws ExecutionException, InterruptedException,
+ TimeoutException, IOException {
+
+ ParseSax parser = createParser();
+ HttpRequest request = new HttpRequest("GET", URI.create("http://foohost"));
+ HttpResponse response = new HttpResponse(304, "Not Modified", null);
+ Exception input = new Exception("foo");
+
+ try {
+ parser.setContext(request);
+ parser.addDetailsAndPropagate(response, input);
+ } catch (RuntimeException e) {
+ assertEquals(e.getMessage(), "request: GET http://foohost HTTP/1.1; response: HTTP/1.1 304 Not Modified; cause: java.lang.Exception: foo");
+ assertEquals(e.getCause(), input);
+ }
+ }
+
+ @Test
+ public void testAddDetailsAndPropagateOkWithValidRequestResponseWithSAXParseException() throws ExecutionException,
+ InterruptedException, TimeoutException, IOException {
+
+ ParseSax parser = createParser();
+ HttpRequest request = new HttpRequest("GET", URI.create("http://foohost"));
+ HttpResponse response = new HttpResponse(304, "Not Modified", null);
+ Locator locator = createMock(Locator.class);
+ expect(locator.getColumnNumber()).andReturn(1);
+ expect(locator.getLineNumber()).andReturn(1);
+ expect(locator.getPublicId()).andReturn("publicId");
+ expect(locator.getSystemId()).andReturn("systemId");
+ replay(locator);
+ Exception input = new SAXParseException("foo", locator);
+ verify(locator);
+
+ try {
+ parser.setContext(request);
+ parser.addDetailsAndPropagate(response, input);
+ } catch (RuntimeException e) {
+ assertEquals(e.getMessage(),
+ "request: GET http://foohost HTTP/1.1; response: HTTP/1.1 304 Not Modified; error at 1:1 in document systemId; cause: org.xml.sax.SAXParseException: foo");
+ assertEquals(e.getCause(), input);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/jclouds/json/JsonTest.java b/core/src/test/java/org/jclouds/json/JsonTest.java
new file mode 100644
index 0000000000..16f7e1eeee
--- /dev/null
+++ b/core/src/test/java/org/jclouds/json/JsonTest.java
@@ -0,0 +1,78 @@
+/**
+ *
+ * Copyright (C) 2010 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.json;
+
+import static org.testng.Assert.assertEquals;
+
+import org.jclouds.json.config.GsonModule;
+import org.testng.annotations.Test;
+
+import com.google.gson.JsonParseException;
+import com.google.inject.Guice;
+
+@Test
+public class JsonTest {
+ private Json json = Guice.createInjector(new GsonModule()).getInstance(Json.class);
+
+ private static class EnumInside {
+ private static enum Test {
+ FOO, BAR;
+ }
+
+ private Test enumValue;
+ }
+
+ public void testDeserializeEnum() {
+ assertEquals(json.fromJson("{enumValue : \"FOO\"}", EnumInside.class).enumValue, EnumInside.Test.FOO);
+ }
+
+ @Test(expectedExceptions = JsonParseException.class)
+ public void testDeserializeEnumWhenBadValue() {
+ assertEquals(json.fromJson("{enumValue : \"s\"}", EnumInside.class).enumValue, EnumInside.Test.FOO);
+ }
+
+ private static class EnumInsideWithParser {
+ private static enum Test {
+ FOO, BAR, UNRECOGNIZED;
+
+ @SuppressWarnings("unused")
+ public static Test fromValue(String state) {
+ try {
+ return valueOf(state);
+ } catch (IllegalArgumentException e) {
+ return UNRECOGNIZED;
+ }
+ }
+ }
+
+ private Test enumValue;
+ }
+
+ public void testDeserializeEnumWithParser() {
+ assertEquals(json.fromJson("{enumValue : \"FOO\"}", EnumInsideWithParser.class).enumValue,
+ EnumInsideWithParser.Test.FOO);
+ }
+
+ public void testDeserializeEnumWithParserAndBadValue() {
+ assertEquals(json.fromJson("{enumValue : \"sd\"}", EnumInsideWithParser.class).enumValue,
+ EnumInsideWithParser.Test.UNRECOGNIZED);
+ }
+
+}
diff --git a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
index 7b2d4fa9f0..b107347cb6 100755
--- a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
+++ b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
@@ -373,10 +373,22 @@ public class RestAnnotationProcessorTest extends BaseRestClientTest {
@POST
@Path("")
public void post(HttpRequestOptions options);
-
+
+ @POST
+ @Path("")
+ @Produces(MediaType.APPLICATION_OCTET_STREAM)
+ public void post();
}
public void testHttpRequestOptionsPayloadParam() throws SecurityException, NoSuchMethodException, IOException {
+ Method method = TestPayloadParamVarargs.class.getMethod("post");
+ HttpRequest request = factory(TestQuery.class).createRequest(method);
+ assertRequestLineEquals(request, "POST http://localhost:9999?x-ms-version=2009-07-17 HTTP/1.1");
+ assertNonPayloadHeadersEqual(request, "");
+ assertPayloadEquals(request, "", "application/octet-stream", false);
+ }
+
+ public void testHttpRequestWithOnlyContentType() throws SecurityException, NoSuchMethodException, IOException {
Method method = TestPayloadParamVarargs.class.getMethod("post", HttpRequestOptions.class);
verifyTestPostOptions(method);
}
diff --git a/demos/gae-tweetstore-spring/pom.xml b/demos/gae-tweetstore-spring/pom.xml
index 33825908e0..bc2fa22aa5 100644
--- a/demos/gae-tweetstore-spring/pom.xml
+++ b/demos/gae-tweetstore-spring/pom.xml
@@ -255,44 +255,44 @@
- twitter.identity
- ${jclouds.twitter.user}
+ test.twitter.identity
+ ${test.twitter.identity}
- twitter.credential
- ${jclouds.twitter.password}
+ test.twitter.credential
+ ${test.twitter.credential}
- azureblob.identity
- ${jclouds.azure.storage.account}
+ test.azureblob.identity
+ ${test.azureblob.identity}
- azureblob.credential
- ${jclouds.azure.storage.key}
+ test.azureblob.credential
+ ${test.azureblob.credential}
- cloudfiles.identity
- ${jclouds.rackspace.user}
+ test.cloudfiles.identity
+ ${test.cloudfiles.identity}
- cloudfiles.credential
- ${jclouds.rackspace.key}
+ test.cloudfiles.credential
+ ${test.cloudfiles.credential}
- googlestorage.identity
- ${jclouds.googlestorage.accesskeyid}
+ test.googlestorage.identity
+ ${test.googlestorage.identity}
- googlestorage.credential
- ${jclouds.googlestorage.secretaccesskey}
+ test.googlestorage.credential
+ ${test.googlestorage.credential}
- s3.identity
- ${jclouds.aws.accesskeyid}
+ test.s3.identity
+ ${test.s3.identity}
- s3.credential
- ${jclouds.aws.secretaccesskey}
+ test.s3.credential
+ ${test.s3.credential}appengine.home
diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/SpringServletConfig.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/SpringServletConfig.java
index 3f24f7a36f..b764f03936 100644
--- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/SpringServletConfig.java
+++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/SpringServletConfig.java
@@ -89,8 +89,8 @@ public class SpringServletConfig extends LoggingConfig implements ServletConfigA
Set modules = ImmutableSet. of(googleModule);
// shared across all blobstores and used to retrieve tweets
try {
- twitterClient = new TwitterFactory().getInstance(props.getProperty("twitter.identity"), props
- .getProperty("credential"));
+ twitterClient = new TwitterFactory().getInstance(props.getProperty("twitter.identity"),
+ props.getProperty("twitter.credential"));
} catch (IllegalArgumentException e) {
throw new IllegalArgumentException("properties for twitter not configured properly in " + props.toString(), e);
}
@@ -100,7 +100,7 @@ public class SpringServletConfig extends LoggingConfig implements ServletConfigA
// instantiate and store references to all blobstores by provider name
providerTypeToBlobStoreMap = Maps.newHashMap();
for (String hint : Splitter.on(',').split(
- checkNotNull(props.getProperty(PROPERTY_BLOBSTORE_CONTEXTS), PROPERTY_BLOBSTORE_CONTEXTS))) {
+ checkNotNull(props.getProperty(PROPERTY_BLOBSTORE_CONTEXTS), PROPERTY_BLOBSTORE_CONTEXTS))) {
providerTypeToBlobStoreMap.put(hint, blobStoreContextFactory.createContext(hint, modules, props));
}
@@ -111,7 +111,7 @@ public class SpringServletConfig extends LoggingConfig implements ServletConfigA
queue.add(url("/store/do").header("context", name).method(Method.GET));
}
logger.trace("Members initialized. Twitter: '%s', container: '%s', provider types: '%s'", twitterClient,
- container, providerTypeToBlobStoreMap.keySet());
+ container, providerTypeToBlobStoreMap.keySet());
}
private Properties loadJCloudsProperties() {
@@ -139,7 +139,7 @@ public class SpringServletConfig extends LoggingConfig implements ServletConfigA
@Bean
public AddTweetsController addTweetsController() {
AddTweetsController controller = new AddTweetsController(providerTypeToBlobStoreMap,
- serviceToStoredTweetStatuses());
+ serviceToStoredTweetStatuses());
injectServletConfig(controller);
return controller;
}
@@ -199,4 +199,4 @@ public class SpringServletConfig extends LoggingConfig implements ServletConfigA
public void setServletConfig(ServletConfig servletConfig) {
this.servletConfig = servletConfig;
}
-}
+}
\ No newline at end of file
diff --git a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java
index 79c9a43a4a..77a693d46c 100644
--- a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java
+++ b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java
@@ -27,9 +27,9 @@ import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
-import java.util.Map.Entry;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
@@ -70,16 +70,17 @@ public class TweetStoreLiveTest {
private String container;
private static final String blobs = System.getProperty("jclouds.tweetstore.blobstores",
- "cloudfiles,googlestorage,s3,azureblob");
+ "cloudfiles,googlestorage,s3,azureblob");
private static final Iterable blobstores = Splitter.on(',').split(blobs);
private static final Properties props = new Properties();
@BeforeTest
- void clearAndCreateContainers() throws InterruptedException, ExecutionException, TimeoutException, IOException, TwitterException {
+ void clearAndCreateContainers() throws InterruptedException, ExecutionException, TimeoutException, IOException,
+ TwitterException {
container = checkNotNull(System.getProperty(PROPERTY_TWEETSTORE_CONTAINER));
- props.setProperty(PROPERTY_TWEETSTORE_CONTAINER, checkNotNull(System.getProperty(PROPERTY_TWEETSTORE_CONTAINER),
- PROPERTY_TWEETSTORE_CONTAINER));
+ props.setProperty(PROPERTY_TWEETSTORE_CONTAINER,
+ checkNotNull(System.getProperty(PROPERTY_TWEETSTORE_CONTAINER), PROPERTY_TWEETSTORE_CONTAINER));
props.setProperty(SpringServletConfig.PROPERTY_BLOBSTORE_CONTEXTS, Joiner.on(',').join(blobstores));
@@ -98,8 +99,8 @@ public class TweetStoreLiveTest {
contexts.put(provider, factory.createContext(provider, wiring, props));
}
- Twitter client = new TwitterFactory().getInstance(props.getProperty("twitter.identity"), props
- .getProperty("twitter.credential"));
+ Twitter client = new TwitterFactory().getInstance(props.getProperty("twitter.identity"),
+ props.getProperty("twitter.credential"));
StoreTweetsController controller = new StoreTweetsController(contexts, container, client);
ResponseList statuses = client.getMentions();
@@ -108,7 +109,7 @@ public class TweetStoreLiveTest {
for (BlobStoreContext context : contexts.values()) {
if (context.getBlobStore().containerExists(container)) {
System.err.printf("deleting container %s at %s%n", container, context.getProviderSpecificContext()
- .getEndpoint());
+ .getEndpoint());
context.getBlobStore().deleteContainer(container);
deleted = true;
}
@@ -119,7 +120,7 @@ public class TweetStoreLiveTest {
}
for (BlobStoreContext context : contexts.values()) {
System.err.printf("creating container %s at %s%n", container, context.getProviderSpecificContext()
- .getEndpoint());
+ .getEndpoint());
context.getBlobStore().createContainerInLocation(null, container);
}
if (deleted) {
@@ -134,22 +135,23 @@ public class TweetStoreLiveTest {
}
private void addConfigurationForTwitter(Properties props) {
- props.setProperty("twitter.identity", checkNotNull(System.getProperty("twitter.identity"), "twitter.identity"));
- props.setProperty("twitter.credential", checkNotNull(System.getProperty("twitter.credential"),
- "twitter.credential"));
+ props.setProperty("twitter.identity",
+ checkNotNull(System.getProperty("test.twitter.identity"), "test.twitter.identity"));
+ props.setProperty("twitter.credential",
+ checkNotNull(System.getProperty("test.twitter.credential"), "test.twitter.credential"));
}
private void addCredentialsForBlobStores(Properties props) {
for (String provider : blobstores) {
- props.setProperty(provider + ".identity", checkNotNull(System.getProperty(provider + ".identity"), provider
- + ".identity"));
- props.setProperty(provider + ".credential", checkNotNull(System.getProperty(provider + ".credential"),
- provider + ".credential"));
+ props.setProperty(provider + ".identity",
+ checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"));
+ props.setProperty(provider + ".credential",
+ checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"));
}
}
@BeforeTest
- @Parameters( { "warfile", "devappserver.address", "devappserver.port" })
+ @Parameters({ "warfile", "devappserver.address", "devappserver.port" })
public void startDevAppServer(final String warfile, final String address, final String port) throws Exception {
url = new URL(String.format("http://%s:%s", address, port));
server = new GoogleDevServer();
diff --git a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java
index cbd5dd0538..5c06ae6ee8 100755
--- a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java
+++ b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java
@@ -79,7 +79,7 @@ public class GuiceServletConfig extends GuiceServletContextListener {
// shared across all blobstores and used to retrieve tweets
try {
twitterClient = new TwitterFactory().getInstance(props.getProperty("twitter.identity"), props
- .getProperty("credential"));
+ .getProperty("twitter.credential"));
} catch (IllegalArgumentException e) {
throw new IllegalArgumentException("properties for twitter not configured properly in " + props.toString(), e);
}
diff --git a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java
index a6e0700e32..1ac1f1d10f 100755
--- a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java
+++ b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java
@@ -27,9 +27,9 @@ import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
-import java.util.Map.Entry;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
@@ -57,8 +57,8 @@ import com.google.common.collect.Maps;
import com.google.inject.Module;
/**
- * Starts up the Google App Engine for Java Development environment and deploys
- * an application which tests accesses twitter and blobstores.
+ * Starts up the Google App Engine for Java Development environment and deploys an application which
+ * tests accesses twitter and blobstores.
*
* @author Adrian Cole
*/
@@ -75,11 +75,12 @@ public class TweetStoreLiveTest {
private static final Properties props = new Properties();
@BeforeTest
- void clearAndCreateContainers() throws InterruptedException, ExecutionException, TimeoutException, IOException, TwitterException {
+ void clearAndCreateContainers() throws InterruptedException, ExecutionException, TimeoutException, IOException,
+ TwitterException {
container = checkNotNull(System.getProperty(PROPERTY_TWEETSTORE_CONTAINER));
- props.setProperty(PROPERTY_TWEETSTORE_CONTAINER, checkNotNull(System.getProperty(PROPERTY_TWEETSTORE_CONTAINER),
- PROPERTY_TWEETSTORE_CONTAINER));
+ props.setProperty(PROPERTY_TWEETSTORE_CONTAINER,
+ checkNotNull(System.getProperty(PROPERTY_TWEETSTORE_CONTAINER), PROPERTY_TWEETSTORE_CONTAINER));
props.setProperty(GuiceServletConfig.PROPERTY_BLOBSTORE_CONTEXTS, Joiner.on(',').join(blobstores));
@@ -98,8 +99,8 @@ public class TweetStoreLiveTest {
contexts.put(provider, factory.createContext(provider, wiring, props));
}
- Twitter client = new TwitterFactory().getInstance(props.getProperty("twitter.identity"), props
- .getProperty("twitter.credential"));
+ Twitter client = new TwitterFactory().getInstance(props.getProperty("twitter.identity"),
+ props.getProperty("twitter.credential"));
StoreTweetsController controller = new StoreTweetsController(contexts, container, client);
ResponseList statuses = client.getMentions();
@@ -139,7 +140,7 @@ public class TweetStoreLiveTest {
}
@BeforeTest(dependsOnMethods = "clearAndCreateContainers")
- @Parameters( { "warfile", "devappserver.address", "devappserver.port" })
+ @Parameters({ "warfile", "devappserver.address", "devappserver.port" })
public void startDevAppServer(final String warfile, final String address, final String port) throws Exception {
url = new URL(String.format("http://%s:%s", address, port));
@@ -148,17 +149,17 @@ public class TweetStoreLiveTest {
}
private void addConfigurationForTwitter(Properties props) {
- props.setProperty("twitter.identity", checkNotNull(System.getProperty("twitter.identity"), "twitter.identity"));
- props.setProperty("twitter.credential", checkNotNull(System.getProperty("twitter.credential"),
- "twitter.credential"));
+ props.setProperty("twitter.identity", checkNotNull(System.getProperty("test.twitter.identity"), "test.twitter.identity"));
+ props.setProperty("twitter.credential",
+ checkNotNull(System.getProperty("test.twitter.credential"), "test.twitter.credential"));
}
private void addCredentialsForBlobStores(Properties props) {
for (String provider : blobstores) {
- props.setProperty(provider + ".identity", checkNotNull(System.getProperty(provider + ".identity"), provider
- + ".identity"));
- props.setProperty(provider + ".credential", checkNotNull(System.getProperty(provider + ".credential"),
- provider + ".credential"));
+ props.setProperty(provider + ".identity",
+ checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity"));
+ props.setProperty(provider + ".credential",
+ checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider + ".credential"));
}
}
diff --git a/filesystem/src/main/java/org/jclouds/filesystem/reference/FilesystemConstants.java b/filesystem/src/main/java/org/jclouds/filesystem/reference/FilesystemConstants.java
index c8afc9ae05..cab89f5bf2 100644
--- a/filesystem/src/main/java/org/jclouds/filesystem/reference/FilesystemConstants.java
+++ b/filesystem/src/main/java/org/jclouds/filesystem/reference/FilesystemConstants.java
@@ -27,6 +27,6 @@ package org.jclouds.filesystem.reference;
public class FilesystemConstants {
/** Specify the base directory where provider starts its file operations - must exists */
- public static final String PROPERTY_BASEDIR = "FileSystemAsyncBlobStore-basedir";
-
+ public static final String PROPERTY_BASEDIR = "jclouds.filesystem.basedir";
+
}
diff --git a/gogrid/pom.xml b/gogrid/pom.xml
index 24bf36665d..bcd69c7262 100644
--- a/gogrid/pom.xml
+++ b/gogrid/pom.xml
@@ -40,7 +40,7 @@
- trmkrun-ccc,test.trmk-924
+ trmkrun-ccc,test.trmk-924https://api.gogrid.com/api1.5FIXME
@@ -119,8 +119,8 @@
${test.gogrid.credential}
- jclouds.compute.blacklist.nodes
- ${jclouds.compute.blacklist.nodes}
+ jclouds.compute.blacklist-nodes
+ ${jclouds.compute.blacklist-nodes}
diff --git a/gogrid/src/main/java/org/jclouds/gogrid/compute/suppliers/GoGridImageSupplier.java b/gogrid/src/main/java/org/jclouds/gogrid/compute/suppliers/GoGridImageSupplier.java
index 7d8f2fc9f9..b715f25771 100644
--- a/gogrid/src/main/java/org/jclouds/gogrid/compute/suppliers/GoGridImageSupplier.java
+++ b/gogrid/src/main/java/org/jclouds/gogrid/compute/suppliers/GoGridImageSupplier.java
@@ -19,6 +19,7 @@
package org.jclouds.gogrid.compute.suppliers;
+import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -34,6 +35,7 @@ import org.jclouds.compute.domain.OperatingSystem;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy;
+import org.jclouds.compute.util.ComputeServiceUtils;
import org.jclouds.gogrid.GoGridClient;
import org.jclouds.gogrid.domain.ServerImage;
import org.jclouds.logging.Logger;
@@ -56,9 +58,12 @@ public class GoGridImageSupplier implements Supplier> {
private final GoGridClient sync;
private final PopulateDefaultLoginCredentialsForImageStrategy authenticator;
+ private final Map> osVersionMap;
@Inject
- GoGridImageSupplier(final GoGridClient sync, PopulateDefaultLoginCredentialsForImageStrategy authenticator) {
+ GoGridImageSupplier(GoGridClient sync, PopulateDefaultLoginCredentialsForImageStrategy authenticator,
+ Map> osVersionMap) {
+ this.osVersionMap = osVersionMap;
this.sync = sync;
this.authenticator = authenticator;
}
@@ -85,29 +90,28 @@ public class GoGridImageSupplier implements Supplier> {
OsFamily osFamily = null;
String osName = from.getOs().getName();
String osArch = from.getArchitecture().getDescription();
- String osVersion = parseVersion(osName);
+ String osVersion = null;
String osDescription = from.getOs().getDescription();
boolean is64Bit = (from.getOs().getName().indexOf("64") != -1 || from.getDescription().indexOf("64") != -1);
- Matcher matcher = GOGRID_OS_PATTERN.matcher(from.getName());
- if (matcher.find()) {
- try {
- osFamily = OsFamily.fromValue(matcher.group(1).toLowerCase());
- } catch (IllegalArgumentException e) {
- logger.debug("<< didn't match os(%s)", from.getName());
+ if (osName.startsWith("Windows")) {
+ osFamily = OsFamily.WINDOWS;
+ } else {
+ Matcher matcher = GOGRID_OS_PATTERN.matcher(from.getName());
+ if (matcher.find()) {
+ try {
+ osFamily = OsFamily.fromValue(matcher.group(1).toLowerCase());
+ } catch (IllegalArgumentException e) {
+ logger.debug("<< didn't match os(%s)", from.getName());
+ }
}
}
-
- // TODO determine DC images are in
- OperatingSystem os = new OperatingSystem(osFamily, osName, osVersion, osArch, osDescription, is64Bit);
- return os;
- }
-
- static String parseVersion(String name) {
- Matcher matcher = GOGRID_VERSION_PATTERN.matcher(name);
+ Matcher matcher = GOGRID_VERSION_PATTERN.matcher(osName);
if (matcher.find()) {
- return matcher.group(1);
+ osVersion = ComputeServiceUtils.parseVersionOrReturnEmptyString(osFamily, matcher.group(1), osVersionMap);
}
- return null;
+ // TODO determine DC images are in
+ return new OperatingSystem(osFamily, osName, osVersion, osArch, osDescription, is64Bit);
}
+
}
\ No newline at end of file
diff --git a/gogrid/src/test/java/org/jclouds/gogrid/compute/GoGridTemplateBuilderLiveTest.java b/gogrid/src/test/java/org/jclouds/gogrid/compute/GoGridTemplateBuilderLiveTest.java
new file mode 100644
index 0000000000..ab09cf3337
--- /dev/null
+++ b/gogrid/src/test/java/org/jclouds/gogrid/compute/GoGridTemplateBuilderLiveTest.java
@@ -0,0 +1,72 @@
+/**
+ *
+ * Copyright (C) 2010 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.gogrid.compute;
+
+import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
+import static org.testng.Assert.assertEquals;
+
+import java.io.IOException;
+
+import org.jclouds.compute.BaseTemplateBuilderLiveTest;
+import org.jclouds.compute.OsFamilyVersion64Bit;
+import org.jclouds.compute.domain.OsFamily;
+import org.jclouds.compute.domain.Template;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Predicate;
+
+/**
+ *
+ * @author Adrian Cole
+ */
+@Test(groups = "live", testName = "gogrid.GoGridTemplateBuilderLiveTest")
+public class GoGridTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
+
+ public GoGridTemplateBuilderLiveTest() {
+ provider = "gogrid";
+ }
+
+ @Override
+ protected Predicate defineUnsupportedOperatingSystems() {
+ return new Predicate() {
+
+ @Override
+ public boolean apply(OsFamilyVersion64Bit input) {
+ return ((input.family == OsFamily.RHEL && !input.version.equals("5.4")) || //
+ (input.family == OsFamily.CENTOS && input.version.matches("5.[54]")) || //
+ (input.family == OsFamily.CENTOS && input.is64Bit && input.version.equals("5.4")) || //
+ (input.family == OsFamily.UBUNTU) || //
+ (input.family == OsFamily.WINDOWS && input.version.equals("2008 SP2") || //
+ (input.family == OsFamily.WINDOWS && input.version.equals("2008 R2"))));
+ }
+
+ };
+ }
+
+ @Test
+ public void testDefaultTemplateBuilder() throws IOException {
+ Template defaultTemplate = context.getComputeService().templateBuilder().build();
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "5.3");
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.CENTOS);
+ assertEquals(getCores(defaultTemplate.getHardware()), 0.5d);
+ }
+
+}
\ No newline at end of file
diff --git a/rackspace/pom.xml b/rackspace/pom.xml
index b59c1b321d..2e5dcd08d6 100644
--- a/rackspace/pom.xml
+++ b/rackspace/pom.xml
@@ -38,7 +38,7 @@
FIXMEorg.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesTestInitializer
- trmkrun-ccc,test.trmk-924
+ trmkrun-ccc,test.trmk-924${test.rackspace.endpoint}${test.rackspace.apiversion}${test.rackspace.identity}
@@ -151,8 +151,8 @@
${test.cloudservers.credential}
- jclouds.compute.blacklist.nodes
- ${jclouds.compute.blacklist.nodes}
+ jclouds.compute.blacklist-nodes
+ ${jclouds.compute.blacklist-nodes}test.initializer
diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceContextModule.java b/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceContextModule.java
index 96e02eb531..91be884115 100755
--- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceContextModule.java
+++ b/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/config/CloudServersComputeServiceContextModule.java
@@ -19,14 +19,9 @@
package org.jclouds.rackspace.cloudservers.compute.config;
-import static org.jclouds.compute.domain.OsFamily.UBUNTU;
-
import org.jclouds.compute.config.BaseComputeServiceContextModule;
-import org.jclouds.compute.domain.TemplateBuilder;
import org.jclouds.compute.internal.BaseComputeService;
-import com.google.inject.Injector;
-
/**
* Configures the {@link CloudServersComputeServiceContext}; requires {@link BaseComputeService}
* bound.
@@ -43,8 +38,4 @@ public class CloudServersComputeServiceContextModule extends BaseComputeServiceC
super.configure();
}
- @Override
- protected TemplateBuilder provideTemplate(Injector injector, TemplateBuilder template) {
- return template.osFamily(UBUNTU).imageNameMatches(".*10\\.?04.*");
- }
}
diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/CloudServersImageToOperatingSystem.java b/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/CloudServersImageToOperatingSystem.java
index be3f50fb84..0ec8016fed 100644
--- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/CloudServersImageToOperatingSystem.java
+++ b/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/compute/functions/CloudServersImageToOperatingSystem.java
@@ -19,16 +19,19 @@
package org.jclouds.rackspace.cloudservers.compute.functions;
+import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.annotation.Resource;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import org.jclouds.compute.domain.OperatingSystem;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.reference.ComputeServiceConstants;
+import org.jclouds.compute.util.ComputeServiceUtils;
import org.jclouds.logging.Logger;
import com.google.common.base.Function;
@@ -40,11 +43,20 @@ import com.google.common.base.Function;
@Singleton
public class CloudServersImageToOperatingSystem implements
Function {
- public static final Pattern RACKSPACE_PATTERN = Pattern.compile("(([^ ]*) ([0-9.]+) ?.*)");
+ public static final Pattern DEFAULT_PATTERN = Pattern.compile("(([^ ]*) ([0-9.]+) ?.*)");
+ // Windows Server 2008 R2 x64
+ public static final Pattern WINDOWS_PATTERN = Pattern.compile("Windows (.*) (x[86][64])");
@Resource
@Named(ComputeServiceConstants.COMPUTE_LOGGER)
protected Logger logger = Logger.NULL;
+
+ private final Map> osVersionMap;
+
+ @Inject
+ public CloudServersImageToOperatingSystem(Map> osVersionMap) {
+ this.osVersionMap = osVersionMap;
+ }
public OperatingSystem apply(final org.jclouds.rackspace.cloudservers.domain.Image from) {
OsFamily osFamily = null;
@@ -53,21 +65,28 @@ public class CloudServersImageToOperatingSystem implements
String osVersion = null;
String osDescription = from.getName();
boolean is64Bit = true;
- Matcher matcher = RACKSPACE_PATTERN.matcher(from.getName());
if (from.getName().indexOf("Red Hat EL") != -1) {
osFamily = OsFamily.RHEL;
} else if (from.getName().indexOf("Oracle EL") != -1) {
osFamily = OsFamily.OEL;
- }
- if (matcher.find()) {
- try {
- osFamily = OsFamily.fromValue(matcher.group(2).toLowerCase());
- } catch (IllegalArgumentException e) {
- logger.debug("<< didn't match os(%s)", matcher.group(2));
+ } else if (from.getName().indexOf("Windows") != -1) {
+ osFamily = OsFamily.WINDOWS;
+ Matcher matcher = WINDOWS_PATTERN.matcher(from.getName());
+ if (matcher.find()) {
+ osVersion = ComputeServiceUtils.parseVersionOrReturnEmptyString(osFamily, matcher.group(1), osVersionMap);
+ is64Bit = matcher.group(2).equals("x64");
+ }
+ } else {
+ Matcher matcher = DEFAULT_PATTERN.matcher(from.getName());
+ if (matcher.find()) {
+ try {
+ osFamily = OsFamily.fromValue(matcher.group(2).toLowerCase());
+ } catch (IllegalArgumentException e) {
+ logger.debug("<< didn't match os(%s)", matcher.group(2));
+ }
+ osVersion = ComputeServiceUtils.parseVersionOrReturnEmptyString(osFamily, matcher.group(3), osVersionMap);
}
- osVersion = matcher.group(3);
}
- OperatingSystem os = new OperatingSystem(osFamily, osName, osVersion, osArch, osDescription, is64Bit);
- return os;
+ return new OperatingSystem(osFamily, osName, osVersion, osArch, osDescription, is64Bit);
}
}
\ No newline at end of file
diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersComputeServiceLiveTest.java b/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersComputeServiceLiveTest.java
index 6c669adf78..ad757b5826 100644
--- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersComputeServiceLiveTest.java
+++ b/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersComputeServiceLiveTest.java
@@ -52,7 +52,7 @@ public class CloudServersComputeServiceLiveTest extends BaseComputeServiceLiveTe
public void testTemplateBuilder() {
Template defaultTemplate = client.templateBuilder().build();
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "9.10");
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(defaultTemplate.getLocation().getId(), "DFW1");
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
@@ -66,7 +66,7 @@ public class CloudServersComputeServiceLiveTest extends BaseComputeServiceLiveTe
public void testAssignability() throws Exception {
@SuppressWarnings("unused")
RestContext tmContext = new ComputeServiceContextFactory()
- .createContext(provider, identity, credential).getProviderSpecificContext();
+ .createContext(provider, identity, credential).getProviderSpecificContext();
}
@Override
@@ -82,4 +82,21 @@ public class CloudServersComputeServiceLiveTest extends BaseComputeServiceLiveTe
super.testSuspendResume();
}
+ @Test(enabled = true, dependsOnMethods = "testSuspendResume")
+ @Override
+ public void testGetNodesWithDetails() throws Exception {
+ super.testGetNodesWithDetails();
+ }
+
+ @Test(enabled = true, dependsOnMethods = "testSuspendResume")
+ @Override
+ public void testListNodes() throws Exception {
+ super.testListNodes();
+ }
+
+ @Test(enabled = true, dependsOnMethods = { "testListNodes", "testGetNodesWithDetails" })
+ @Override
+ public void testDestroyNodes() {
+ super.testDestroyNodes();
+ }
}
\ No newline at end of file
diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersTemplateBuilderLiveTest.java b/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersTemplateBuilderLiveTest.java
new file mode 100644
index 0000000000..0eb104d29a
--- /dev/null
+++ b/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersTemplateBuilderLiveTest.java
@@ -0,0 +1,57 @@
+/**
+ *
+ * Copyright (C) 2010 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.rackspace.cloudservers.compute;
+
+import org.jclouds.compute.BaseTemplateBuilderLiveTest;
+import org.jclouds.compute.OsFamilyVersion64Bit;
+import org.jclouds.compute.domain.OsFamily;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Predicate;
+
+/**
+ *
+ * @author Adrian Cole
+ */
+@Test(groups = "live", testName = "cloudservers.CloudServersTemplateBuilderLiveTest")
+public class CloudServersTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
+
+ public CloudServersTemplateBuilderLiveTest() {
+ provider = "cloudservers";
+ }
+
+ @Override
+ protected Predicate defineUnsupportedOperatingSystems() {
+ return new Predicate() {
+
+ @Override
+ public boolean apply(OsFamilyVersion64Bit input) {
+ return (input.family != OsFamily.WINDOWS && !input.is64Bit) || //
+ input.family == OsFamily.RHEL || //
+ (input.family == OsFamily.UBUNTU && input.version.equals("11.04")) || //
+ (input.family == OsFamily.CENTOS && input.version.matches("5.[23]")) || //
+ (input.family == OsFamily.WINDOWS && input.version.equals("2008")) || //
+ (input.family == OsFamily.WINDOWS && input.version.equals("2008 R2") && !input.is64Bit);
+ }
+
+ };
+ }
+
+}
\ No newline at end of file
diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/functions/CloudServersImageToImageTest.java b/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/functions/CloudServersImageToImageTest.java
index 3b2ab4c81d..99c4fb9bd5 100644
--- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/functions/CloudServersImageToImageTest.java
+++ b/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/functions/CloudServersImageToImageTest.java
@@ -23,14 +23,20 @@ import static org.testng.Assert.assertEquals;
import java.net.UnknownHostException;
+import org.jclouds.compute.config.BaseComputeServiceContextModule;
import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.ImageBuilder;
import org.jclouds.compute.domain.OperatingSystemBuilder;
import org.jclouds.compute.domain.OsFamily;
+import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.domain.Credentials;
+import org.jclouds.json.Json;
+import org.jclouds.json.config.GsonModule;
import org.jclouds.rackspace.cloudservers.functions.ParseImageFromJsonResponseTest;
import org.testng.annotations.Test;
+import com.google.inject.Guice;
+
/**
* @author Adrian Cole
*/
@@ -52,7 +58,9 @@ public class CloudServersImageToImageTest {
public static Image convertImage() {
org.jclouds.rackspace.cloudservers.domain.Image image = ParseImageFromJsonResponseTest.parseImage();
- CloudServersImageToImage parser = new CloudServersImageToImage(new CloudServersImageToOperatingSystem());
+ CloudServersImageToImage parser = new CloudServersImageToImage(new CloudServersImageToOperatingSystem(new BaseComputeServiceContextModule() {
+ }.provideOsVersionMap(new ComputeServiceConstants.ReferenceData(), Guice.createInjector(new GsonModule())
+ .getInstance(Json.class))));
return parser.apply(image);
}
diff --git a/rimuhosting/pom.xml b/rimuhosting/pom.xml
index 324c3d7b6a..6ea3e1ecb8 100644
--- a/rimuhosting/pom.xml
+++ b/rimuhosting/pom.xml
@@ -40,8 +40,8 @@
- trmkrun-ccc,test.trmk-924
- https://rimuhosting.com/r
+ trmkrun-ccc,test.trmk-924
+ https://api.rimuhosting.com/r1.0FIXME
@@ -114,8 +114,8 @@
${test.rimuhosting.identity}
- jclouds.compute.blacklist.nodes
- ${jclouds.compute.blacklist.nodes}
+ jclouds.compute.blacklist-nodes
+ ${jclouds.compute.blacklist-nodes}
@@ -126,4 +126,4 @@
-
+
\ No newline at end of file
diff --git a/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClient.java b/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClient.java
index 57bf048d9a..3d6a451c00 100644
--- a/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClient.java
+++ b/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClient.java
@@ -39,6 +39,7 @@ import org.jclouds.rest.annotations.MatrixParams;
import org.jclouds.rest.annotations.RequestFilters;
import org.jclouds.rest.annotations.ResponseParser;
import org.jclouds.rest.annotations.Unwrap;
+import org.jclouds.rest.annotations.VirtualHost;
import org.jclouds.rimuhosting.miro.binder.CreateServerOptions;
import org.jclouds.rimuhosting.miro.binder.RimuHostingRebootJsonBinder;
import org.jclouds.rimuhosting.miro.domain.Image;
@@ -66,6 +67,7 @@ import com.google.common.util.concurrent.ListenableFuture;
* @see
*/
@RequestFilters(RimuHostingAuthentication.class)
+@VirtualHost
public interface RimuHostingAsyncClient {
/**
@@ -74,7 +76,6 @@ public interface RimuHostingAsyncClient {
@GET
@Path("/distributions")
@ResponseParser(ParseImagesFromJsonResponse.class)
- @Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
@ExceptionParser(ParseRimuHostingException.class)
ListenableFuture> getImageList();
@@ -86,7 +87,6 @@ public interface RimuHostingAsyncClient {
@Path("/orders")
@ResponseParser(ParseServersFromJsonResponse.class)
@MatrixParams(keys = "include_inactive", values = "N")
- @Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
@ExceptionParser(ParseRimuHostingException.class)
ListenableFuture> getServerList();
diff --git a/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingPropertiesBuilder.java b/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingPropertiesBuilder.java
index acf507980a..36a395af2e 100644
--- a/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingPropertiesBuilder.java
+++ b/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingPropertiesBuilder.java
@@ -37,7 +37,7 @@ public class RimuHostingPropertiesBuilder extends PropertiesBuilder {
protected Properties defaultProperties() {
Properties properties = super.defaultProperties();
properties.setProperty(PROPERTY_API_VERSION, "TODO");
- properties.setProperty(PROPERTY_ENDPOINT, "https://rimuhosting.com/r");
+ properties.setProperty(PROPERTY_ENDPOINT, "https://api.rimuhosting.com/r");
properties.setProperty(PROPERTY_RIMUHOSTING_DEFAULT_DC, "DCDALLAS");
return properties;
}
diff --git a/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceContextModule.java b/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceContextModule.java
index 5421e5511f..02020e68c2 100755
--- a/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceContextModule.java
+++ b/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/compute/config/RimuHostingComputeServiceContextModule.java
@@ -19,9 +19,6 @@
package org.jclouds.rimuhosting.miro.compute.config;
-import static org.jclouds.compute.domain.OsFamily.UBUNTU;
-
-
import org.jclouds.compute.config.BaseComputeServiceContextModule;
import org.jclouds.compute.domain.TemplateBuilder;
@@ -45,7 +42,7 @@ public class RimuHostingComputeServiceContextModule extends BaseComputeServiceCo
@Override
protected TemplateBuilder provideTemplate(Injector injector, TemplateBuilder template) {
- return template.hardwareId("MIRO1B").osFamily(UBUNTU).os64Bit(false).osVersionMatches("9.10");
+ return super.provideTemplate(injector, template).hardwareId("MIRO4B");
}
}
diff --git a/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClientTest.java b/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClientTest.java
index 919e2fe870..7d25b9d32e 100644
--- a/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClientTest.java
+++ b/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClientTest.java
@@ -51,13 +51,13 @@ public class RimuHostingAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "test.ivan.api.com",
- "lenny", "MIRO1B");
+ "lenny", "MIRO4B");
- assertRequestLineEquals(httpRequest, "POST https://rimuhosting.com/r/orders/new-vps HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+ assertRequestLineEquals(httpRequest, "POST https://api.rimuhosting.com/r/orders/new-vps HTTP/1.1");
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\nHost: api.rimuhosting.com\n");
assertPayloadEquals(
httpRequest,
- "{\"request\":{\"instantiation_options\":{\"distro\":\"lenny\",\"domain_name\":\"test.ivan.api.com\"},\"pricing_plan_code\":\"MIRO1B\",\"meta_data\":[]}}",
+ "{\"request\":{\"instantiation_options\":{\"distro\":\"lenny\",\"domain_name\":\"test.ivan.api.com\"},\"pricing_plan_code\":\"MIRO4B\",\"meta_data\":[]}}",
"application/json", false);
assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
assertSaxResponseParserClassEquals(method, null);
diff --git a/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java b/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java
index 7c7a0ea22d..45fc4a4fb5 100644
--- a/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java
+++ b/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingClientLiveTest.java
@@ -115,7 +115,7 @@ public class RimuHostingClientLiveTest {
@Test
public void testLifeCycle() {
// Get the first image, we dont really care what it is in this test.
- NewServerResponse serverResponse = connection.createServer("test.ivan.api.com", "lenny", "MIRO1B");
+ NewServerResponse serverResponse = connection.createServer("test.ivan.api.com", "lenny", "MIRO4B");
Server server = serverResponse.getServer();
// Now we have the server, lets restart it
assertNotNull(server.getId());
diff --git a/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingComputeServiceLiveTest.java b/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingComputeServiceLiveTest.java
index 2116ea9e87..49e6ed4b70 100755
--- a/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingComputeServiceLiveTest.java
+++ b/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingComputeServiceLiveTest.java
@@ -48,10 +48,10 @@ public class RimuHostingComputeServiceLiveTest extends BaseComputeServiceLiveTes
public void testTemplateBuilder() {
Template defaultTemplate = client.templateBuilder().build();
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), false);
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "9.10");
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(defaultTemplate.getLocation().getId(), "DCDALLAS");
- assertEquals(defaultTemplate.getHardware().getProviderId(), "MIRO1B");
+ assertEquals(defaultTemplate.getHardware().getProviderId(), "MIRO4B");
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
}
@@ -60,4 +60,4 @@ public class RimuHostingComputeServiceLiveTest extends BaseComputeServiceLiveTes
return new JschSshClientModule();
}
-}
\ No newline at end of file
+}
diff --git a/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingTemplateBuilderLiveTest.java b/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingTemplateBuilderLiveTest.java
new file mode 100644
index 0000000000..4206b962db
--- /dev/null
+++ b/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingTemplateBuilderLiveTest.java
@@ -0,0 +1,53 @@
+/**
+ *
+ * Copyright (C) 2010 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.rimuhosting.miro.compute;
+
+import org.jclouds.compute.BaseTemplateBuilderLiveTest;
+import org.jclouds.compute.OsFamilyVersion64Bit;
+import org.jclouds.compute.domain.OsFamily;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Predicate;
+
+/**
+ *
+ * @author Adrian Cole
+ */
+@Test(groups = "live", testName = "rimuhosting.RimuHostingTemplateBuilderLiveTest")
+public class RimuHostingTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
+
+ public RimuHostingTemplateBuilderLiveTest() {
+ provider = "rimuhosting";
+ }
+
+ @Override
+ protected Predicate defineUnsupportedOperatingSystems() {
+ return new Predicate() {
+
+ @Override
+ public boolean apply(OsFamilyVersion64Bit input) {
+ return input.family != OsFamily.UBUNTU || //
+ Float.parseFloat(input.version) > 10.04 || //
+ (!(input.is64Bit) && Float.parseFloat(input.version) < 8.10);
+ }
+
+ };
+ }
+}
\ No newline at end of file
diff --git a/sandbox/libvirt/README.txt b/sandbox/libvirt/README.txt
index a6c9289a57..290e8ea774 100644
--- a/sandbox/libvirt/README.txt
+++ b/sandbox/libvirt/README.txt
@@ -1,2 +1,73 @@
+The libvirt library is used to interface with different virtualization technologies (http://libvirt.org/)
+
+libvirt supports:
+The Xen hypervisor on Linux and Solaris hosts.
+The QEMU emulator
+The KVM Linux hypervisor
+The LXC Linux container system
+The OpenVZ Linux container system
+The User Mode Linux paravirtualized kernel
+The VirtualBox hypervisor
+The VMware ESX and GSX hypervisors
+Storage on IDE/SCSI/USB disks, FibreChannel, LVM, iSCSI, NFS and filesystems
+
+Getting Started Guide for jclouds-libvirt
+
install libvirt on your os
* if os/x, see http://github.com/justinclift/libvirt
+ * if you are using Linux, let's suppose you want to use KVM:
+- install libvirt and KVM (http://www.linux-kvm.org/page/Main_Page).
+
+Remember to run
+ egrep '(vmx|svm)' /proc/cpuinfo
+ If nothing is printed, it means that your cpu does not support hardware virtualization.
+
+Verify Installation
+$ virsh -c qemu:///system list
+ Id Name State
+----------------------------------
+
+(for Ubuntu users: look also at this good turorial https://help.ubuntu.com/community/KVM)
+
+Create your first guest
+- download, for example, an ubuntu 10.04 LTS ISO
+- create a libvirt domain by using:
+ virt-manager: a GUI tool at http://virt-manager.et.redhat.com/
+ virt-install, a python script developed by Red Hat (sudo apt-get install python-virtinst)
+ ubuntu-vm-builder, developed by Canonical. (sudo apt-get install ubuntu-vm-builder)
+ NB: use Javascript tool that generates the parameters for ubuntu-vm-builder: http://people.ubuntu.com/~kirkland/ubuntu-vm-builder.html
+
+Now that you have a libvirt domain, your workstation is ready to use jclouds-libvirt.
+You can now download jclouds-libvirt and give a try by running
+
+ComputeServiceContext context = null;
+ try {
+ context = new ComputeServiceContextFactory()
+ .createContext(new StandaloneComputeServiceContextSpec("libvirt",
+ endpoint, apiversion, identity, credential, new LibvirtComputeServiceContextModule(), ImmutableSet
+ . of()));
+
+ Template defaultTemplate = context.getComputeService().templateBuilder()
+ .hardwareId("c7ff2039-a9f1-a659-7f91-e0f82f59d52e").imageId("1").build();
+
+
+ context.getComputeService().runNodesWithTag(domainName, 1, defaultTemplate);
+
+ } catch (RunNodesException e) {
+ e.printStackTrace();
+ } finally {
+ if (context != null)
+ context.close();
+ }
+
+where identity=your_name, endpoint=qemu:///system
+ and domainName equals to the name chosen during the creation of libvirt domain
+
+NB: apiversion, credential can be null
+
+
+
+
+
+
+
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/domain/LibvirtComputeServiceContextModule.java b/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/domain/LibvirtComputeServiceContextModule.java
index 7c53514e75..85a29f2f60 100644
--- a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/domain/LibvirtComputeServiceContextModule.java
+++ b/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/domain/LibvirtComputeServiceContextModule.java
@@ -29,6 +29,7 @@ import org.jclouds.compute.ComputeServiceAdapter;
import org.jclouds.compute.config.StandaloneComputeServiceContextModule;
import org.jclouds.compute.domain.Hardware;
import org.jclouds.compute.domain.NodeMetadata;
+import org.jclouds.compute.domain.TemplateBuilder;
import org.jclouds.compute.suppliers.DefaultLocationSupplier;
import org.jclouds.domain.Location;
import org.jclouds.libvirt.Datacenter;
@@ -45,37 +46,58 @@ import org.libvirt.LibvirtException;
import com.google.common.base.Function;
import com.google.common.base.Supplier;
+import com.google.inject.Injector;
+import com.google.inject.Key;
import com.google.inject.Provides;
import com.google.inject.TypeLiteral;
+import com.google.inject.name.Names;
/**
*
* @author Adrian Cole
*/
public class LibvirtComputeServiceContextModule extends
- StandaloneComputeServiceContextModule {
- @Override
- protected void configure() {
- super.configure();
- bind(new TypeLiteral>() {
- }).to(LibvirtComputeServiceAdapter.class);
- bind(new TypeLiteral>() {
- }).to(DefaultLocationSupplier.class);
- bind(new TypeLiteral>() {
- }).to(DomainToNodeMetadata.class);
- bind(new TypeLiteral>() {
- }).to(LibvirtImageToImage.class);
- bind(new TypeLiteral>() {
- }).to(DomainToHardware.class);
- bind(new TypeLiteral>() {
- }).to(DatacenterToLocation.class);
- }
+StandaloneComputeServiceContextModule {
+ @Override
+ protected void configure() {
+ super.configure();
+ bind(new TypeLiteral>() {
+ }).to(LibvirtComputeServiceAdapter.class);
+ bind(new TypeLiteral>() {
+ }).to(DefaultLocationSupplier.class);
+ bind(new TypeLiteral>() {
+ }).to(DomainToNodeMetadata.class);
+ bind(new TypeLiteral>() {
+ }).to(LibvirtImageToImage.class);
+ bind(new TypeLiteral>() {
+ }).to(DomainToHardware.class);
+ bind(new TypeLiteral>() {
+ }).to(DatacenterToLocation.class);
+ }
- @Provides
- @Singleton
- protected Connect createConnection(@Provider URI endpoint, @Named(Constants.PROPERTY_IDENTITY) String identity,
- @Named(Constants.PROPERTY_CREDENTIAL) String credential) throws LibvirtException {
- // ConnectAuth connectAuth = null;
- return new Connect(endpoint.toASCIIString());
- }
+ @Provides
+ @Singleton
+ protected Connect createConnection(@Provider URI endpoint, @Named(Constants.PROPERTY_IDENTITY) String identity,
+ @Named(Constants.PROPERTY_CREDENTIAL) String credential) throws LibvirtException {
+ // ConnectAuth connectAuth = null;
+ return new Connect(endpoint.toASCIIString());
+ }
+
+ @Override
+ protected TemplateBuilder provideTemplate(Injector injector, TemplateBuilder template) {
+ String domainDir = injector.getInstance(Key.get(String.class, Names.named("jclouds.libvirt.domain-dir")));
+ String hardwareId = searchForHardwareIdInDomainDir(domainDir);
+ String image = searchForImageIdInDomainDir(domainDir);
+ return template.hardwareId(hardwareId).imageId(image) ;
+ }
+
+ private String searchForImageIdInDomainDir(String domainDir) {
+ // TODO
+ return "1";
+ }
+
+ private String searchForHardwareIdInDomainDir(String domainDir) {
+ // TODO
+ return "c7ff2039-a9f1-a659-7f91-e0f82f59d52e";
+ }
}
\ No newline at end of file
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToHardware.java b/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToHardware.java
index ae2876bd2a..3296cd4e8e 100644
--- a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToHardware.java
+++ b/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToHardware.java
@@ -77,6 +77,7 @@ public class DomainToHardware implements Function {
NodeList nodes = (NodeList) expr.evaluate(doc, XPathConstants.NODESET);
String diskFileName = nodes.item(0).getNodeValue();
for (int i = 0; i < nodes.getLength(); i++) {
+ System.out.println("disk " + diskFileName);
StorageVol storageVol = from.getConnect().storageVolLookupByPath(diskFileName);
String id = storageVol.getKey();
float size = new Long(storageVol.getInfo().capacity).floatValue();
diff --git a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtImageToImage.java b/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtImageToImage.java
index 256be4b525..9506dee044 100644
--- a/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtImageToImage.java
+++ b/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtImageToImage.java
@@ -52,7 +52,7 @@ public class LibvirtImageToImage implements Function images = Lists.newArrayList();
- images.add(new Image(1, "ubuntu"));
- return images;
-
+ int i = 1;
+ try {
+ String[] domains = client.listDefinedDomains();
+ List images = Lists.newArrayList();
+ for (String domainName : domains) {
+ images.add(new Image(i++, domainName));
+ }
+ return images;
+ } catch (Exception e) {
+ return propogate(e);
+ }
}
- // @Override
- // public Iterable listNodes() {
- // try {
- // List domains = Lists.newArrayList();
- // for (int domain : client.listDomains()) {
- // domains.add(client.domainLookupByID(domain));
- // }
- // return domains;
- // } catch (LibvirtException e) {
- // return propogate(e);
- // }
- // }
-
@Override
public Iterable listNodes() {
try {
@@ -219,20 +212,10 @@ public class LibvirtComputeServiceAdapter implements ComputeServiceAdapter" + " deftest"
- + " 004b96e1-2d78-c30f-5aa5-f03c87d21e70" + " 8388608"
- + " 2" + " hvm" + " restart"
- + " destroy" + " restart" + "");
-
- }
-
private static StorageVol cloneVolume(StoragePool storagePool, StorageVol from) throws LibvirtException,
XPathExpressionException, ParserConfigurationException, SAXException, IOException, TransformerException {
String fromXML = from.getXMLDesc(0);
String clonedXML = generateClonedVolumeXML(fromXML);
- System.out.println(clonedXML);
- // return null;
return storagePool.storageVolCreateXMLFrom(clonedXML, from, 0);
}
diff --git a/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java b/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java
index d08142a846..ca5bff57f1 100644
--- a/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java
+++ b/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java
@@ -65,24 +65,28 @@ public class LibvirtExperimentLiveTest {
endpoint, apiversion, identity, credential, new LibvirtComputeServiceContextModule(), ImmutableSet
. of()));
+
+ /*
System.out.println("images " + context.getComputeService().listImages());
System.out.println("nodes " + context.getComputeService().listNodes());
System.out.println("hardware profiles " + context.getComputeService().listHardwareProfiles());
+ */
+ /*
Template defaultTemplate = context.getComputeService().templateBuilder()
.hardwareId("c7ff2039-a9f1-a659-7f91-e0f82f59d52e").imageId("1") //.locationId("")
.build();
-
+ */
+
/*
* We will probably make a default template out of properties at some point
* You can control the default template via overriding a method in standalonecomputeservicexontextmodule
*/
-
-
-// context.getComputeService().templateOptions().;
- context.getComputeService().runNodesWithTag("ttylinux", 1, defaultTemplate);
-
- } catch (RunNodesException e) {
+
+ context.getComputeService().runNodesWithTag("ttylinux", 1/*, defaultTemplate*/);
+
+ } catch (RunNodesException e) {
+ // TODO Auto-generated catch block
e.printStackTrace();
} finally {
if (context != null)
diff --git a/skeletons/standalone-compute/pom.xml b/skeletons/standalone-compute/pom.xml
index 3ef57068aa..c255c52cdc 100644
--- a/skeletons/standalone-compute/pom.xml
+++ b/skeletons/standalone-compute/pom.xml
@@ -32,10 +32,11 @@
jclouds example components for a standalone compute provider
- trmkrun-ccc,test.trmk-924
- https://servermanager-compute.com
- 1.0
- FIXME
+ trmkrun-ccc,test.trmk-924
+ FIXME
+ https://servermanager.com
+ 1.0
+ FIXME
@@ -95,20 +96,20 @@
- test.servermanager-compute.endpoint
- ${test.servermanager-compute.endpoint}
+ test.servermanager.endpoint
+ ${test.servermanager.endpoint}
- test.servermanager-compute.apiversion
- ${test.servermanager-compute.apiversion}
+ test.servermanager.apiversion
+ ${test.servermanager.apiversion}
- test.servermanager-compute.identity
- ${test.servermanager-compute.identity}
+ test.servermanager.identity
+ ${test.servermanager.identity}
- jclouds.compute.blacklist.nodes
- ${jclouds.compute.blacklist.nodes}
+ jclouds.compute.blacklist-nodes
+ ${jclouds.compute.blacklist-nodes}
diff --git a/slicehost/pom.xml b/slicehost/pom.xml
index 4105e0a851..b048dd7c46 100644
--- a/slicehost/pom.xml
+++ b/slicehost/pom.xml
@@ -32,7 +32,7 @@
jclouds slicehost components
- trmkrun-ccc,test.trmk-924
+ trmkrun-ccc,test.trmk-924https://api.slicehost.com1.4.1.1FIXME
@@ -107,8 +107,8 @@
${test.slicehost.identity}
- jclouds.compute.blacklist.nodes
- ${jclouds.compute.blacklist.nodes}
+ jclouds.compute.blacklist-nodes
+ ${jclouds.compute.blacklist-nodes}
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModule.java b/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModule.java
index 15ff8b0d15..ca21e49616 100644
--- a/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModule.java
+++ b/slicehost/src/main/java/org/jclouds/slicehost/compute/config/SlicehostComputeServiceContextModule.java
@@ -19,14 +19,11 @@
package org.jclouds.slicehost.compute.config;
-import static org.jclouds.compute.domain.OsFamily.UBUNTU;
-
import java.util.Set;
import javax.inject.Singleton;
import org.jclouds.compute.config.BaseComputeServiceContextModule;
-import org.jclouds.compute.domain.TemplateBuilder;
import org.jclouds.compute.internal.BaseComputeService;
import org.jclouds.domain.Location;
import org.jclouds.domain.LocationScope;
@@ -34,7 +31,6 @@ import org.jclouds.domain.internal.LocationImpl;
import org.jclouds.rest.annotations.Provider;
import com.google.common.collect.ImmutableSet;
-import com.google.inject.Injector;
import com.google.inject.Provides;
/**
@@ -51,11 +47,6 @@ public class SlicehostComputeServiceContextModule extends BaseComputeServiceCont
return new LocationImpl(LocationScope.ZONE, "DFW1", "Dallas, TX", provider);
}
- @Override
- protected TemplateBuilder provideTemplate(Injector injector, TemplateBuilder template) {
- return template.osFamily(UBUNTU).os64Bit(true);
- }
-
@Provides
@Singleton
Set extends Location> provideLocations(Location location) {
diff --git a/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToOperatingSystem.java b/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToOperatingSystem.java
index a9486f752e..543fda05aa 100644
--- a/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToOperatingSystem.java
+++ b/slicehost/src/main/java/org/jclouds/slicehost/compute/functions/SlicehostImageToOperatingSystem.java
@@ -19,16 +19,19 @@
package org.jclouds.slicehost.compute.functions;
+import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.annotation.Resource;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import org.jclouds.compute.domain.OperatingSystem;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.reference.ComputeServiceConstants;
+import org.jclouds.compute.util.ComputeServiceUtils;
import org.jclouds.logging.Logger;
import com.google.common.base.Function;
@@ -38,14 +41,22 @@ import com.google.common.base.Function;
* @author Adrian Cole
*/
@Singleton
-public class SlicehostImageToOperatingSystem implements
- Function {
- public static final Pattern SLICEHOST_PATTERN = Pattern.compile("(([^ ]*) ([0-9.]+) ?.*)");
+public class SlicehostImageToOperatingSystem implements Function {
+ public static final Pattern DEFAULT_PATTERN = Pattern.compile("(([^ ]*) ([0-9.]+) ?.*)");
+ // Windows Server 2008 R2 x64
+ public static final Pattern WINDOWS_PATTERN = Pattern.compile("Windows (.*) (x[86][64])");
@Resource
@Named(ComputeServiceConstants.COMPUTE_LOGGER)
protected Logger logger = Logger.NULL;
+ private final Map> osVersionMap;
+
+ @Inject
+ public SlicehostImageToOperatingSystem(Map> osVersionMap) {
+ this.osVersionMap = osVersionMap;
+ }
+
public OperatingSystem apply(final org.jclouds.slicehost.domain.Image from) {
OsFamily osFamily = null;
String osName = null;
@@ -57,17 +68,24 @@ public class SlicehostImageToOperatingSystem implements
osFamily = OsFamily.RHEL;
} else if (from.getName().indexOf("Oracle EL") != -1) {
osFamily = OsFamily.OEL;
- }
- Matcher matcher = SLICEHOST_PATTERN.matcher(from.getName());
- if (matcher.find()) {
- try {
- osFamily = OsFamily.fromValue(matcher.group(2).toLowerCase());
- } catch (IllegalArgumentException e) {
- logger.debug("<< didn't match os(%s)", matcher.group(2));
+ } else if (from.getName().indexOf("Windows") != -1) {
+ osFamily = OsFamily.WINDOWS;
+ Matcher matcher = WINDOWS_PATTERN.matcher(from.getName());
+ if (matcher.find()) {
+ osVersion = ComputeServiceUtils.parseVersionOrReturnEmptyString(osFamily, matcher.group(1), osVersionMap);
+ is64Bit = matcher.group(2).equals("x64");
+ }
+ } else {
+ Matcher matcher = DEFAULT_PATTERN.matcher(from.getName());
+ if (matcher.find()) {
+ try {
+ osFamily = OsFamily.fromValue(matcher.group(2).toLowerCase());
+ } catch (IllegalArgumentException e) {
+ logger.debug("<< didn't match os(%s)", matcher.group(2));
+ }
+ osVersion = ComputeServiceUtils.parseVersionOrReturnEmptyString(osFamily, matcher.group(3), osVersionMap);
}
- osVersion = matcher.group(3);
}
- OperatingSystem os = new OperatingSystem(osFamily, osName, osVersion, osArch, osDescription, is64Bit);
- return os;
+ return new OperatingSystem(osFamily, osName, osVersion, osArch, osDescription, is64Bit);
}
}
\ No newline at end of file
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java b/slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java
index a120662bff..aa9de7cb58 100644
--- a/slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java
+++ b/slicehost/src/test/java/org/jclouds/slicehost/SlicehostClientLiveTest.java
@@ -32,6 +32,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.Constants;
+import org.jclouds.domain.Credentials;
import org.jclouds.http.HttpResponseException;
import org.jclouds.io.Payloads;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
@@ -77,7 +78,7 @@ public class SlicehostClientLiveTest {
identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
endpoint = checkNotNull(System.getProperty("test." + provider + ".endpoint"), "test." + provider + ".endpoint");
apiversion = checkNotNull(System.getProperty("test." + provider + ".apiversion"), "test." + provider
- + ".apiversion");
+ + ".apiversion");
}
protected Properties setupProperties() {
@@ -96,8 +97,7 @@ public class SlicehostClientLiveTest {
Properties overrides = setupProperties();
Injector injector = new RestContextFactory().createContextBuilder(provider,
- ImmutableSet. of(new Log4JLoggingModule(), new JschSshClientModule()), overrides)
- .buildInjector();
+ ImmutableSet. of(new Log4JLoggingModule(), new JschSshClientModule()), overrides).buildInjector();
client = injector.getInstance(SlicehostClient.class);
sshFactory = injector.getInstance(SshClient.Factory.class);
@@ -252,7 +252,7 @@ public class SlicehostClientLiveTest {
private void blockUntilSliceActive(int sliceId) throws InterruptedException {
Slice currentDetails = null;
for (currentDetails = client.getSlice(sliceId); currentDetails.getStatus() != Slice.Status.ACTIVE; currentDetails = client
- .getSlice(sliceId)) {
+ .getSlice(sliceId)) {
System.out.printf("blocking on status active%n%s%n", currentDetails);
Thread.sleep(5 * 1000);
}
@@ -286,7 +286,7 @@ public class SlicehostClientLiveTest {
IPSocket socket = new IPSocket(ip, 22);
socketTester.apply(socket);
- SshClient client = sshFactory.create(socket, "root", pass);
+ SshClient client = sshFactory.create(socket, new Credentials("root", pass));
try {
client.connect();
client.put("/etc/jclouds.txt", Payloads.newStringPayload("slicehost"));
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostComputeServiceLiveTest.java b/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostComputeServiceLiveTest.java
index 05ebe60d0b..bc635d579d 100644
--- a/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostComputeServiceLiveTest.java
+++ b/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostComputeServiceLiveTest.java
@@ -48,7 +48,7 @@ public class SlicehostComputeServiceLiveTest extends BaseComputeServiceLiveTest
public void testTemplateBuilder() {
Template defaultTemplate = client.templateBuilder().build();
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "9.10");
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(defaultTemplate.getLocation().getId(), "DFW1");
assertEquals(getCores(defaultTemplate.getHardware()), 0.25d);
@@ -62,6 +62,29 @@ public class SlicehostComputeServiceLiveTest extends BaseComputeServiceLiveTest
public void testAssignability() throws Exception {
@SuppressWarnings("unused")
RestContext tmContext = new ComputeServiceContextFactory().createContext(
- provider, identity, credential).getProviderSpecificContext();
+ provider, identity, credential).getProviderSpecificContext();
+ }
+
+ @Test(expectedExceptions = UnsupportedOperationException.class)
+ public void testSuspendResume() throws Exception {
+ super.testSuspendResume();
+ }
+
+ @Test(enabled = true, dependsOnMethods = "testSuspendResume")
+ @Override
+ public void testGetNodesWithDetails() throws Exception {
+ super.testGetNodesWithDetails();
+ }
+
+ @Test(enabled = true, dependsOnMethods = "testSuspendResume")
+ @Override
+ public void testListNodes() throws Exception {
+ super.testListNodes();
+ }
+
+ @Test(enabled = true, dependsOnMethods = { "testListNodes", "testGetNodesWithDetails" })
+ @Override
+ public void testDestroyNodes() {
+ super.testDestroyNodes();
}
}
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java b/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java
new file mode 100644
index 0000000000..cf88d5ac72
--- /dev/null
+++ b/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java
@@ -0,0 +1,70 @@
+/**
+ *
+ * Copyright (C) 2010 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.slicehost.compute;
+
+import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
+import static org.testng.Assert.assertEquals;
+
+import java.io.IOException;
+
+import org.jclouds.compute.BaseTemplateBuilderLiveTest;
+import org.jclouds.compute.OsFamilyVersion64Bit;
+import org.jclouds.compute.domain.OsFamily;
+import org.jclouds.compute.domain.Template;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Predicate;
+
+/**
+ *
+ * @author Adrian Cole
+ */
+@Test(groups = "live", testName = "slicehost.SlicehostTemplateBuilderLiveTest")
+public class SlicehostTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
+
+ public SlicehostTemplateBuilderLiveTest() {
+ provider = "slicehost";
+ }
+
+ @Override
+ protected Predicate defineUnsupportedOperatingSystems() {
+ return new Predicate() {
+
+ @Override
+ public boolean apply(OsFamilyVersion64Bit input) {
+ return (input.family == OsFamily.RHEL || //
+ (input.family == OsFamily.UBUNTU && input.version.equals("11.04")) || //
+ (input.family == OsFamily.CENTOS && input.version.matches("5.[23]")) || //
+ (input.family == OsFamily.WINDOWS && !(input.is64Bit && input.version.equals("2008 R2"))//
+ && !(!input.is64Bit && input.version.equals("2008 SP2"))));
+ }
+
+ };
+ }
+
+ @Test
+ public void testDefaultTemplateBuilder() throws IOException {
+ Template defaultTemplate = context.getComputeService().templateBuilder().build();
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04");
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
+ assertEquals(getCores(defaultTemplate.getHardware()), 0.25d);
+ }
+}
\ No newline at end of file
diff --git a/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImageTest.java b/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImageTest.java
index a02238bcef..60e327be7e 100644
--- a/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImageTest.java
+++ b/slicehost/src/test/java/org/jclouds/slicehost/compute/functions/SlicehostImageToImageTest.java
@@ -23,17 +23,23 @@ import static org.testng.Assert.assertEquals;
import java.net.UnknownHostException;
+import org.jclouds.compute.config.BaseComputeServiceContextModule;
import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.ImageBuilder;
import org.jclouds.compute.domain.OperatingSystemBuilder;
import org.jclouds.compute.domain.OsFamily;
+import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.domain.Credentials;
import org.jclouds.domain.Location;
import org.jclouds.domain.LocationScope;
import org.jclouds.domain.internal.LocationImpl;
+import org.jclouds.json.Json;
+import org.jclouds.json.config.GsonModule;
import org.jclouds.slicehost.xml.ImageHandlerTest;
import org.testng.annotations.Test;
+import com.google.inject.Guice;
+
/**
* @author Adrian Cole
*/
@@ -43,20 +49,27 @@ public class SlicehostImageToImageTest {
@Test
public void test() throws UnknownHostException {
- assertEquals(convertImage(), new ImageBuilder().name("CentOS 5.2").operatingSystem(
- new OperatingSystemBuilder().family(OsFamily.CENTOS).version("5.2").description("CentOS 5.2").is64Bit(
- true).build()).description("CentOS 5.2").defaultCredentials(new Credentials("root", null)).ids(
- "2").build());
+ assertEquals(
+ convertImage(),
+ new ImageBuilder()
+ .name("CentOS 5.2")
+ .operatingSystem(
+ new OperatingSystemBuilder().family(OsFamily.CENTOS).version("5.2").description("CentOS 5.2")
+ .is64Bit(true).build()).description("CentOS 5.2")
+ .defaultCredentials(new Credentials("root", null)).ids("2").build());
}
@Test
public void test32() throws UnknownHostException {
- assertEquals(convertImage("/test_get_image32.xml"), new ImageBuilder().name("Ubuntu 10.10 (maverick) 32-bit")
- .operatingSystem(
- new OperatingSystemBuilder().family(OsFamily.UBUNTU).version("10.10").description(
- "Ubuntu 10.10 (maverick) 32-bit").build()).description(
- "Ubuntu 10.10 (maverick) 32-bit").defaultCredentials(new Credentials("root", null)).ids("70")
- .build());
+ assertEquals(
+ convertImage("/test_get_image32.xml"),
+ new ImageBuilder()
+ .name("Ubuntu 10.10 (maverick) 32-bit")
+ .operatingSystem(
+ new OperatingSystemBuilder().family(OsFamily.UBUNTU).version("10.10")
+ .description("Ubuntu 10.10 (maverick) 32-bit").build())
+ .description("Ubuntu 10.10 (maverick) 32-bit").defaultCredentials(new Credentials("root", null))
+ .ids("70").build());
}
public static Image convertImage() {
@@ -66,7 +79,10 @@ public class SlicehostImageToImageTest {
public static Image convertImage(String resource) {
org.jclouds.slicehost.domain.Image image = ImageHandlerTest.parseImage(resource);
- SlicehostImageToImage parser = new SlicehostImageToImage(new SlicehostImageToOperatingSystem());
+ SlicehostImageToImage parser = new SlicehostImageToImage(new SlicehostImageToOperatingSystem(
+ new BaseComputeServiceContextModule() {
+ }.provideOsVersionMap(new ComputeServiceConstants.ReferenceData(), Guice.createInjector(new GsonModule())
+ .getInstance(Json.class))));
return parser.apply(image);
}
diff --git a/vcloud/bluelock/pom.xml b/vcloud/bluelock/pom.xml
index 7a978a21c6..75c49003af 100644
--- a/vcloud/bluelock/pom.xml
+++ b/vcloud/bluelock/pom.xml
@@ -34,7 +34,7 @@
-
+ https://vcenterprise.bluelock.com/api1.0FIXME
@@ -95,8 +95,8 @@
${test.bluelock-vcdirector.credential}
- jclouds.compute.blacklist.nodes
- ${jclouds.compute.blacklist.nodes}
+ jclouds.compute.blacklist-nodes
+ ${jclouds.compute.blacklist-nodes}
diff --git a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java b/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java
index 5a216d0ead..6eebfa0a8e 100644
--- a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java
+++ b/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java
@@ -49,10 +49,10 @@ public class BlueLockVCloudDirectorComputeServiceLiveTest extends VCloudComputeS
@Test
public void testTemplateBuilder() {
Template defaultTemplate = client.templateBuilder().build();
- assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), false);
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
assert OperatingSystemPredicates.supportsApt().apply(defaultTemplate.getImage().getOperatingSystem());
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getDescription(), "Ubuntu Linux (32-bit)");
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getDescription(), "Ubuntu Linux (64-bit)");
assert defaultTemplate.getLocation().getId() != null : defaultTemplate.getLocation();
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
System.out.println(defaultTemplate.getHardware());
diff --git a/vcloud/core/pom.xml b/vcloud/core/pom.xml
index 3abc2e44cd..2a2b87a308 100644
--- a/vcloud/core/pom.xml
+++ b/vcloud/core/pom.xml
@@ -32,7 +32,7 @@
jclouds Core components to access vcloud
- trmkrun-ccc,test.trmk-924
+ trmkrun-ccc,test.trmk-924https://66.45.200.97/api1.0FIXME
@@ -91,8 +91,8 @@
${test.vcloud.credential}
- jclouds.compute.blacklist.nodes
- ${jclouds.compute.blacklist.nodes}
+ jclouds.compute.blacklist-nodes
+ ${jclouds.compute.blacklist-nodes}
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModule.java b/vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModule.java
index 16a2ba0a81..8d9ba099b6 100644
--- a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModule.java
+++ b/vcloud/core/src/main/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModule.java
@@ -20,6 +20,8 @@
package org.jclouds.vcloud.compute.config;
+import static org.jclouds.compute.domain.OsFamily.UBUNTU;
+
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.compute.config.BindComputeStrategiesByClass;
import org.jclouds.compute.config.BindComputeSuppliersByClass;
@@ -44,6 +46,7 @@ import org.jclouds.vcloud.domain.Org;
import org.jclouds.vcloud.domain.VApp;
import com.google.common.base.Function;
+import com.google.inject.Injector;
import com.google.inject.Scopes;
import com.google.inject.TypeLiteral;
@@ -79,7 +82,13 @@ public class VCloudComputeServiceContextModule extends CommonVCloudComputeServic
});
bind(PopulateDefaultLoginCredentialsForImageStrategy.class).to(GetLoginCredentialsFromGuestConfiguration.class);
}
-
+
+ //CIM ostype does not include version info
+ @Override
+ protected TemplateBuilder provideTemplate(Injector injector, TemplateBuilder template) {
+ return template.osFamily(UBUNTU).os64Bit(true);
+ }
+
@Override
public BindComputeStrategiesByClass defineComputeStrategyModule() {
return new VCloudBindComputeStrategiesByClass();
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVCloudExpressVAppTemplate.java b/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVCloudExpressVAppTemplate.java
index b6e6dd8ad7..1895b2cef5 100644
--- a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVCloudExpressVAppTemplate.java
+++ b/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVCloudExpressVAppTemplate.java
@@ -22,6 +22,7 @@ package org.jclouds.vcloud.compute.functions;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.compute.util.ComputeServiceUtils.parseOsFamilyOrNull;
+import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -31,7 +32,9 @@ import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.ImageBuilder;
import org.jclouds.compute.domain.OperatingSystem;
import org.jclouds.compute.domain.OperatingSystemBuilder;
+import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy;
+import org.jclouds.compute.util.ComputeServiceUtils;
import org.jclouds.vcloud.domain.ReferenceType;
import org.jclouds.vcloud.domain.VCloudExpressVAppTemplate;
@@ -45,9 +48,13 @@ public class ImageForVCloudExpressVAppTemplate implements Function> osVersionMap;
+
@Inject
protected ImageForVCloudExpressVAppTemplate(FindLocationForResource findLocationForResource,
- PopulateDefaultLoginCredentialsForImageStrategy credentialsProvider) {
+ PopulateDefaultLoginCredentialsForImageStrategy credentialsProvider,
+ Map> osVersionMap) {
+ this.osVersionMap = osVersionMap;
this.findLocationForResource = checkNotNull(findLocationForResource, "findLocationForResource");
this.credentialsProvider = checkNotNull(credentialsProvider, "credentialsProvider");
}
@@ -74,12 +81,13 @@ public class ImageForVCloudExpressVAppTemplate implements Function of(new Log4JLoggingModule()), overrides).getComputeService();
+ ImmutableSet. of(new Log4JLoggingModule()), overrides).getComputeService();
socketTester = new RetryablePredicate(new InetSocketAddressConnect(), 60, 1, TimeUnit.SECONDS);
sshFactory = Guice.createInjector(getSshModule()).getInstance(Factory.class);
}
@@ -128,7 +129,7 @@ public class VCloudGuestCustomizationLiveTest {
try {
ssh.connect();
- assertEquals(ssh.exec(PARSE_VMTOOLSD).getOutput(), script);
+ assertEquals(ssh.exec(PARSE_VMTOOLSD).getOutput(), script.replaceAll("\n", "\r\n"));
assertEquals(ssh.exec("cat /root/foo.txt").getOutput().trim(), "I love candy");
} finally {
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java b/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java
index 0908cf7c86..6ed6f83234 100644
--- a/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java
+++ b/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java
@@ -71,4 +71,15 @@ public class VCloudComputeServiceLiveTest extends BaseComputeServiceLiveTest {
}
}
+ @Test(enabled = true, dependsOnMethods = "testSuspendResume")
+ @Override
+ public void testGetNodesWithDetails() throws Exception {
+ super.testGetNodesWithDetails();
+ }
+
+ @Test(enabled = true, dependsOnMethods = { "testListNodes", "testGetNodesWithDetails" })
+ @Override
+ public void testDestroyNodes() {
+ super.testDestroyNodes();
+ }
}
\ No newline at end of file
diff --git a/vcloud/terremark/pom.xml b/vcloud/terremark/pom.xml
index 613d21b536..fe0ca133a4 100644
--- a/vcloud/terremark/pom.xml
+++ b/vcloud/terremark/pom.xml
@@ -32,7 +32,7 @@
jclouds Core components to access terremark
- trmkrun-ccc,test.trmk-924
+ trmkrun-ccc,test.trmk-924https://services.vcloudexpress.terremark.com/api0.8a-ext1.6FIXME
@@ -114,8 +114,8 @@
${test.trmk-ecloud.credential}
- jclouds.compute.blacklist.nodes
- ${jclouds.compute.blacklist.nodes}
+ jclouds.compute.blacklist-nodes
+ ${jclouds.compute.blacklist-nodes}
diff --git a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkECloudContextBuilder.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkECloudContextBuilder.java
index 0660dc110f..9b0d6a59b0 100644
--- a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkECloudContextBuilder.java
+++ b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkECloudContextBuilder.java
@@ -25,7 +25,7 @@ import java.util.Properties;
import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
import org.jclouds.logging.jdk.config.JDKLoggingModule;
import org.jclouds.vcloud.VCloudExpressContextBuilder;
-import org.jclouds.vcloud.terremark.compute.config.TerremarkVCloudComputeServiceContextModule;
+import org.jclouds.vcloud.terremark.compute.config.TerremarkECloudComputeServiceContextModule;
import org.jclouds.vcloud.terremark.config.TerremarkECloudRestClientModule;
import com.google.inject.Injector;
@@ -52,7 +52,7 @@ public class TerremarkECloudContextBuilder extends VCloudExpressContextBuilder {
@Override
protected void addContextModule(List modules) {
- modules.add(new TerremarkVCloudComputeServiceContextModule());
+ modules.add(new TerremarkECloudComputeServiceContextModule());
}
@Override
diff --git a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkECloudPropertiesBuilder.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkECloudPropertiesBuilder.java
index 9bec07eb52..547bdaf8f3 100644
--- a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkECloudPropertiesBuilder.java
+++ b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkECloudPropertiesBuilder.java
@@ -21,6 +21,7 @@ package org.jclouds.vcloud.terremark;
import static org.jclouds.Constants.PROPERTY_API_VERSION;
import static org.jclouds.Constants.PROPERTY_ENDPOINT;
+import static org.jclouds.vcloud.reference.VCloudConstants.PROPERTY_VCLOUD_TIMEOUT_TASK_COMPLETED;
import static org.jclouds.vcloud.terremark.reference.TerremarkConstants.PROPERTY_TERREMARK_EXTENSION_NAME;
import static org.jclouds.vcloud.terremark.reference.TerremarkConstants.PROPERTY_TERREMARK_EXTENSION_VERSION;
@@ -39,6 +40,8 @@ public class TerremarkECloudPropertiesBuilder extends TerremarkVCloudPropertiesB
properties.setProperty(PROPERTY_ENDPOINT, "https://services.enterprisecloud.terremark.com/api");
properties.setProperty(PROPERTY_TERREMARK_EXTENSION_NAME, "eCloudExtensions");
properties.setProperty(PROPERTY_TERREMARK_EXTENSION_VERSION, "2.5");
+ // for some reason the centos template is very slow to deploy
+ properties.setProperty(PROPERTY_VCLOUD_TIMEOUT_TASK_COMPLETED, 720l * 1000l + "");
return properties;
}
diff --git a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeClient.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeClient.java
index a812be12d8..d2d6658990 100644
--- a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeClient.java
+++ b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeClient.java
@@ -217,7 +217,7 @@ public class TerremarkVCloudComputeClient extends VCloudExpressComputeClientImpl
try {
client.deletePublicIp(address.getId());
logger.debug("<< deleted PublicIpAddress(%s)", address.getId());
- } catch (UnsupportedOperationException e) {
+ } catch (Exception e) {
logger.trace("cannot delete PublicIpAddress(%s) as it is unsupported", address.getId());
}
continue IPADDRESS;
diff --git a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/config/TerremarkECloudComputeServiceContextModule.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/config/TerremarkECloudComputeServiceContextModule.java
new file mode 100644
index 0000000000..1afcc45c64
--- /dev/null
+++ b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/config/TerremarkECloudComputeServiceContextModule.java
@@ -0,0 +1,39 @@
+/**
+ *
+ * Copyright (C) 2010 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.vcloud.terremark.compute.config;
+
+import static org.jclouds.compute.domain.OsFamily.CENTOS;
+
+import org.jclouds.compute.domain.TemplateBuilder;
+
+import com.google.inject.Injector;
+
+/**
+ * @author Adrian Cole
+ */
+public class TerremarkECloudComputeServiceContextModule extends TerremarkVCloudComputeServiceContextModule {
+
+ // as of 6-nov-2010 only centos has ssh key injection in the images.
+ // ssh key injection in ubuntu is targeted for dec-2010 or sooner
+ @Override
+ protected TemplateBuilder provideTemplate(Injector injector, TemplateBuilder template) {
+ return template.osFamily(CENTOS).os64Bit(true);
+ }
+}
diff --git a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/config/TerremarkVCloudComputeServiceContextModule.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/config/TerremarkVCloudComputeServiceContextModule.java
index 0d84ab905c..3f8397589b 100755
--- a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/config/TerremarkVCloudComputeServiceContextModule.java
+++ b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/compute/config/TerremarkVCloudComputeServiceContextModule.java
@@ -19,6 +19,8 @@
package org.jclouds.vcloud.terremark.compute.config;
+import static org.jclouds.compute.domain.OsFamily.UBUNTU;
+
import java.security.SecureRandom;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -30,6 +32,7 @@ import org.jclouds.compute.ComputeService;
import org.jclouds.compute.config.BindComputeStrategiesByClass;
import org.jclouds.compute.config.BindComputeSuppliersByClass;
import org.jclouds.compute.domain.NodeMetadata;
+import org.jclouds.compute.domain.TemplateBuilder;
import org.jclouds.compute.options.TemplateOptions;
import org.jclouds.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy;
import org.jclouds.vcloud.compute.VCloudExpressComputeClient;
@@ -46,6 +49,7 @@ import org.jclouds.vcloud.terremark.compute.strategy.ParseVAppTemplateDescriptio
import com.google.common.base.Function;
import com.google.common.base.Supplier;
+import com.google.inject.Injector;
import com.google.inject.Provides;
import com.google.inject.TypeLiteral;
@@ -69,6 +73,12 @@ public class TerremarkVCloudComputeServiceContextModule extends VCloudExpressCom
}
+ // prefer jeos as the copy time is much shorter
+ @Override
+ protected TemplateBuilder provideTemplate(Injector injector, TemplateBuilder template) {
+ return template.osFamily(UBUNTU).osDescriptionMatches(".*JeOS.*").os64Bit(true);
+ }
+
@Override
protected void configure() {
super.configure();
@@ -79,7 +89,7 @@ public class TerremarkVCloudComputeServiceContextModule extends VCloudExpressCom
bind(ComputeService.class).to(TerremarkVCloudComputeService.class);
bind(VCloudExpressComputeClient.class).to(TerremarkVCloudComputeClient.class);
bind(PopulateDefaultLoginCredentialsForImageStrategy.class).to(
- ParseVAppTemplateDescriptionToGetDefaultLoginCredentials.class);
+ ParseVAppTemplateDescriptionToGetDefaultLoginCredentials.class);
bind(SecureRandom.class).toInstance(new SecureRandom());
}
diff --git a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/handlers/ParseTerremarkVCloudErrorFromHttpResponse.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/handlers/ParseTerremarkVCloudErrorFromHttpResponse.java
index 40017c27b8..aac93990c8 100644
--- a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/handlers/ParseTerremarkVCloudErrorFromHttpResponse.java
+++ b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/handlers/ParseTerremarkVCloudErrorFromHttpResponse.java
@@ -57,8 +57,7 @@ public class ParseTerremarkVCloudErrorFromHttpResponse implements HttpErrorHandl
if (response.getMessage() != null
&& ((response.getMessage().indexOf("because there is a pending task running") != -1)
|| (response.getMessage().indexOf("because it is already powered off") != -1)
- || (response.getMessage().indexOf("already exists") != -1) || (response.getMessage()
- .indexOf("same name exists") != -1)))
+ || (response.getMessage().indexOf("exists") != -1)))
exception = new IllegalStateException(response.getMessage(), exception);
else
switch (response.getStatusCode()) {
diff --git a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkClientLiveTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkClientLiveTest.java
index 87b66edba2..738ba14e27 100644
--- a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkClientLiveTest.java
+++ b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkClientLiveTest.java
@@ -90,8 +90,8 @@ public abstract class TerremarkClientLiveTest extends VCloudExpressClientLiveTes
super.testCatalog();
}
- protected String expectedOs = "Ubuntu Linux (32-bit)";
- protected String itemName = "Ubuntu JeOS 9.10 (32-bit)";
+ protected String expectedOs = "Ubuntu Linux (64-bit)";
+ protected String itemName = "Ubuntu JeOS 9.10 (64-bit)";
protected TerremarkVCloudClient tmClient;
protected Factory sshFactory;
@@ -154,8 +154,8 @@ public abstract class TerremarkClientLiveTest extends VCloudExpressClientLiveTes
long hardDisk = 4194304;
// long hardDisk = 4194304 / 4 * 10;
- // String catalogOs = "CentOS 5.3 (32-bit)";
- // String expectedOs = "Red Hat Enterprise Linux 5 (32-bit)";
+ // String catalogOs = "CentOS 5.3 (64-bit)";
+ // String expectedOs = "Red Hat Enterprise Linux 5 (64-bit)";
// lookup the datacenter you are deploying into
vdc = tmClient.findVDCInOrgNamed(null, null);
diff --git a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkECloudComputeServiceLiveTestDisabled.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkECloudComputeServiceLiveTest.java
similarity index 89%
rename from vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkECloudComputeServiceLiveTestDisabled.java
rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkECloudComputeServiceLiveTest.java
index 9c1086b3f5..ea30431be5 100644
--- a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkECloudComputeServiceLiveTestDisabled.java
+++ b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkECloudComputeServiceLiveTest.java
@@ -44,9 +44,9 @@ import org.testng.annotations.Test;
*
* @author Adrian Cole
*/
-@Test(groups = "live", enabled = false, sequential = true, testName = "terremark.TerremarkVCloudComputeServiceLiveTest")
-public class TerremarkECloudComputeServiceLiveTestDisabled extends BaseComputeServiceLiveTest {
- public TerremarkECloudComputeServiceLiveTestDisabled() {
+@Test(groups = "live", enabled = true, sequential = true, testName = "terremark.TerremarkVCloudComputeServiceLiveTest")
+public class TerremarkECloudComputeServiceLiveTest extends BaseComputeServiceLiveTest {
+ public TerremarkECloudComputeServiceLiveTest() {
provider = "trmk-ecloud";
}
@@ -59,8 +59,8 @@ public class TerremarkECloudComputeServiceLiveTestDisabled extends BaseComputeSe
public void testTemplateBuilder() {
Template defaultTemplate = client.templateBuilder().build();
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04");
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "5.5");
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.CENTOS);
assert defaultTemplate.getLocation().getDescription() != null;// different per org
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
}
@@ -68,7 +68,7 @@ public class TerremarkECloudComputeServiceLiveTestDisabled extends BaseComputeSe
public void testAssignability() throws Exception {
@SuppressWarnings("unused")
RestContext tmContext = new ComputeServiceContextFactory()
- .createContext(provider, identity, credential).getProviderSpecificContext();
+ .createContext(provider, identity, credential).getProviderSpecificContext();
}
@Override
@@ -84,7 +84,7 @@ public class TerremarkECloudComputeServiceLiveTestDisabled extends BaseComputeSe
@Override
protected void checkOsMatchesTemplate(NodeMetadata node) {
if (node.getOperatingSystem() != null)
- assertEquals(node.getOperatingSystem().getFamily(), OsFamily.UNRECOGNIZED);
+ assertEquals(node.getOperatingSystem().getFamily(), null);
}
@Override
@@ -94,7 +94,7 @@ public class TerremarkECloudComputeServiceLiveTestDisabled extends BaseComputeSe
// image.getLocationId() can be null, if it is a location-free image
assertEquals(image.getType(), ComputeType.IMAGE);
if (image.getOperatingSystem().getFamily() != OsFamily.WINDOWS
- && image.getOperatingSystem().getFamily() != OsFamily.SOLARIS) {
+ && image.getOperatingSystem().getFamily() != OsFamily.SOLARIS) {
assert image.getDefaultCredentials() != null && image.getDefaultCredentials().identity != null : image;
assert image.getDefaultCredentials().credential != null : image;
}
@@ -110,7 +110,7 @@ public class TerremarkECloudComputeServiceLiveTestDisabled extends BaseComputeSe
NodeMetadata allData = client.getNodeMetadata(node.getId());
System.out.println(allData.getHardware());
RestContext tmContext = new ComputeServiceContextFactory()
- .createContext(provider, identity, credential).getProviderSpecificContext();
+ .createContext(provider, identity, credential).getProviderSpecificContext();
VCloudExpressVApp vApp = tmContext.getApi().findVAppInOrgVDCNamed(null, null, allData.getName());
assertEquals(vApp.getName(), allData.getName());
}
diff --git a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkECloudTemplateBuilderLiveTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkECloudTemplateBuilderLiveTest.java
new file mode 100644
index 0000000000..95845f31a0
--- /dev/null
+++ b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkECloudTemplateBuilderLiveTest.java
@@ -0,0 +1,71 @@
+/**
+ *
+ * Copyright (C) 2010 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.vcloud.terremark.compute;
+
+import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
+import static org.testng.Assert.assertEquals;
+
+import java.io.IOException;
+
+import org.jclouds.compute.BaseTemplateBuilderLiveTest;
+import org.jclouds.compute.OsFamilyVersion64Bit;
+import org.jclouds.compute.domain.OsFamily;
+import org.jclouds.compute.domain.Template;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Predicate;
+
+/**
+ *
+ * @author Adrian Cole
+ */
+@Test(groups = "live", testName = "terremark.TerremarkECloudTemplateBuilderLiveTest")
+public class TerremarkECloudTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
+
+ public TerremarkECloudTemplateBuilderLiveTest() {
+ provider = "trmk-ecloud";
+ }
+
+ @Override
+ protected Predicate defineUnsupportedOperatingSystems() {
+ return new Predicate() {
+
+ @Override
+ public boolean apply(OsFamilyVersion64Bit input) {
+ return ((input.family == OsFamily.RHEL) || //
+ (input.family == OsFamily.CENTOS && !input.version.equals("5.5")) || //
+ (input.family == OsFamily.UBUNTU &&( !input.version.equals("10.04")&&!input.version.equals("8.04"))) || //
+ (input.family == OsFamily.WINDOWS && (input.version.equals("2008 SP2") || input.version.equals("2008 R2"))));
+ }
+
+ };
+ }
+
+ @Test
+ public void testDefaultTemplateBuilder() throws IOException {
+ Template defaultTemplate = context.getComputeService().templateBuilder().build();
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "5.5");
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.CENTOS);
+ assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
+
+ }
+
+}
\ No newline at end of file
diff --git a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudExpressTemplateBuilderLiveTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudExpressTemplateBuilderLiveTest.java
index e138e298d2..514b15fac3 100644
--- a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudExpressTemplateBuilderLiveTest.java
+++ b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudExpressTemplateBuilderLiveTest.java
@@ -19,95 +19,52 @@
package org.jclouds.vcloud.terremark.compute;
-import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
import static org.testng.Assert.assertEquals;
import java.io.IOException;
-import java.util.Properties;
-import org.jclouds.Constants;
-import org.jclouds.compute.ComputeServiceContext;
-import org.jclouds.compute.ComputeServiceContextFactory;
+import org.jclouds.compute.BaseTemplateBuilderLiveTest;
+import org.jclouds.compute.OsFamilyVersion64Bit;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.domain.Template;
-import org.jclouds.logging.log4j.config.Log4JLoggingModule;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
+import com.google.common.base.Predicate;
/**
*
* @author Adrian Cole
*/
@Test(groups = "live", testName = "terremark.TerremarkVCloudExpressTemplateBuilderLiveTest")
-public class TerremarkVCloudExpressTemplateBuilderLiveTest {
- protected String provider = "trmk-vcloudexpress";
- protected String identity;
- protected String credential;
- protected String endpoint;
- protected String apiversion;
+public class TerremarkVCloudExpressTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
- @BeforeClass
- protected void setupCredentials() {
- identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider + ".identity");
- credential = System.getProperty("test." + provider + ".credential");
- endpoint = System.getProperty("test." + provider + ".endpoint");
- apiversion = System.getProperty("test." + provider + ".apiversion");
+ public TerremarkVCloudExpressTemplateBuilderLiveTest() {
+ provider = "trmk-vcloudexpress";
}
- protected Properties setupProperties() {
- Properties overrides = new Properties();
- overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true");
- overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true");
- overrides.setProperty(provider + ".identity", identity);
- if (credential != null)
- overrides.setProperty(provider + ".credential", credential);
- if (endpoint != null)
- overrides.setProperty(provider + ".endpoint", endpoint);
- if (apiversion != null)
- overrides.setProperty(provider + ".apiversion", apiversion);
- return overrides;
- }
+ @Override
+ protected Predicate defineUnsupportedOperatingSystems() {
+ return new Predicate() {
- @Test
- public void testTemplateBuilderCanUseImageId() {
- ComputeServiceContext newContext = null;
- try {
- newContext = new ComputeServiceContextFactory().createContext(provider, ImmutableSet
- . of(new Log4JLoggingModule()), setupProperties());
+ @Override
+ public boolean apply(OsFamilyVersion64Bit input) {
+ return ((input.family == OsFamily.RHEL || input.family == OsFamily.CENTOS) || //
+ (input.family == OsFamily.UBUNTU && !input.version.equals("9.10")) || //
+ (input.family == OsFamily.WINDOWS && (input.version.equals("2008 SP2") || input.version.equals("2008 R2"))));
+ }
- Template defaultTemplate = newContext.getComputeService().templateBuilder().build();
-
- Template template = newContext.getComputeService().templateBuilder().imageId(
- defaultTemplate.getImage().getId()).build();
- assertEquals(template, defaultTemplate);
-
- } finally {
- if (newContext != null)
- newContext.close();
- }
+ };
}
@Test
public void testDefaultTemplateBuilder() throws IOException {
- ComputeServiceContext newContext = null;
- try {
- newContext = new ComputeServiceContextFactory().createContext(provider, ImmutableSet
- . of(new Log4JLoggingModule()), setupProperties());
+ Template defaultTemplate = context.getComputeService().templateBuilder().build();
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "9.10");
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
+ assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
+ assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
- Template defaultTemplate = newContext.getComputeService().templateBuilder().build();
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), null);
- assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
- assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
- assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
-
- } finally {
- if (newContext != null)
- newContext.close();
- }
}
}
\ No newline at end of file
diff --git a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/handlers/ParseTerremarkVCloudErrorFromHttpResponseTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/handlers/ParseTerremarkVCloudErrorFromHttpResponseTest.java
index 19062050d9..1c1365a1cc 100644
--- a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/handlers/ParseTerremarkVCloudErrorFromHttpResponseTest.java
+++ b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/handlers/ParseTerremarkVCloudErrorFromHttpResponseTest.java
@@ -85,6 +85,13 @@ public class ParseTerremarkVCloudErrorFromHttpResponseTest extends BaseHttpError
IllegalStateException.class);
}
+ @Test
+ public void testKeyAlreadyExistsSetsIllegalStateException() {
+ assertCodeMakes("POST", URI.create("https://services.vcloudexpress.terremark.com/api/v0.8a-ext1.6/extensions/org/48/keys"), 400,
+ "Security key with name livetest exists.", "Security key with name livetest exists.",
+ IllegalStateException.class);
+ }
+
@Override
protected Class extends HttpErrorHandler> getHandlerClass() {
return ParseTerremarkVCloudErrorFromHttpResponse.class;