Issue 440: added apis/eucalyptus and providers/ecc-ec2

README.txt

@@ -29,11 +29,12 @@ data.
 our current version is 1.0-beta-8
 our dev version is 1.0-SNAPSHOT
  
-our compute api supports: aws-ec2, gogrid, cloudservers (rackspace), vcloud,
+our compute api supports: aws-ec2, gogrid, cloudservers (rackspace), vcloud (generic),
-                          trmk-ecloud, trmk-vcloudexpress, eucalyptus, cloudsigma,
+                          trmk-ecloud, trmk-vcloudexpress, eucalyptus (generic),
-                          elasticstack, bluelock-vclouddirector, slicehost,
+                          cloudsigma, elasticstack(generic), bluelock-vclouddirector,
-                          elastichosts-lon-p (Peer 1), elastichosts-sat-p (Peer 1),
+                          slicehost, ecc-ec2, elastichosts-lon-p (Peer 1), 
-                          elastichosts-lon-b (BlueSquare), stub (in-memory)
+                          elastichosts-sat-p (Peer 1), elastichosts-lon-b (BlueSquare),
+                          ec2 (generic), stub (in-memory)
 
   * note * the pom dependency org.jclouds/jclouds-allcompute gives you access to
            to all of these providers

allcompute/pom.xml

@@ -29,6 +29,11 @@
     <artifactId>jclouds-allcompute</artifactId>
     <name>allcompute</name>
     <dependencies>
+        <dependency>
+            <groupId>org.jclouds.provider</groupId>
+            <artifactId>ecc-ec2</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.jclouds.provider</groupId>
             <artifactId>aws-ec2</artifactId>

apis/eucalyptus/pom.xml

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+
+    ====================================================================
+    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.
+    ====================================================================
+
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4.0.0.xsd" >
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.jclouds</groupId>
+        <artifactId>jclouds-project</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../../project/pom.xml</relativePath>
+    </parent>
+    <groupId>org.jclouds.api</groupId>
+    <artifactId>eucalyptus</artifactId>
+    <name>jclouds Eucalyptus api</name>
+    <description>EC2 implementation based on Eucalyptus</description>
+
+    <properties>
+        <test.eucalyptus.endpoint>http://ecc.eucalyptus.com:8773/services/Eucalyptus</test.eucalyptus.endpoint>
+        <test.eucalyptus.apiversion>2010-06-15</test.eucalyptus.apiversion>
+        <test.eucalyptus.identity>${test.eucalyptus.identity}</test.eucalyptus.identity>
+        <test.eucalyptus.credential>${test.eucalyptus.credential}</test.eucalyptus.credential>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>ec2</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>ec2</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds</groupId>
+            <artifactId>jclouds-core</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds</groupId>
+            <artifactId>jclouds-compute</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds</groupId>
+            <artifactId>jclouds-jsch</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds</groupId>
+            <artifactId>jclouds-log4j</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.16</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>live</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>integration</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <systemProperties>
+                                        <property>
+                                            <name>test.eucalyptus.endpoint</name>
+                                            <value>${test.eucalyptus.endpoint}</value>
+                                        </property>
+                                        <property>
+                                            <name>test.eucalyptus.apiversion</name>
+                                            <value>${test.eucalyptus.apiversion}</value>
+                                        </property>
+                                        <property>
+                                            <name>test.eucalyptus.identity</name>
+                                            <value>${test.eucalyptus.identity}</value>
+                                        </property>
+                                        <property>
+                                            <name>test.eucalyptus.credential</name>
+                                            <value>${test.eucalyptus.credential}</value>
+                                        </property>
+                                    </systemProperties>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+
+</project>
+

apis/eucalyptus/src/main/java/org/jclouds/eucalyptus/EucalyptusPropertiesBuilder.java

@@ -17,15 +17,17 @@
  * ====================================================================
  */
 
-package org.jclouds.ec2;
+package org.jclouds.eucalyptus;
 
 import static org.jclouds.Constants.PROPERTY_ENDPOINT;
+import static org.jclouds.compute.reference.ComputeServiceConstants.PROPERTY_TIMEOUT_PORT_OPEN;
 import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_EC2_AMI_OWNERS;
 import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_EC2_CC_AMIs;
-import static org.jclouds.compute.reference.ComputeServiceConstants.PROPERTY_TIMEOUT_PORT_OPEN;
 
 import java.util.Properties;
 
+import org.jclouds.ec2.EC2PropertiesBuilder;
+
 /**
  * Builds properties used in Eucalyptus Clients
  * 

apis/eucalyptus/src/test/java/org/jclouds/eucalyptus/compute/EucalyptusComputeServiceLiveTest.java

@@ -17,31 +17,25 @@
  * ====================================================================
  */
 
-package org.jclouds.ec2.compute;
+package org.jclouds.eucalyptus.compute;
 
 import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
 import static org.testng.Assert.assertEquals;
 
 import org.jclouds.compute.domain.OsFamily;
 import org.jclouds.compute.domain.Template;
-import org.testng.annotations.BeforeClass;
+import org.jclouds.ec2.compute.EC2ComputeServiceLiveTest;
 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", enabled = true, sequential = true)
+@Test(groups = "live", sequential = true, testName = "EucalyptusComputeServiceLiveTest")
-public class EucalyptusComputeServiceLiveTestDisabled extends EC2ComputeServiceLiveTest {
+public class EucalyptusComputeServiceLiveTest extends EC2ComputeServiceLiveTest {
 
-   public EucalyptusComputeServiceLiveTestDisabled() {
+   public EucalyptusComputeServiceLiveTest() {
       provider = "eucalyptus";
-   }
-
-   @BeforeClass
-   @Override
-   public void setServiceDefaults() {
       // security groups must be <30 characters
       tag = "eu";
    }

apis/eucalyptus/src/test/java/org/jclouds/eucalyptus/compute/EucalyptusTemplateBuilderLiveTest.java

@@ -0,0 +1,76 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * 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.eucalyptus.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.domain.OsFamily;
+import org.jclouds.compute.domain.Template;
+import org.jclouds.compute.domain.os.OsFamilyVersion64Bit;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Predicate;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "live")
+public class EucalyptusTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
+
+   public EucalyptusTemplateBuilderLiveTest() {
+      provider = "eucalyptus";
+   }
+
+   @Override
+   protected Predicate<OsFamilyVersion64Bit> defineUnsupportedOperatingSystems() {
+      return new Predicate<OsFamilyVersion64Bit>() {
+
+         @Override
+         public boolean apply(OsFamilyVersion64Bit input) {
+            return input.family == OsFamily.RHEL || //
+                     (input.family == OsFamily.CENTOS && !input.version.equals("5.3") || !input.is64Bit) || //
+                     input.family == OsFamily.WINDOWS || //
+                     input.family == OsFamily.UBUNTU;
+
+         }
+
+      };
+   }
+
+   @Test
+   public void testDefaultTemplateBuilder() throws IOException {
+
+      Template defaultTemplate = context.getComputeService().templateBuilder().build();
+      assert (defaultTemplate.getImage().getProviderId().startsWith("emi-")) : defaultTemplate;
+      assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "5.3");
+      assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
+      assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.CENTOS);
+      assertEquals(defaultTemplate.getImage().getUserMetadata().get("rootDeviceType"), "instance-store");
+      assertEquals(defaultTemplate.getLocation().getId(), "Eucalyptus");
+      assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
+
+   }
+
+}

apis/pom.xml

@@ -41,5 +41,6 @@
        <module>simpledb</module>
        <module>cloudwatch</module>
        <module>walrus</module>
+       <module>eucalyptus</module>
     </modules>
 </project>

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

@@ -21,7 +21,7 @@
   "A clojure binding to the jclouds ComputeService.
 
 Current supported providers are:
-   [ec2, cloudservers, trmk-ecloud, trmk-vcloudexpress, vcloud,
+   [ec2, aws-ec2, ecc-ec2, cloudservers, trmk-ecloud, trmk-vcloudexpress, vcloud,
     bluelock, eucalyptus, slicehost, elastichosts-lon-p, elastichosts-sat-p,
     elastichosts, elastichosts-lon-b, cloudsigma, stub]
 

core/src/main/resources/rest.properties

@@ -90,7 +90,10 @@ vcloudexpress.contextbuilder=org.jclouds.vcloud.VCloudExpressContextBuilder
 vcloudexpress.propertiesbuilder=org.jclouds.vcloud.VCloudExpressPropertiesBuilder
 
 eucalyptus.contextbuilder=org.jclouds.ec2.EC2ContextBuilder
-eucalyptus.propertiesbuilder=org.jclouds.ec2.EucalyptusPropertiesBuilder
+eucalyptus.propertiesbuilder=org.jclouds.eucalyptus.EucalyptusPropertiesBuilder
+
+ecc-ec2.contextbuilder=org.jclouds.ec2.EC2ContextBuilder
+ecc-ec2.propertiesbuilder=org.jclouds.ecc.ECCEucalyptusPropertiesBuilder
 
 nova.contextbuilder=org.jclouds.ec2.EC2ContextBuilder
 nova.propertiesbuilder=org.jclouds.ec2.NovaPropertiesBuilder

providers/ecc-ec2/pom.xml

@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+
+    ====================================================================
+    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.
+    ====================================================================
+
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4.0.0.xsd" >
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.jclouds</groupId>
+        <artifactId>jclouds-project</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../../project/pom.xml</relativePath>
+    </parent>
+    <groupId>org.jclouds.provider</groupId>
+    <artifactId>ecc-ec2</artifactId>
+    <name>jclouds Eucalyptus Community Cloud EC2 provider</name>
+    <description>Eucalyptus (EC2) implementation targeted to the Eucalyptus Community Cloud</description>
+
+    <properties>
+        <test.ecc-ec2.endpoint>http://ecc.eucalyptus.com:8773/services/Eucalyptus</test.ecc-ec2.endpoint>
+        <test.ecc-ec2.apiversion>2010-06-15</test.ecc-ec2.apiversion>
+        <test.ecc-ec2.identity>${test.ecc-ec2.identity}</test.ecc-ec2.identity>
+        <test.ecc-ec2.credential>${test.ecc-ec2.credential}</test.ecc-ec2.credential>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>eucalyptus</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>ec2</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>eucalyptus</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>ec2</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds</groupId>
+            <artifactId>jclouds-compute</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds</groupId>
+            <artifactId>jclouds-core</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds</groupId>
+            <artifactId>jclouds-jsch</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jclouds</groupId>
+            <artifactId>jclouds-log4j</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.16</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>live</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>integration</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <systemProperties>
+                                        <property>
+                                            <name>test.ecc-ec2.endpoint</name>
+                                            <value>${test.ecc-ec2.endpoint}</value>
+                                        </property>
+                                        <property>
+                                            <name>test.ecc-ec2.apiversion</name>
+                                            <value>${test.ecc-ec2.apiversion}</value>
+                                        </property>
+                                        <property>
+                                            <name>test.ecc-ec2.identity</name>
+                                            <value>${test.ecc-ec2.identity}</value>
+                                        </property>
+                                        <property>
+                                            <name>test.ecc-ec2.credential</name>
+                                            <value>${test.ecc-ec2.credential}</value>
+                                        </property>
+                                    </systemProperties>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+
+</project>
+

providers/ecc-ec2/src/main/java/org/jclouds/ecc/ECCEucalyptusPropertiesBuilder.java

@@ -0,0 +1,45 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * 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.ecc;
+
+import static org.jclouds.Constants.PROPERTY_ENDPOINT;
+
+import java.util.Properties;
+
+import org.jclouds.eucalyptus.EucalyptusPropertiesBuilder;
+
+/**
+ * Builds properties used in ECCEucalyptus Clients
+ * 
+ * @author Adrian Cole
+ */
+public class ECCEucalyptusPropertiesBuilder extends EucalyptusPropertiesBuilder {
+   @Override
+   protected Properties defaultProperties() {
+      Properties properties = super.defaultProperties();
+      properties.setProperty(PROPERTY_ENDPOINT, "http://173.205.188.130:8773/services/Eucalyptus");
+      return properties;
+   }
+
+   public ECCEucalyptusPropertiesBuilder(Properties properties) {
+      super(properties);
+   }
+
+}

providers/ecc-ec2/src/test/java/org/jclouds/ecc/compute/ECCEucalyptusComputeServiceLiveTest.java

@@ -0,0 +1,63 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * 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.ecc.compute;
+
+import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
+import static org.testng.Assert.assertEquals;
+
+import org.jclouds.compute.domain.OsFamily;
+import org.jclouds.compute.domain.Template;
+import org.jclouds.ec2.compute.EC2ComputeServiceLiveTest;
+import org.testng.annotations.Test;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "live", sequential = true, testName = "ECCEucalyptusComputeServiceLiveTest")
+public class ECCEucalyptusComputeServiceLiveTest extends EC2ComputeServiceLiveTest {
+
+   public ECCEucalyptusComputeServiceLiveTest() {
+      provider = "ecc-ec2";
+      // security groups must be <30 characters
+      tag = "eu";
+   }
+
+   @Override
+   @Test(enabled = false)
+   public void testExtendedOptionsAndLogin() throws Exception {
+      // euc does not support monitoring
+   }
+
+   @Override
+   @Test(enabled = false)
+   public void testExtendedOptionsNoKeyPair() throws Exception {
+      // euc does not support multiple security groups
+   }
+
+   @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()), 1.0d);
+   }
+
+}

providers/ecc-ec2/src/test/java/org/jclouds/ecc/compute/ECCEucalyptusTemplateBuilderLiveTest.java

@@ -0,0 +1,76 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * 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.ecc.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.domain.OsFamily;
+import org.jclouds.compute.domain.Template;
+import org.jclouds.compute.domain.os.OsFamilyVersion64Bit;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Predicate;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "live")
+public class ECCEucalyptusTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
+
+   public ECCEucalyptusTemplateBuilderLiveTest() {
+      provider = "ecc-ec2";
+   }
+
+   @Override
+   protected Predicate<OsFamilyVersion64Bit> defineUnsupportedOperatingSystems() {
+      return new Predicate<OsFamilyVersion64Bit>() {
+
+         @Override
+         public boolean apply(OsFamilyVersion64Bit input) {
+            return input.family == OsFamily.RHEL || //
+                     (input.family == OsFamily.CENTOS && !input.version.equals("5.3") || !input.is64Bit) || //
+                     input.family == OsFamily.WINDOWS || //
+                     input.family == OsFamily.UBUNTU;
+
+         }
+
+      };
+   }
+
+   @Test
+   public void testDefaultTemplateBuilder() throws IOException {
+
+      Template defaultTemplate = context.getComputeService().templateBuilder().build();
+      assert (defaultTemplate.getImage().getProviderId().startsWith("emi-")) : defaultTemplate;
+      assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "5.3");
+      assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
+      assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.CENTOS);
+      assertEquals(defaultTemplate.getImage().getUserMetadata().get("rootDeviceType"), "instance-store");
+      assertEquals(defaultTemplate.getLocation().getId(), "Eucalyptus");
+      assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
+
+   }
+
+}

providers/pom.xml

@@ -43,5 +43,6 @@
         <module>googlestorage</module>
         <module>scaleup-storage</module>
         <module>ecc-s3</module>
+        <module>ecc-ec2</module>
     </modules>
 </project>