Issue 427:support deltacloud endpoints

README.txt

@@ -10,7 +10,7 @@ data.
 our current version is 1.0-beta-9b
 our dev version is 1.0-SNAPSHOT
  
-our compute api supports: aws-ec2, gogrid, cloudservers-us, stub (in-memory),
+our compute api supports: aws-ec2, gogrid, cloudservers-us, stub (in-memory), deltacloud,
                           cloudservers-uk, vcloud (generic), ec2 (generic), byon,
                           trmk-ecloud, trmk-vcloudexpress, eucalyptus (generic),
                           cloudsigma-zrh, elasticstack(generic), bluelock-vclouddirector,

allcompute/pom.xml

@@ -34,6 +34,11 @@
             <artifactId>eucalyptus-partnercloud-ec2</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>deltacloud</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.jclouds.provider</groupId>
             <artifactId>aws-ec2</artifactId>

apis/deltacloud/src/test/java/org/jclouds/deltacloud/compute/DeltacloudComputeServiceLiveTest.java

@@ -59,7 +59,7 @@ public class DeltacloudComputeServiceLiveTest extends BaseComputeServiceLiveTest
    protected void checkNodes(Iterable<? extends NodeMetadata> nodes, String tag) throws IOException {
       super.checkNodes(nodes, tag);
       for (NodeMetadata node : nodes) {
-         assertEquals(node.getLocation().getScope(), LocationScope.HOST);
+         assertEquals(node.getLocation().getScope(), LocationScope.ZONE);
       }
    }
 

apis/pom.xml

@@ -37,6 +37,7 @@
        <module>byon</module>
        <module>s3</module>
        <module>ec2</module>
+       <module>deltacloud</module>
        <module>walrus</module>
        <module>scality-rs2</module>
        <module>eucalyptus</module>

compute/src/main/clojure/org/jclouds/compute.clj

@@ -25,7 +25,7 @@ Current supported providers are:
     cloudservers-uk, cloudservers-us, byon, cloudsigma-zrh, stub,
     trmk-ecloud, trmk-vcloudexpress, vcloud, bluelock, eucalyptus,
     slicehost, elastichosts-lon-p, elastichosts-sat-p, elastichosts,
-    openhosting-east1, serverlove-z1-man, skalicloud-sdg-my]
+    openhosting-east1, serverlove-z1-man, skalicloud-sdg-my, deltacloud]
 
 Here's an example of getting some compute configuration from rackspace:
 

compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java

@@ -35,8 +35,8 @@ import static org.jclouds.compute.options.TemplateOptions.Builder.blockOnComplet
 import static org.jclouds.compute.options.TemplateOptions.Builder.overrideCredentialsWith;
 import static org.jclouds.compute.predicates.NodePredicates.TERMINATED;
 import static org.jclouds.compute.predicates.NodePredicates.all;
-import static org.jclouds.compute.predicates.NodePredicates.runningInGroup;
 import static org.jclouds.compute.predicates.NodePredicates.inGroup;
+import static org.jclouds.compute.predicates.NodePredicates.runningInGroup;
 import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
@@ -64,7 +64,6 @@ import org.jclouds.compute.domain.Image;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.domain.NodeState;
 import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.compute.domain.OperatingSystemBuilder;
 import org.jclouds.compute.domain.OsFamily;
 import org.jclouds.compute.domain.Template;
 import org.jclouds.compute.domain.TemplateBuilder;
@@ -207,7 +206,7 @@ public abstract class BaseComputeServiceLiveTest {
 
    @Test(enabled = true, expectedExceptions = NoSuchElementException.class)
    public void testCorrectExceptionRunningNodesNotFound() throws Exception {
-      client.runScriptOnNodesMatching(runningInGroup("zebras-are-awesome"), buildScript(new OperatingSystemBuilder()
+      client.runScriptOnNodesMatching(runningInGroup("zebras-are-awesome"), buildScript(new OperatingSystem.Builder()
                .family(OsFamily.UBUNTU).description("ffoo").build()));
    }
 

compute/src/test/java/org/jclouds/compute/RunScriptData.java

@@ -76,9 +76,9 @@ public class RunScriptData {
                envVariables,
                ImmutableList.<Statement> of(new AuthorizeRSAPublicKey(publicKey),//
                         installJavaAndCurl(os),//
-                        authorizePortInIpTables(8080),//
+                        authorizePortInIpTables(8080),
                         extractTargzIntoDirectory(URI.create(System.getProperty("test.jboss-url",
-                                 "http://d19xvfg065k8li.cloudfront.net/jboss-6.0.0.Final.tar.gz")), "/usr/local"),//
+                                 "http://d37gkgjhl3prlk.cloudfront.net/jboss-6.0.0.Final.tar.gz")), "/usr/local"),//
                         exec("{md} " + jbossHome), exec("mv /usr/local/jboss-*/* " + jbossHome),//
                         exec("chmod -R oug+r+w " + jbossHome)),//
                ImmutableList

compute/src/test/resources/initscript_with_jboss.sh

@@ -72,7 +72,7 @@ END_OF_FILE
    iptables -I INPUT 1 -p tcp --dport 8080 -j ACCEPT
    iptables -I RH-Firewall-1-INPUT 1 -p tcp --dport 8080 -j ACCEPT
    iptables-save
-   curl -X GET -s --retry 20  http://d19xvfg065k8li.cloudfront.net/jboss-6.0.0.Final.tar.gz |(mkdir -p /usr/local &&cd /usr/local &&tar -xpzf -)
+   curl -X GET -s --retry 20  http://d37gkgjhl3prlk.cloudfront.net/jboss-6.0.0.Final.tar.gz |(mkdir -p /usr/local &&cd /usr/local &&tar -xpzf -)
    mkdir -p /usr/local/jboss
    mv /usr/local/jboss-*/* /usr/local/jboss
    chmod -R oug+r+w /usr/local/jboss