From 45da77073a2d475635c5d0642113a49dd96e0a98 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Wed, 5 Jan 2011 00:42:41 +0100 Subject: [PATCH] Issue 440: added ScaleUp Storage to provider group --- allblobstore/pom.xml | 5 + core/src/main/resources/rest.properties | 7 +- providers/pom.xml | 1 + providers/scaleup-storage/pom.xml | 143 ++++++++++++++++++ .../storage/ScaleUpStorageContextBuilder.java | 10 +- .../ScaleUpStoragePropertiesBuilder.java | 45 ++++++ .../ScaleUpStorageBlobStoreContextModule.java | 7 +- ...ScaleUpStorageAsyncClientTestDisabled.java | 37 +++++ .../storage/ScaleUpStorageClientLiveTest.java | 33 ++++ ...ScaleUpStorageBlobIntegrationLiveTest.java | 40 +++++ .../blobstore/ScaleUpStorageBlobLiveTest.java | 31 ++++ ...leUpStorageBlobMapIntegrationLiveTest.java | 31 ++++ .../ScaleUpStorageBlobSignerLiveTest.java | 32 ++++ ...UpStorageContainerIntegrationLiveTest.java | 31 ++++ .../ScaleUpStorageContainerLiveTest.java | 31 ++++ ...rageInputStreamMapIntegrationLiveTest.java | 31 ++++ ...leUpStorageServiceIntegrationLiveTest.java | 31 ++++ .../ScaleUpStorageTestInitializer.java | 51 +++++++ 18 files changed, 585 insertions(+), 12 deletions(-) create mode 100644 providers/scaleup-storage/pom.xml rename apis/s3/src/main/java/org/jclouds/s3/blobstore/ScaleUpCloudBlobStoreContextContextBuilder.java => providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStorageContextBuilder.java (76%) create mode 100644 providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStoragePropertiesBuilder.java rename apis/s3/src/main/java/org/jclouds/s3/blobstore/config/ScaleUpCloudBlobStoreContextModule.java => providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/blobstore/config/ScaleUpStorageBlobStoreContextModule.java (81%) create mode 100644 providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageAsyncClientTestDisabled.java create mode 100644 providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageClientLiveTest.java create mode 100644 providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobIntegrationLiveTest.java create mode 100644 providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobLiveTest.java create mode 100644 providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobMapIntegrationLiveTest.java create mode 100644 providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobSignerLiveTest.java create mode 100644 providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerIntegrationLiveTest.java create mode 100644 providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerLiveTest.java create mode 100644 providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageInputStreamMapIntegrationLiveTest.java create mode 100644 providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageServiceIntegrationLiveTest.java create mode 100644 providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageTestInitializer.java diff --git a/allblobstore/pom.xml b/allblobstore/pom.xml index caeb0c5d05..37e67c0f9b 100644 --- a/allblobstore/pom.xml +++ b/allblobstore/pom.xml @@ -44,6 +44,11 @@ googlestorage ${project.version} + + org.jclouds.provider + scaleup-storage + ${project.version} + ${project.groupId} jclouds-azure diff --git a/core/src/main/resources/rest.properties b/core/src/main/resources/rest.properties index 3ee4123637..dbf64ac9ca 100644 --- a/core/src/main/resources/rest.properties +++ b/core/src/main/resources/rest.properties @@ -157,11 +157,10 @@ walrus.contextbuilder=org.jclouds.s3.S3ContextBuilder walrus.propertiesbuilder=org.jclouds.s3.WalrusPropertiesBuilder googlestorage.contextbuilder=org.jclouds.s3.S3ContextBuilder -googlestorage.propertiesbuilder=org.jclouds.s3.GoogleStoragePropertiesBuilder +googlestorage.propertiesbuilder=org.jclouds.googlestorage.GoogleStoragePropertiesBuilder -scaleup-storage.contextbuilder=org.jclouds.s3.blobstore.ScaleUpCloudBlobStoreContextContextBuilder -scaleup-storage.propertiesbuilder=org.jclouds.s3.S3PropertiesBuilder -scaleup-storage.endpoint=https://scs.scaleupstorage.com +scaleup-storage.contextbuilder=org.jclouds.scaleup.storage.ScaleUpStorageContextBuilder +scaleup-storage.propertiesbuilder=org.jclouds.scaleup.storage.ScaleUpStoragePropertiesBuilder transient.contextbuilder=org.jclouds.blobstore.TransientBlobStoreContextBuilder transient.propertiesbuilder=org.jclouds.blobstore.TransientBlobStorePropertiesBuilder diff --git a/providers/pom.xml b/providers/pom.xml index 57f49f6283..a3a20ef5c1 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -40,5 +40,6 @@ aws-elb aws-s3 googlestorage + scaleup-storage diff --git a/providers/scaleup-storage/pom.xml b/providers/scaleup-storage/pom.xml new file mode 100644 index 0000000000..e8b0ac1dc5 --- /dev/null +++ b/providers/scaleup-storage/pom.xml @@ -0,0 +1,143 @@ + + + + + 4.0.0 + + org.jclouds.provider + jclouds-providers-project + 1.0-SNAPSHOT + ../pom.xml + + scaleup-storage + jclouds ScaleUp Cloud Storage provider + Simple Storage Service (S3) implementation targeted to ScaleUp Cloud Storage + + + org.jclouds.scaleup.storage.blobstore.ScaleUpStorageTestInitializer + https://scs.scaleupstorage.com + 2006-03-01 + ${test.scaleup-storage.identity} + ${test.scaleup-storage.credential} + + + + + org.jclouds.api + s3 + ${project.version} + jar + + + org.jclouds.api + s3 + ${project.version} + test-jar + test + + + org.jclouds + jclouds-core + ${project.version} + test-jar + test + + + org.jclouds + jclouds-blobstore + ${project.version} + test-jar + test + + + org.jclouds + jclouds-log4j + ${project.version} + test + + + log4j + log4j + 1.2.16 + test + + + + + + live + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration + integration-test + + test + + + + + test.scaleup-storage.endpoint + ${test.scaleup-storage.endpoint} + + + test.scaleup-storage.apiversion + ${test.scaleup-storage.apiversion} + + + test.scaleup-storage.identity + ${test.scaleup-storage.identity} + + + test.scaleup-storage.credential + ${test.scaleup-storage.credential} + + + test.initializer + ${test.initializer} + + + jclouds.blobstore.httpstream.url + ${jclouds.blobstore.httpstream.url} + + + jclouds.blobstore.httpstream.md5 + ${jclouds.blobstore.httpstream.md5} + + + + + + + + + + + + + + diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/ScaleUpCloudBlobStoreContextContextBuilder.java b/providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStorageContextBuilder.java similarity index 76% rename from apis/s3/src/main/java/org/jclouds/s3/blobstore/ScaleUpCloudBlobStoreContextContextBuilder.java rename to providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStorageContextBuilder.java index c162705549..9182aa0650 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/ScaleUpCloudBlobStoreContextContextBuilder.java +++ b/providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStorageContextBuilder.java @@ -17,13 +17,13 @@ * ==================================================================== */ -package org.jclouds.s3.blobstore; +package org.jclouds.scaleup.storage; import java.util.List; import java.util.Properties; import org.jclouds.s3.S3ContextBuilder; -import org.jclouds.s3.blobstore.config.ScaleUpCloudBlobStoreContextModule; +import org.jclouds.scaleup.storage.blobstore.config.ScaleUpStorageBlobStoreContextModule; import com.google.inject.Module; @@ -31,15 +31,15 @@ import com.google.inject.Module; * * @author Adrian Cole */ -public class ScaleUpCloudBlobStoreContextContextBuilder extends S3ContextBuilder { +public class ScaleUpStorageContextBuilder extends S3ContextBuilder { - public ScaleUpCloudBlobStoreContextContextBuilder(Properties props) { + public ScaleUpStorageContextBuilder(Properties props) { super(props); } @Override protected void addContextModule(List modules) { - modules.add(new ScaleUpCloudBlobStoreContextModule()); + modules.add(new ScaleUpStorageBlobStoreContextModule()); } } diff --git a/providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStoragePropertiesBuilder.java b/providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStoragePropertiesBuilder.java new file mode 100644 index 0000000000..ebfdd1ec37 --- /dev/null +++ b/providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/ScaleUpStoragePropertiesBuilder.java @@ -0,0 +1,45 @@ +/** + * + * 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.scaleup.storage; + +import static org.jclouds.Constants.PROPERTY_ENDPOINT; + +import java.util.Properties; + +import org.jclouds.s3.S3PropertiesBuilder; + +/** + * Builds properties used in Google Storage + * + * @author Adrian Cole + */ +public class ScaleUpStoragePropertiesBuilder extends S3PropertiesBuilder { + @Override + protected Properties defaultProperties() { + Properties properties = super.defaultProperties(); + properties.setProperty(PROPERTY_ENDPOINT, "https://scs.scaleupstorage.com"); + return properties; + } + + public ScaleUpStoragePropertiesBuilder(Properties properties) { + super(properties); + } + +} diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/config/ScaleUpCloudBlobStoreContextModule.java b/providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/blobstore/config/ScaleUpStorageBlobStoreContextModule.java similarity index 81% rename from apis/s3/src/main/java/org/jclouds/s3/blobstore/config/ScaleUpCloudBlobStoreContextModule.java rename to providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/blobstore/config/ScaleUpStorageBlobStoreContextModule.java index 23c628e6c7..dc5c4dba85 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/config/ScaleUpCloudBlobStoreContextModule.java +++ b/providers/scaleup-storage/src/main/java/org/jclouds/scaleup/storage/blobstore/config/ScaleUpStorageBlobStoreContextModule.java @@ -17,8 +17,9 @@ * ==================================================================== */ -package org.jclouds.s3.blobstore.config; +package org.jclouds.scaleup.storage.blobstore.config; +import org.jclouds.s3.blobstore.config.S3BlobStoreContextModule; import org.jclouds.s3.domain.BucketMetadata; import org.jclouds.domain.Location; @@ -30,8 +31,8 @@ import com.google.inject.TypeLiteral; * * @author Adrian Cole */ -public class ScaleUpCloudBlobStoreContextModule extends S3BlobStoreContextModule { - +public class ScaleUpStorageBlobStoreContextModule extends S3BlobStoreContextModule { + // TODO: this is really a scality concern that is coupled to all installations of theirs @SuppressWarnings({ "rawtypes", "unchecked" }) @Override protected void bindBucketLocationStrategy() { diff --git a/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageAsyncClientTestDisabled.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageAsyncClientTestDisabled.java new file mode 100644 index 0000000000..d70a578b5e --- /dev/null +++ b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageAsyncClientTestDisabled.java @@ -0,0 +1,37 @@ +/** + * + * 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.scaleup.storage; + +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 = "ScaleUpStorageAsyncClientTest") +public class ScaleUpStorageAsyncClientTestDisabled extends org.jclouds.s3.S3AsyncClientTest { + + public ScaleUpStorageAsyncClientTestDisabled() { + this.provider = "scaleup-storage"; + this.url = "commondatastorage.googleapis.com"; + } + + // TODO parameterize this test so that it can pass +} diff --git a/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageClientLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageClientLiveTest.java new file mode 100644 index 0000000000..12e755b6d7 --- /dev/null +++ b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/ScaleUpStorageClientLiveTest.java @@ -0,0 +1,33 @@ +/** + * + * 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.scaleup.storage; + +import org.jclouds.s3.S3ClientLiveTest; +import org.testng.annotations.Test; + +/** + * Tests behavior of {@code S3Client} + * + * @author Adrian Cole + */ +@Test(groups = "live", sequential = true, testName = "ScaleUpStorageClientLiveTest") +public class ScaleUpStorageClientLiveTest extends S3ClientLiveTest { + +} diff --git a/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobIntegrationLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobIntegrationLiveTest.java new file mode 100644 index 0000000000..ddbcee6b4b --- /dev/null +++ b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobIntegrationLiveTest.java @@ -0,0 +1,40 @@ +/** + * + * 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.scaleup.storage.blobstore; + +import java.io.IOException; +import java.util.concurrent.ExecutionException; + +import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = "live", testName = "ScaleUpStorageBlobIntegrationLiveTest") +public class ScaleUpStorageBlobIntegrationLiveTest extends BaseBlobIntegrationTest { + + @Override + @Test(expectedExceptions = IllegalArgumentException.class) + public void testPutObjectStream() throws InterruptedException, IOException, ExecutionException { + super.testPutObjectStream(); + } + +} diff --git a/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobLiveTest.java new file mode 100644 index 0000000000..e13169620a --- /dev/null +++ b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobLiveTest.java @@ -0,0 +1,31 @@ +/** + * + * 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.scaleup.storage.blobstore; + +import org.jclouds.blobstore.integration.internal.BaseBlobLiveTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = "live", testName = "ScaleUpStorageBlobLiveTest") +public class ScaleUpStorageBlobLiveTest extends BaseBlobLiveTest { + +} diff --git a/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobMapIntegrationLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobMapIntegrationLiveTest.java new file mode 100644 index 0000000000..3ee4e14324 --- /dev/null +++ b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobMapIntegrationLiveTest.java @@ -0,0 +1,31 @@ +/** + * + * 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.scaleup.storage.blobstore; + +import org.jclouds.blobstore.integration.internal.BaseBlobMapIntegrationTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = "live", testName = "ScaleUpStorageBlobMapIntegrationLiveTest") +public class ScaleUpStorageBlobMapIntegrationLiveTest extends BaseBlobMapIntegrationTest { + +} diff --git a/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobSignerLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobSignerLiveTest.java new file mode 100644 index 0000000000..a1e2ecab6a --- /dev/null +++ b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageBlobSignerLiveTest.java @@ -0,0 +1,32 @@ +/** + * + * 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.scaleup.storage.blobstore; + +import org.jclouds.blobstore.integration.internal.BaseBlobSignerLiveTest; +import org.testng.annotations.Test; + +/** + * + * @author Adrian Cole + */ +@Test(groups = "live", testName = "ScaleUpStorageBlobSignerLiveTest") +public class ScaleUpStorageBlobSignerLiveTest extends BaseBlobSignerLiveTest { + +} diff --git a/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerIntegrationLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerIntegrationLiveTest.java new file mode 100644 index 0000000000..71df0db888 --- /dev/null +++ b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerIntegrationLiveTest.java @@ -0,0 +1,31 @@ +/** + * + * 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.scaleup.storage.blobstore; + +import org.jclouds.blobstore.integration.internal.BaseContainerIntegrationTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = "live", testName = "ScaleUpStorageContainerIntegrationLiveTest") +public class ScaleUpStorageContainerIntegrationLiveTest extends BaseContainerIntegrationTest { + +} diff --git a/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerLiveTest.java new file mode 100644 index 0000000000..20b0037ecd --- /dev/null +++ b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageContainerLiveTest.java @@ -0,0 +1,31 @@ +/** + * + * 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.scaleup.storage.blobstore; + +import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = "live", testName = "ScaleUpStorageContainerLiveTest") +public class ScaleUpStorageContainerLiveTest extends BaseContainerLiveTest { + +} diff --git a/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageInputStreamMapIntegrationLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageInputStreamMapIntegrationLiveTest.java new file mode 100644 index 0000000000..fded443de9 --- /dev/null +++ b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageInputStreamMapIntegrationLiveTest.java @@ -0,0 +1,31 @@ +/** + * + * 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.scaleup.storage.blobstore; + +import org.jclouds.blobstore.integration.internal.BaseInputStreamMapIntegrationTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = "live", testName = "ScaleUpStorageInputStreamMapIntegrationLiveTest") +public class ScaleUpStorageInputStreamMapIntegrationLiveTest extends BaseInputStreamMapIntegrationTest { + +} diff --git a/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageServiceIntegrationLiveTest.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageServiceIntegrationLiveTest.java new file mode 100644 index 0000000000..c3cbd476d7 --- /dev/null +++ b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageServiceIntegrationLiveTest.java @@ -0,0 +1,31 @@ +/** + * + * 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.scaleup.storage.blobstore; + +import org.jclouds.blobstore.integration.internal.BaseServiceIntegrationTest; +import org.testng.annotations.Test; + +/** + * @author Adrian Cole + */ +@Test(groups = "live", testName = "ScaleUpStorageServiceIntegrationLiveTest") +public class ScaleUpStorageServiceIntegrationLiveTest extends BaseServiceIntegrationTest { + +} diff --git a/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageTestInitializer.java b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageTestInitializer.java new file mode 100644 index 0000000000..5f67e95bbe --- /dev/null +++ b/providers/scaleup-storage/src/test/java/org/jclouds/scaleup/storage/blobstore/ScaleUpStorageTestInitializer.java @@ -0,0 +1,51 @@ +/** + * + * 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.scaleup.storage.blobstore; + +import java.io.IOException; + +import org.jclouds.blobstore.BlobStoreContext; +import org.jclouds.blobstore.BlobStoreContextFactory; +import org.jclouds.blobstore.integration.TransientBlobStoreTestInitializer; +import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest; +import org.jclouds.logging.log4j.config.Log4JLoggingModule; + +import com.google.common.collect.ImmutableSet; +import com.google.inject.Module; + +/** + * + * @author Adrian Cole + */ +public class ScaleUpStorageTestInitializer extends TransientBlobStoreTestInitializer { + + public ScaleUpStorageTestInitializer() { + provider = "scaleup-storage"; + BaseBlobStoreIntegrationTest.SANITY_CHECK_RETURNED_BUCKET_NAME = true; + } + + @Override + protected BlobStoreContext createLiveContext(Module configurationModule, String endpoint, String apiversion, + String app, String identity, String credential) throws IOException { + return new BlobStoreContextFactory().createContext(provider, ImmutableSet.of(configurationModule, + new Log4JLoggingModule()), setupProperties(endpoint, apiversion, identity, credential)); + } + +}