Merge remote branch 'origin'

Conflicts: core/src/main/resources/rest.properties demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/SpringServletConfig.java rimuhosting/pom.xml
francescomapelli · Nov 8, 2010 · c97a3e8 · c97a3e8
2 parents 81c954c + 4dbcbfc
commit c97a3e8
Show file tree

Hide file tree

Showing 112 changed files with 3,707 additions and 991 deletions.
diff --git 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
@@ -36,6 +36,10 @@
         <test.atmosonline.apiversion>1.3.0</test.atmosonline.apiversion>
         <test.atmosonline.identity>FIXME</test.atmosonline.identity>
         <test.atmosonline.credential>FIXME</test.atmosonline.credential>
+        <test.peer1-storage.endpoint>https://cloudonestorage.peer1.com</test.peer1-storage.endpoint>
+        <test.peer1-storage.apiversion>1.3.0</test.peer1-storage.apiversion>
+        <test.peer1-storage.identity>FIXME</test.peer1-storage.identity>
+        <test.peer1-storage.credential>FIXME</test.peer1-storage.credential>
         <test.synaptic.endpoint>https://storage.synaptic.att.com</test.synaptic.endpoint>
         <test.synaptic.apiversion>1.3.0</test.synaptic.apiversion>
         <test.synaptic.identity>FIXME</test.synaptic.identity>
@@ -107,6 +111,22 @@
                                             <name>test.atmosonline.credential</name>
                                             <value>${test.atmosonline.credential}</value>
                                         </property>
+                                        <property>
+                                            <name>test.peer1-storage.endpoint</name>
+                                            <value>${test.peer1-storage.endpoint}</value>
+                                        </property>
+                                        <property>
+                                            <name>test.peer1-storage.apiversion</name>
+                                            <value>${test.peer1-storage.apiversion}</value>
+                                        </property>
+                                        <property>
+                                            <name>test.peer1-storage.identity</name>
+                                            <value>${test.peer1-storage.identity}</value>
+                                        </property>
+                                        <property>
+                                            <name>test.peer1-storage.credential</name>
+                                            <value>${test.peer1-storage.credential}</value>
+                                        </property>
                                         <property>
                                             <name>test.synaptic.endpoint</name>
                                             <value>${test.synaptic.endpoint}</value>

diff --git 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.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 @@ ListenableFuture<BoundedSet<? extends DirectoryEntry>> listDirectory(
    @POST
    @Path("/{directoryName}/")
    @ExceptionParser(ReturnEndpointIfAlreadyExists.class)
+   @Produces(MediaType.APPLICATION_OCTET_STREAM)
    @Consumes(MediaType.WILDCARD)
    ListenableFuture<URI> 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
@@ -148,7 +148,7 @@ private void appendCanonicalizedHeaders(HttpRequest request, StringBuilder toSig
       // TreeSet == Sort the headers alphabetically.
       Set<String> headers = new TreeSet<String>(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
@@ -140,7 +140,7 @@ public void testCreateDirectory() throws SecurityException, NoSuchMethodExceptio
 
       assertRequestLineEquals(request, "POST https://accesspoint.atmosonline.com/rest/namespace/dir/ HTTP/1.1");
       assertNonPayloadHeadersEqual(request, HttpHeaders.ACCEPT + ": */*\n");
-      assertPayloadEquals(request, null, null, false);
+      assertPayloadEquals(request, "", "application/octet-stream", false);
 
       assertResponseParserClassEquals(method, request, ParseURIFromListOrLocationHeaderIf20x.class);
       assertSaxResponseParserClassEquals(method, null);

diff --git a/aws/core/src/main/java/org/jclouds/aws/domain/Region.java b/aws/core/src/main/java/org/jclouds/aws/domain/Region.java
@@ -42,6 +42,8 @@ public class Region {
     * consistency for PUTS of new objects in your Amazon S3 bucket and eventual
     * consistency for overwrite PUTS and DELETES.
     */
+   public static final String EU = "EU";
+
    public static final String EU_WEST_1 = "eu-west-1";
 
    /**
@@ -85,8 +87,8 @@ public class Region {
     */
    public static final String AP_SOUTHEAST_1 = "ap-southeast-1";
 
-   public static Set<String> ALL_S3 = ImmutableSet.of("EU", US_STANDARD,
-         US_EAST_1, US_WEST_1, AP_SOUTHEAST_1);
+   public static Set<String> ALL_S3 = ImmutableSet.of(EU, US_STANDARD,
+          US_WEST_1, AP_SOUTHEAST_1);
    public static Set<String> ALL_SQS = ImmutableSet.of(EU_WEST_1, US_STANDARD,
          US_EAST_1, US_WEST_1, AP_SOUTHEAST_1);
 }
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
@@ -26,6 +26,7 @@
 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 @@ protected Properties defaultProperties() {
       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
@@ -24,8 +24,8 @@
 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.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<String, Credentials> credentialStore,
-            @Memoized Supplier<Set<? extends Image>> images, @Memoized Supplier<Set<? extends Hardware>> sizes,
-            @Memoized Supplier<Set<? extends Location>> locations, ListNodesStrategy listNodesStrategy,
-            GetNodeMetadataStrategy getNodeMetadataStrategy, RunNodesAndAddToSetStrategy runNodesAndAddToSetStrategy,
-            RebootNodeStrategy rebootNodeStrategy, DestroyNodeStrategy destroyNodeStrategy,
-            ResumeNodeStrategy startNodeStrategy, SuspendNodeStrategy stopNodeStrategy,
-            Provider<TemplateBuilder> templateBuilderProvider, Provider<TemplateOptions> templateOptionsProvider,
-            @Named("NODE_RUNNING") Predicate<NodeMetadata> nodeRunning,
-            @Named("NODE_TERMINATED") Predicate<NodeMetadata> nodeTerminated,
-            @Named("NODE_SUSPENDED") Predicate<NodeMetadata> nodeSuspended, ComputeUtils utils, Timeouts timeouts,
-            @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor, EC2Client ec2Client,
-            Map<RegionAndName, KeyPair> credentialsMap, @Named("SECURITY") Map<RegionAndName, String> securityGroupMap,
-            @Named("PLACEMENT") Map<RegionAndName, String> placementGroupMap,
-            @Named("DELETED") Predicate<PlacementGroup> placementGroupDeleted) {
+         @Memoized Supplier<Set<? extends Image>> images, @Memoized Supplier<Set<? extends Hardware>> sizes,
+         @Memoized Supplier<Set<? extends Location>> locations, ListNodesStrategy listNodesStrategy,
+         GetNodeMetadataStrategy getNodeMetadataStrategy, RunNodesAndAddToSetStrategy runNodesAndAddToSetStrategy,
+         RebootNodeStrategy rebootNodeStrategy, DestroyNodeStrategy destroyNodeStrategy,
+         ResumeNodeStrategy startNodeStrategy, SuspendNodeStrategy stopNodeStrategy,
+         Provider<TemplateBuilder> templateBuilderProvider, Provider<TemplateOptions> templateOptionsProvider,
+         @Named("NODE_RUNNING") Predicate<NodeMetadata> nodeRunning,
+         @Named("NODE_TERMINATED") Predicate<NodeMetadata> nodeTerminated,
+         @Named("NODE_SUSPENDED") Predicate<NodeMetadata> nodeSuspended, ComputeUtils utils, Timeouts timeouts,
+         @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor, EC2Client ec2Client,
+         Map<RegionAndName, KeyPair> credentialsMap, @Named("SECURITY") Map<RegionAndName, String> securityGroupMap,
+         @Named("PLACEMENT") Map<RegionAndName, String> placementGroupMap,
+         @Named("DELETED") Predicate<PlacementGroup> 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 @@ protected EC2ComputeService(ComputeServiceContext context, Map<String, Credentia
    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/...core/src/main/java/org/jclouds/aws/ec2/compute/config/EC2ComputeServiceContextModule.java b/...core/src/main/java/org/jclouds/aws/ec2/compute/config/EC2ComputeServiceContextModule.java
@@ -22,7 +22,6 @@
 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 @@ protected void configure() {
    @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);
+      if ("ec2".equals(provider))
+         return template.osFamily(AMZN_LINUX).os64Bit(true);
       else if ("nova".equals(provider))
-         return template.osFamily(UBUNTU);
+         return super.provideTemplate(injector, template);
       else
-         return template.osFamily(AMZN_LINUX).os64Bit(true);
+         return template.osFamily(CENTOS);
    }
 
    @Provides