Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

switched to use eucalyptus partnercloud as community cloud hasn't enough resources to complete testing

This commit is contained in:
Adrian Cole 2011-01-24 08:12:14 -08:00
parent 90bf1b3d07
commit a5211f523e
24 changed files with 99 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.txt
View File

@ -33,7 +33,7 @@ our compute api supports: aws-ec2, gogrid, cloudservers (generic), cloudservers-
cloudservers-uk, vcloud (generic), ec2 (generic),
trmk-ecloud, trmk-vcloudexpress, eucalyptus (generic),
cloudsigma, elasticstack(generic), bluelock-vclouddirector,
slicehost, ecc-ec2, elastichosts-lon-p (Peer 1),
slicehost, eucalyptus-partnercloud-ec2, elastichosts-lon-p (Peer 1),
elastichosts-sat-p (Peer 1), elastichosts-lon-b (BlueSquare),
openhosting-east1, serverlove-z1-man, skalicloud-sdg-my,
vcloudexpress (generic), stub (in-memory)
@ -44,8 +44,8 @@ our compute api supports: aws-ec2, gogrid, cloudservers (generic), cloudservers-
our blobstore api supports: aws-s3, cloudfiles (generic), cloudfiles-us, cloudfiles-uk,
azureblob, atmos (generic), synaptic-storage,
cloudonestorage, s3 (generic), walrus(generic), googlestorage,
scaleup-storage, ecc-s3, swift (generic), transient (in-mem),
filesystem (on-disk)
scaleup-storage, eucalyptus-partnercloud-s3, swift (generic),
transient (in-mem), filesystem (on-disk)
* note * the pom dependency org.jclouds/jclouds-allblobstore gives you access to
to all of these providers

2
allblobstore/pom.xml
View File

@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>org.jclouds.provider</groupId>
<artifactId>ecc-s3</artifactId>
<artifactId>eucalyptus-partnercloud-s3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

2
allcompute/pom.xml
View File

@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.jclouds.provider</groupId>
<artifactId>ecc-ec2</artifactId>
<artifactId>eucalyptus-partnercloud-ec2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

4
blobstore/src/main/clojure/org/jclouds/blobstore.clj
View File

@ -22,8 +22,8 @@
Current supported services are:
[transient, filesystem, s3, azureblob, atmos, cloudfiles, walrus,
googlestorage, synaptic, peer1-storage, aws-s3, ecc-s3, cloudfiles-us,
cloudfiles-uki, swift]
googlestorage, synaptic, peer1-storage, aws-s3, eucalyptus-partnercloud-s3,
cloudfiles-us, cloudfiles-uk, swift]
Here's a quick example of how to viewresources in rackspace

3
compute/src/main/clojure/org/jclouds/compute.clj
View File

@ -21,7 +21,8 @@
"A clojure binding to the jclouds ComputeService.
Current supported providers are:
[ec2, aws-ec2, ecc-ec2, cloudservers, cloudservers-uk, cloudservers-us,
[ec2, aws-ec2, eucualyptus-partnercloud-ec2, cloudservers,
cloudservers-uk, cloudservers-us,
trmk-ecloud, trmk-vcloudexpress, vcloud, bluelock, eucalyptus,
slicehost, elastichosts-lon-p, elastichosts-sat-p, elastichosts,
openhosting-east1, serverlove-z1-man, skalicloud-sdg-my,

8
core/src/main/resources/rest.properties
View File

@ -92,8 +92,8 @@ vcloudexpress.propertiesbuilder=org.jclouds.vcloud.VCloudExpressPropertiesBuilde
eucalyptus.contextbuilder=org.jclouds.ec2.EC2ContextBuilder
eucalyptus.propertiesbuilder=org.jclouds.eucalyptus.EucalyptusPropertiesBuilder
ecc-ec2.contextbuilder=org.jclouds.ec2.EC2ContextBuilder
ecc-ec2.propertiesbuilder=org.jclouds.ecc.ECCEucalyptusPropertiesBuilder
eucalyptus-partnercloud-ec2.contextbuilder=org.jclouds.ec2.EC2ContextBuilder
eucalyptus-partnercloud-ec2.propertiesbuilder=org.jclouds.epc.EucalyptusPartnerCloudEucalyptusPropertiesBuilder
nova-ec2.contextbuilder=org.jclouds.ec2.EC2ContextBuilder
nova-ec2.propertiesbuilder=org.jclouds.nova.ec2.NovaEC2PropertiesBuilder
@ -174,8 +174,8 @@ cloudfiles-uk.propertiesbuilder=org.jclouds.rackspace.cloudfiles.CloudFilesUKPro
walrus.contextbuilder=org.jclouds.s3.S3ContextBuilder
walrus.propertiesbuilder=org.jclouds.walrus.WalrusPropertiesBuilder
ecc-s3.contextbuilder=org.jclouds.s3.S3ContextBuilder
ecc-s3.propertiesbuilder=org.jclouds.ecc.ECCWalrusPropertiesBuilder
eucalyptus-partnercloud-s3.contextbuilder=org.jclouds.s3.S3ContextBuilder
eucalyptus-partnercloud-s3.propertiesbuilder=org.jclouds.ecc.EucalyptusPartnerCloudWalrusPropertiesBuilder
googlestorage.contextbuilder=org.jclouds.s3.S3ContextBuilder
googlestorage.propertiesbuilder=org.jclouds.googlestorage.GoogleStoragePropertiesBuilder

30
providers/ecc-ec2/pom.xml → providers/eucalyptus-partnercloud-ec2/pom.xml
View File

@ -30,15 +30,15 @@
<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>
<artifactId>eucalyptus-partnercloud-ec2</artifactId>
<name>jclouds Eucalyptus Partner Cloud EC2 provider</name>
<description>Eucalyptus (EC2) implementation targeted to the Eucalyptus Partner 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>FIXME_IDENTITY</test.ecc-ec2.identity>
<test.ecc-ec2.credential>FIXME_CREDENTIAL</test.ecc-ec2.credential>
<test.eucalyptus-partnercloud-ec2.endpoint>http://partnercloud.eucalyptus.com:8773/services/Eucalyptus</test.eucalyptus-partnercloud-ec2.endpoint>
<test.eucalyptus-partnercloud-ec2.apiversion>2010-06-15</test.eucalyptus-partnercloud-ec2.apiversion>
<test.eucalyptus-partnercloud-ec2.identity>FIXME_IDENTITY</test.eucalyptus-partnercloud-ec2.identity>
<test.eucalyptus-partnercloud-ec2.credential>FIXME_CREDENTIAL</test.eucalyptus-partnercloud-ec2.credential>
</properties>
<dependencies>
@ -118,20 +118,20 @@
<configuration>
<systemProperties>
<property>
<name>test.ecc-ec2.endpoint</name>
<value>${test.ecc-ec2.endpoint}</value>
<name>test.eucalyptus-partnercloud-ec2.endpoint</name>
<value>${test.eucalyptus-partnercloud-ec2.endpoint}</value>
</property>
<property>
<name>test.ecc-ec2.apiversion</name>
<value>${test.ecc-ec2.apiversion}</value>
<name>test.eucalyptus-partnercloud-ec2.apiversion</name>
<value>${test.eucalyptus-partnercloud-ec2.apiversion}</value>
</property>
<property>
<name>test.ecc-ec2.identity</name>
<value>${test.ecc-ec2.identity}</value>
<name>test.eucalyptus-partnercloud-ec2.identity</name>
<value>${test.eucalyptus-partnercloud-ec2.identity}</value>
</property>
<property>
<name>test.ecc-ec2.credential</name>
<value>${test.ecc-ec2.credential}</value>
<name>test.eucalyptus-partnercloud-ec2.credential</name>
<value>${test.eucalyptus-partnercloud-ec2.credential}</value>
</property>
</systemProperties>
</configuration>

10
providers/ecc-ec2/src/main/java/org/jclouds/ecc/ECCEucalyptusPropertiesBuilder.java → providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/eucalyptuspartnercloud/EucalyptusPartnerCloudEucalyptusPropertiesBuilder.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.ecc;
package org.jclouds.epc;
import static org.jclouds.Constants.PROPERTY_ENDPOINT;
@ -26,19 +26,19 @@ import java.util.Properties;
import org.jclouds.eucalyptus.EucalyptusPropertiesBuilder;
/**
* Builds properties used in ECCEucalyptus Clients
* Builds properties used in EucalyptusPartnerCloudEucalyptus Clients
*
* @author Adrian Cole
*/
public class ECCEucalyptusPropertiesBuilder extends EucalyptusPropertiesBuilder {
public class EucalyptusPartnerCloudEucalyptusPropertiesBuilder extends EucalyptusPropertiesBuilder {
@Override
protected Properties defaultProperties() {
Properties properties = super.defaultProperties();
properties.setProperty(PROPERTY_ENDPOINT, "http://173.205.188.130:8773/services/Eucalyptus");
properties.setProperty(PROPERTY_ENDPOINT, "http://partnercloud.eucalyptus.com:8773/services/Eucalyptus");
return properties;
}
public ECCEucalyptusPropertiesBuilder(Properties properties) {
public EucalyptusPartnerCloudEucalyptusPropertiesBuilder(Properties properties) {
super(properties);
}

10
providers/ecc-ec2/src/test/java/org/jclouds/ecc/compute/ECCEucalyptusComputeServiceLiveTest.java → providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/eucalyptuspartnercloud/compute/EucalyptusPartnerCloudEucalyptusComputeServiceLiveTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.ecc.compute;
package org.jclouds.epc.compute;
import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
import static org.testng.Assert.assertEquals;
@ -31,11 +31,11 @@ import org.testng.annotations.Test;
*
* @author Adrian Cole
*/
@Test(groups = "live", sequential = true, testName = "ECCEucalyptusComputeServiceLiveTest")
public class ECCEucalyptusComputeServiceLiveTest extends EC2ComputeServiceLiveTest {
@Test(groups = "live", sequential = true, testName = "EucalyptusPartnerCloudEucalyptusComputeServiceLiveTest")
public class EucalyptusPartnerCloudEucalyptusComputeServiceLiveTest extends EC2ComputeServiceLiveTest {
public ECCEucalyptusComputeServiceLiveTest() {
provider = "ecc-ec2";
public EucalyptusPartnerCloudEucalyptusComputeServiceLiveTest() {
provider = "eucalyptus-partnercloud-ec2";
// security groups must be <30 characters
tag = "eu";
}

8
providers/ecc-ec2/src/test/java/org/jclouds/ecc/compute/ECCEucalyptusTemplateBuilderLiveTest.java → providers/eucalyptus-partnercloud-ec2/src/test/java/org/jclouds/eucalyptuspartnercloud/compute/EucalyptusPartnerCloudEucalyptusTemplateBuilderLiveTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.ecc.compute;
package org.jclouds.epc.compute;
import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
import static org.testng.Assert.assertEquals;
@ -37,10 +37,10 @@ import com.google.common.base.Predicate;
* @author Adrian Cole
*/
@Test(groups = "live")
public class ECCEucalyptusTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
public class EucalyptusPartnerCloudEucalyptusTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
public ECCEucalyptusTemplateBuilderLiveTest() {
provider = "ecc-ec2";
public EucalyptusPartnerCloudEucalyptusTemplateBuilderLiveTest() {
provider = "eucalyptus-partnercloud-ec2";
}
@Override

32
providers/ecc-s3/pom.xml → providers/eucalyptus-partnercloud-s3/pom.xml
View File

@ -30,16 +30,16 @@
<relativePath>../../project/pom.xml</relativePath>
</parent>
<groupId>org.jclouds.provider</groupId>
<artifactId>ecc-s3</artifactId>
<name>jclouds Eucalyptus Community Cloud provider</name>
<description>Walrus (S3) implementation targeted to the Eucalyptus Community Cloud</description>
<artifactId>eucalyptus-partnercloud-s3</artifactId>
<name>jclouds Eucalyptus Partner Cloud provider</name>
<description>Walrus (S3) implementation targeted to the Eucalyptus Partner Cloud</description>
<properties>
<test.initializer>org.jclouds.ecc.blobstore.ECCWalrusTestInitializer</test.initializer>
<test.ecc-s3.endpoint>http://ecc.eucalyptus.com:8773/services/Walrus</test.ecc-s3.endpoint>
<test.ecc-s3.apiversion>2006-03-01</test.ecc-s3.apiversion>
<test.ecc-s3.identity>${test.eucalyptus.identity}</test.ecc-s3.identity>
<test.ecc-s3.credential>${test.eucalyptus.credential}</test.ecc-s3.credential>
<test.initializer>org.jclouds.epc.blobstore.EucalyptusPartnerCloudWalrusTestInitializer</test.initializer>
<test.eucalyptus-partnercloud-s3.endpoint>http://partnercloud.eucalyptus.com:8773/services/Walrus</test.eucalyptus-partnercloud-s3.endpoint>
<test.eucalyptus-partnercloud-s3.apiversion>2006-03-01</test.eucalyptus-partnercloud-s3.apiversion>
<test.eucalyptus-partnercloud-s3.identity>FIXME_IDENTITY</test.eucalyptus-partnercloud-s3.identity>
<test.eucalyptus-partnercloud-s3.credential>FIXME_CREDENTIAL</test.eucalyptus-partnercloud-s3.credential>
</properties>
<dependencies>
@ -109,20 +109,20 @@
<configuration>
<systemProperties>
<property>
<name>test.ecc-s3.endpoint</name>
<value>${test.ecc-s3.endpoint}</value>
<name>test.eucalyptus-partnercloud-s3.endpoint</name>
<value>${test.eucalyptus-partnercloud-s3.endpoint}</value>
</property>
<property>
<name>test.ecc-s3.apiversion</name>
<value>${test.ecc-s3.apiversion}</value>
<name>test.eucalyptus-partnercloud-s3.apiversion</name>
<value>${test.eucalyptus-partnercloud-s3.apiversion}</value>
</property>
<property>
<name>test.ecc-s3.identity</name>
<value>${test.ecc-s3.identity}</value>
<name>test.eucalyptus-partnercloud-s3.identity</name>
<value>${test.eucalyptus-partnercloud-s3.identity}</value>
</property>
<property>
<name>test.ecc-s3.credential</name>
<value>${test.ecc-s3.credential}</value>
<name>test.eucalyptus-partnercloud-s3.credential</name>
<value>${test.eucalyptus-partnercloud-s3.credential}</value>
</property>
<property>
<name>test.initializer</name>

10
providers/ecc-s3/src/main/java/org/jclouds/ecc/ECCWalrusPropertiesBuilder.java → providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/eucalyptuspartnercloud/EucalyptusPartnerCloudWalrusPropertiesBuilder.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.ecc;
package org.jclouds.epc;
import static org.jclouds.Constants.PROPERTY_ENDPOINT;
@ -26,19 +26,19 @@ import java.util.Properties;
import org.jclouds.walrus.WalrusPropertiesBuilder;
/**
* Builds properties used in ECCWalrus Clients
* Builds properties used in EucalyptusPartnerCloudWalrus Clients
*
* @author Adrian Cole
*/
public class ECCWalrusPropertiesBuilder extends WalrusPropertiesBuilder {
public class EucalyptusPartnerCloudWalrusPropertiesBuilder extends WalrusPropertiesBuilder {
@Override
protected Properties defaultProperties() {
Properties properties = super.defaultProperties();
properties.setProperty(PROPERTY_ENDPOINT, "http://ecc.eucalyptus.com:8773/services/Walrus");
properties.setProperty(PROPERTY_ENDPOINT, "http://partnercloud.eucalyptus.com:8773/services/Walrus");
return properties;
}
public ECCWalrusPropertiesBuilder(Properties properties) {
public EucalyptusPartnerCloudWalrusPropertiesBuilder(Properties properties) {
super(properties);
}

8
providers/ecc-s3/src/test/java/org/jclouds/ecc/ECCWalrusAsyncClientTestDisabled.java → providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/EucalyptusPartnerCloudWalrusAsyncClientTestDisabled.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.ecc;
package org.jclouds.epc;
import org.testng.annotations.Test;
@ -25,10 +25,10 @@ import org.testng.annotations.Test;
* @author Adrian Cole
*/
// NOTE:without testName, this will not call @Before* and fail w/NPE during surefire
@Test(enabled = false, groups = "unit", testName = "ECCWalrusAsyncClientTest")
public class ECCWalrusAsyncClientTestDisabled extends org.jclouds.walrus.WalrusAsyncClientTestDisabled {
@Test(enabled = false, groups = "unit", testName = "EucalyptusPartnerCloudWalrusAsyncClientTest")
public class EucalyptusPartnerCloudWalrusAsyncClientTestDisabled extends org.jclouds.walrus.WalrusAsyncClientTestDisabled {
public ECCWalrusAsyncClientTestDisabled() {
public EucalyptusPartnerCloudWalrusAsyncClientTestDisabled() {
this.provider = "ecc";
this.url = "commondatastorage.googleapis.com";
}

6
providers/ecc-s3/src/test/java/org/jclouds/ecc/ECCWalrusClientLiveTest.java → providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/EucalyptusPartnerCloudWalrusClientLiveTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.ecc;
package org.jclouds.epc;
import org.jclouds.walrus.WalrusClientLiveTest;
import org.testng.annotations.Test;
@ -27,7 +27,7 @@ import org.testng.annotations.Test;
*
* @author Adrian Cole
*/
@Test(groups = "live", sequential = true, testName = "ECCWalrusClientLiveTest")
public class ECCWalrusClientLiveTest extends WalrusClientLiveTest {
@Test(groups = "live", sequential = true, testName = "EucalyptusPartnerCloudWalrusClientLiveTest")
public class EucalyptusPartnerCloudWalrusClientLiveTest extends WalrusClientLiveTest {
}

6
providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobIntegrationLiveTest.java → providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusBlobIntegrationLiveTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.ecc.blobstore;
package org.jclouds.epc.blobstore;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
@ -28,8 +28,8 @@ import org.testng.annotations.Test;
/**
* @author Adrian Cole
*/
@Test(groups = "live", testName = "ECCWalrusBlobIntegrationLiveTest")
public class ECCWalrusBlobIntegrationLiveTest extends BaseBlobIntegrationTest {
@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusBlobIntegrationLiveTest")
public class EucalyptusPartnerCloudWalrusBlobIntegrationLiveTest extends BaseBlobIntegrationTest {
@Override
@Test(expectedExceptions = IllegalArgumentException.class)

6
providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobLiveTest.java → providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusBlobLiveTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.ecc.blobstore;
package org.jclouds.epc.blobstore;
import org.jclouds.blobstore.integration.internal.BaseBlobLiveTest;
import org.testng.annotations.Test;
@ -25,7 +25,7 @@ import org.testng.annotations.Test;
/**
* @author Adrian Cole
*/
@Test(groups = "live", testName = "ECCWalrusBlobLiveTest")
public class ECCWalrusBlobLiveTest extends BaseBlobLiveTest {
@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusBlobLiveTest")
public class EucalyptusPartnerCloudWalrusBlobLiveTest extends BaseBlobLiveTest {
}

6
providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobMapIntegrationLiveTest.java → providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusBlobMapIntegrationLiveTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.ecc.blobstore;
package org.jclouds.epc.blobstore;
import org.jclouds.blobstore.integration.internal.BaseBlobMapIntegrationTest;
import org.testng.annotations.Test;
@ -25,7 +25,7 @@ import org.testng.annotations.Test;
/**
* @author Adrian Cole
*/
@Test(groups = "live", testName = "ECCWalrusBlobMapIntegrationLiveTest")
public class ECCWalrusBlobMapIntegrationLiveTest extends BaseBlobMapIntegrationTest {
@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusBlobMapIntegrationLiveTest")
public class EucalyptusPartnerCloudWalrusBlobMapIntegrationLiveTest extends BaseBlobMapIntegrationTest {
}

6
providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusBlobSignerLiveTest.java → providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusBlobSignerLiveTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.ecc.blobstore;
package org.jclouds.epc.blobstore;
import org.jclouds.blobstore.integration.internal.BaseBlobSignerLiveTest;
import org.testng.annotations.Test;
@ -26,7 +26,7 @@ import org.testng.annotations.Test;
*
* @author Adrian Cole
*/
@Test(groups = "live", testName = "ECCWalrusBlobSignerLiveTest")
public class ECCWalrusBlobSignerLiveTest extends BaseBlobSignerLiveTest {
@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusBlobSignerLiveTest")
public class EucalyptusPartnerCloudWalrusBlobSignerLiveTest extends BaseBlobSignerLiveTest {
}

6
providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusContainerIntegrationLiveTest.java → providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusContainerIntegrationLiveTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.ecc.blobstore;
package org.jclouds.epc.blobstore;
import org.jclouds.blobstore.integration.internal.BaseContainerIntegrationTest;
import org.testng.annotations.Test;
@ -25,7 +25,7 @@ import org.testng.annotations.Test;
/**
* @author Adrian Cole
*/
@Test(groups = "live", testName = "ECCWalrusContainerIntegrationLiveTest")
public class ECCWalrusContainerIntegrationLiveTest extends BaseContainerIntegrationTest {
@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusContainerIntegrationLiveTest")
public class EucalyptusPartnerCloudWalrusContainerIntegrationLiveTest extends BaseContainerIntegrationTest {
}

6
providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusContainerLiveTest.java → providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusContainerLiveTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.ecc.blobstore;
package org.jclouds.epc.blobstore;
import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest;
import org.testng.annotations.Test;
@ -25,7 +25,7 @@ import org.testng.annotations.Test;
/**
* @author Adrian Cole
*/
@Test(groups = "live", testName = "ECCWalrusContainerLiveTest")
public class ECCWalrusContainerLiveTest extends BaseContainerLiveTest {
@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusContainerLiveTest")
public class EucalyptusPartnerCloudWalrusContainerLiveTest extends BaseContainerLiveTest {
}

6
providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusInputStreamMapIntegrationLiveTest.java → providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusInputStreamMapIntegrationLiveTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.ecc.blobstore;
package org.jclouds.epc.blobstore;
import org.jclouds.blobstore.integration.internal.BaseInputStreamMapIntegrationTest;
import org.testng.annotations.Test;
@ -25,7 +25,7 @@ import org.testng.annotations.Test;
/**
* @author Adrian Cole
*/
@Test(groups = "live", testName = "ECCWalrusInputStreamMapIntegrationLiveTest")
public class ECCWalrusInputStreamMapIntegrationLiveTest extends BaseInputStreamMapIntegrationTest {
@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusInputStreamMapIntegrationLiveTest")
public class EucalyptusPartnerCloudWalrusInputStreamMapIntegrationLiveTest extends BaseInputStreamMapIntegrationTest {
}

6
providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusServiceIntegrationLiveTest.java → providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusServiceIntegrationLiveTest.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.ecc.blobstore;
package org.jclouds.epc.blobstore;
import org.jclouds.blobstore.integration.internal.BaseServiceIntegrationTest;
import org.testng.annotations.Test;
@ -25,7 +25,7 @@ import org.testng.annotations.Test;
/**
* @author Adrian Cole
*/
@Test(groups = "live", testName = "ECCWalrusServiceIntegrationLiveTest")
public class ECCWalrusServiceIntegrationLiveTest extends BaseServiceIntegrationTest {
@Test(groups = "live", testName = "EucalyptusPartnerCloudWalrusServiceIntegrationLiveTest")
public class EucalyptusPartnerCloudWalrusServiceIntegrationLiveTest extends BaseServiceIntegrationTest {
}

6
providers/ecc-s3/src/test/java/org/jclouds/ecc/blobstore/ECCWalrusTestInitializer.java → providers/eucalyptus-partnercloud-s3/src/test/java/org/jclouds/eucalyptuspartnercloud/blobstore/EucalyptusPartnerCloudWalrusTestInitializer.java
View File

@ -17,7 +17,7 @@
* ====================================================================
*/
package org.jclouds.ecc.blobstore;
package org.jclouds.epc.blobstore;
import java.io.IOException;
@ -34,9 +34,9 @@ import com.google.inject.Module;
*
* @author Adrian Cole
*/
public class ECCWalrusTestInitializer extends TransientBlobStoreTestInitializer {
public class EucalyptusPartnerCloudWalrusTestInitializer extends TransientBlobStoreTestInitializer {
public ECCWalrusTestInitializer() {
public EucalyptusPartnerCloudWalrusTestInitializer() {
provider = "ecc-s3";
BaseBlobStoreIntegrationTest.SANITY_CHECK_RETURNED_BUCKET_NAME = true;
}

4
providers/pom.xml
View File

@ -44,8 +44,8 @@
<module>scaleup-storage</module>
<module>synaptic-storage</module>
<module>cloudonestorage</module>
<module>ecc-s3</module>
<module>ecc-ec2</module>
<module>eucalyptus-partnercloud-s3</module>
<module>eucalyptus-partnercloud-ec2</module>
<module>cloudservers-us</module>
<module>cloudservers-uk</module>
<module>cloudfiles-us</module>