From 1d95d299d80d7b13b3277c138e2fcbb5eddebf69 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Tue, 30 Sep 2014 15:43:01 -0700 Subject: [PATCH] JCLOUDS-735 Remove ninefold providers. --- allblobstore/pom.xml | 5 - allcompute/pom.xml | 5 - providers/ninefold-compute/pom.xml | 126 ------------------ .../NinefoldComputeProviderMetadata.java | 86 ------------ .../org.jclouds.providers.ProviderMetadata | 1 - .../compute/NinefoldComputeProviderTest.java | 33 ----- .../NinefoldComputeServiceLiveTest.java | 28 ---- ...inefoldComputeTemplateBuilderLiveTest.java | 91 ------------- providers/ninefold-storage/pom.xml | 120 ----------------- .../NinefoldStorageProviderMetadata.java | 79 ----------- .../org.jclouds.providers.ProviderMetadata | 1 - .../NinefoldStorageAsyncClientTest.java | 29 ---- .../NinefoldStorageClientLiveTest.java | 30 ----- .../storage/NinefoldStorageProviderTest.java | 33 ----- ...inefoldStorageBlobIntegrationLiveTest.java | 28 ---- .../NinefoldStorageBlobLiveTest.java | 28 ---- .../NinefoldStorageBlobSignerLiveTest.java | 28 ---- ...ldStorageContainerIntegrationLiveTest.java | 28 ---- .../NinefoldStorageContainerLiveTest.java | 28 ---- ...foldStorageServiceIntegrationLiveTest.java | 37 ----- providers/pom.xml | 2 - 21 files changed, 846 deletions(-) delete mode 100644 providers/ninefold-compute/pom.xml delete mode 100644 providers/ninefold-compute/src/main/java/org/jclouds/ninefold/compute/NinefoldComputeProviderMetadata.java delete mode 100644 providers/ninefold-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata delete mode 100644 providers/ninefold-compute/src/test/java/org/jclouds/ninefold/compute/NinefoldComputeProviderTest.java delete mode 100644 providers/ninefold-compute/src/test/java/org/jclouds/ninefold/compute/compute/NinefoldComputeServiceLiveTest.java delete mode 100644 providers/ninefold-compute/src/test/java/org/jclouds/ninefold/compute/compute/NinefoldComputeTemplateBuilderLiveTest.java delete mode 100644 providers/ninefold-storage/pom.xml delete mode 100644 providers/ninefold-storage/src/main/java/org/jclouds/ninefold/storage/NinefoldStorageProviderMetadata.java delete mode 100644 providers/ninefold-storage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata delete mode 100644 providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/NinefoldStorageAsyncClientTest.java delete mode 100644 providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/NinefoldStorageClientLiveTest.java delete mode 100644 providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/NinefoldStorageProviderTest.java delete mode 100644 providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageBlobIntegrationLiveTest.java delete mode 100644 providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageBlobLiveTest.java delete mode 100644 providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageBlobSignerLiveTest.java delete mode 100644 providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageContainerIntegrationLiveTest.java delete mode 100644 providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageContainerLiveTest.java delete mode 100644 providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageServiceIntegrationLiveTest.java diff --git a/allblobstore/pom.xml b/allblobstore/pom.xml index ed21bbe8d2..711923c01e 100644 --- a/allblobstore/pom.xml +++ b/allblobstore/pom.xml @@ -38,11 +38,6 @@ aws-s3 ${project.version} - - org.apache.jclouds.provider - ninefold-storage - ${project.version} - org.apache.jclouds.provider cloudonestorage diff --git a/allcompute/pom.xml b/allcompute/pom.xml index ff24e60609..3504f72775 100644 --- a/allcompute/pom.xml +++ b/allcompute/pom.xml @@ -138,11 +138,6 @@ cloudstack ${project.version} - - org.apache.jclouds.provider - ninefold-compute - ${project.version} - org.apache.jclouds.provider hpcloud-compute diff --git a/providers/ninefold-compute/pom.xml b/providers/ninefold-compute/pom.xml deleted file mode 100644 index ff214f45ff..0000000000 --- a/providers/ninefold-compute/pom.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - 4.0.0 - - org.apache.jclouds - jclouds-project - 1.8.1-SNAPSHOT - ../../project/pom.xml - - org.apache.jclouds.provider - ninefold-compute - jclouds Ninefold Compute provider - Ninefold Compute powered by CloudStack - bundle - - - https://api.ninefold.com/compute/v1.0/ - 2.2.12 - - FIXME_IDENTITY - FIXME_CREDENTIAL - - org.jclouds.ninefold.compute*;version="${project.version}" - - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - - - - - - org.apache.jclouds.api - cloudstack - ${project.version} - - - org.apache.jclouds.api - cloudstack - ${project.version} - test-jar - test - - - org.apache.jclouds - jclouds-core - ${project.version} - test-jar - test - - - org.apache.jclouds - jclouds-compute - ${project.version} - test-jar - test - - - org.apache.jclouds.driver - jclouds-log4j - ${project.version} - test - - - org.apache.jclouds.driver - jclouds-sshj - ${project.version} - test - - - - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - 1 - - ${test.ninefold-compute.endpoint} - ${test.ninefold-compute.api-version} - ${test.ninefold-compute.build-version} - ${test.ninefold-compute.identity} - ${test.ninefold-compute.credential} - ${test.ninefold-compute.template} - - - - - - - - - - - - diff --git a/providers/ninefold-compute/src/main/java/org/jclouds/ninefold/compute/NinefoldComputeProviderMetadata.java b/providers/ninefold-compute/src/main/java/org/jclouds/ninefold/compute/NinefoldComputeProviderMetadata.java deleted file mode 100644 index ca1f68558c..0000000000 --- a/providers/ninefold-compute/src/main/java/org/jclouds/ninefold/compute/NinefoldComputeProviderMetadata.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.ninefold.compute; - -import static org.jclouds.compute.config.ComputeServiceProperties.TEMPLATE; - -import java.net.URI; -import java.util.Properties; - -import org.jclouds.cloudstack.CloudStackApiMetadata; -import org.jclouds.providers.ProviderMetadata; -import org.jclouds.providers.internal.BaseProviderMetadata; - -/** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Ninefold - * Compute. - */ -public class NinefoldComputeProviderMetadata extends BaseProviderMetadata { - - public static Builder builder() { - return new Builder(); - } - - @Override - public Builder toBuilder() { - return builder().fromProviderMetadata(this); - } - - public NinefoldComputeProviderMetadata() { - super(builder()); - } - - public NinefoldComputeProviderMetadata(Builder builder) { - super(builder); - } - - public static Properties defaultProperties() { - Properties properties = new Properties(); - // https://ninefold.com/support/display/SPT/Ubuntu+10.04+64+Bit+Micro+Server+with+CHEF - properties.setProperty(TEMPLATE, "imageNameMatches=.*Micro.*,osFamily=UBUNTU,osVersionMatches=1[012].[01][04],loginUser=user:Password01,authenticateSudo=true"); - return properties; - } - - public static class Builder - extends - BaseProviderMetadata.Builder { - - protected Builder() { - id("ninefold-compute") - .name("Ninefold Compute") - .apiMetadata(new CloudStackApiMetadata().toBuilder().version("2.2.12").build()) - .homepage(URI.create("http://ninefold.com/virtual-servers/")) - .console(URI.create("https://ninefold.com/portal/portal/login")) - .iso3166Codes("AU-NSW") - .endpoint("https://api.ninefold.com/compute/v1.0/") - .defaultProperties(NinefoldComputeProviderMetadata.defaultProperties()); - } - - @Override - public NinefoldComputeProviderMetadata build() { - return new NinefoldComputeProviderMetadata(this); - } - - @Override - public Builder fromProviderMetadata( - ProviderMetadata in) { - super.fromProviderMetadata(in); - return this; - } - - } -} diff --git a/providers/ninefold-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/ninefold-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index 988fb98ef0..0000000000 --- a/providers/ninefold-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.ninefold.compute.NinefoldComputeProviderMetadata \ No newline at end of file diff --git a/providers/ninefold-compute/src/test/java/org/jclouds/ninefold/compute/NinefoldComputeProviderTest.java b/providers/ninefold-compute/src/test/java/org/jclouds/ninefold/compute/NinefoldComputeProviderTest.java deleted file mode 100644 index 864e8dcecf..0000000000 --- a/providers/ninefold-compute/src/test/java/org/jclouds/ninefold/compute/NinefoldComputeProviderTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.ninefold.compute; - -import org.jclouds.cloudstack.CloudStackApiMetadata; -import org.jclouds.providers.internal.BaseProviderMetadataTest; -import org.testng.annotations.Test; - -/** - * The NinefoldComputeProviderTest tests the {@link NinefoldComputeProviderMetadata} class. - */ -@Test(groups = "unit", testName = "NinefoldComputeProviderTest") -public class NinefoldComputeProviderTest extends BaseProviderMetadataTest { - - public NinefoldComputeProviderTest() { - super(new NinefoldComputeProviderMetadata(), new CloudStackApiMetadata()); - } - -} diff --git a/providers/ninefold-compute/src/test/java/org/jclouds/ninefold/compute/compute/NinefoldComputeServiceLiveTest.java b/providers/ninefold-compute/src/test/java/org/jclouds/ninefold/compute/compute/NinefoldComputeServiceLiveTest.java deleted file mode 100644 index 57776e3ab4..0000000000 --- a/providers/ninefold-compute/src/test/java/org/jclouds/ninefold/compute/compute/NinefoldComputeServiceLiveTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.ninefold.compute.compute; - -import org.jclouds.cloudstack.compute.CloudStackComputeServiceLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", singleThreaded = true, testName = "NinefoldComputeServiceLiveTest") -public class NinefoldComputeServiceLiveTest extends CloudStackComputeServiceLiveTest { - - public NinefoldComputeServiceLiveTest() { - provider = "ninefold-compute"; - } -} diff --git a/providers/ninefold-compute/src/test/java/org/jclouds/ninefold/compute/compute/NinefoldComputeTemplateBuilderLiveTest.java b/providers/ninefold-compute/src/test/java/org/jclouds/ninefold/compute/compute/NinefoldComputeTemplateBuilderLiveTest.java deleted file mode 100644 index 2f64b1a311..0000000000 --- a/providers/ninefold-compute/src/test/java/org/jclouds/ninefold/compute/compute/NinefoldComputeTemplateBuilderLiveTest.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.ninefold.compute.compute; - -import static org.jclouds.compute.util.ComputeServiceUtils.getCores; -import static org.testng.Assert.assertEquals; - -import java.io.IOException; -import java.util.Set; - -import org.jclouds.compute.domain.OsFamily; -import org.jclouds.compute.domain.OsFamilyVersion64Bit; -import org.jclouds.compute.domain.Template; -import org.jclouds.compute.internal.BaseTemplateBuilderLiveTest; -import org.testng.annotations.Test; - -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; -import com.google.common.collect.ImmutableSet; - -@Test(groups = "live") -public class NinefoldComputeTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest { - - public NinefoldComputeTemplateBuilderLiveTest() { - provider = "ninefold-compute"; - } - - @Override - protected Predicate defineUnsupportedOperatingSystems() { - return Predicates.not(new Predicate() { - - @Override - public boolean apply(OsFamilyVersion64Bit input) { - switch (input.family) { - case UBUNTU: - return input.version.equals("") || input.version.equals("10.04"); - case SUSE: - return (input.version.equals("") || input.version.equals("11")) && input.is64Bit; - case DEBIAN: - return (input.version.equals("") || input.version.equals("6.0")) && !input.is64Bit; - case CENTOS: - return (input.version.equals("") || input.version.equals("5.5")) && input.is64Bit; - case WINDOWS: - return input.version.equals("") || (input.version.equals("2008") && !input.is64Bit); - default: - return false; - } - } - - }); - } - - @Test - public void testDefaultTemplateBuilder() throws IOException { - Template defaultTemplate = this.view.getComputeService().templateBuilder().build(); - if (template == null) { - assert defaultTemplate.getImage().getOperatingSystem().getVersion().matches("1[012].[10][04]") : defaultTemplate - .getImage().getOperatingSystem().getVersion(); - assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); - assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); - assertEquals(defaultTemplate.getLocation().getId(), "1"); - assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); - assertEquals(defaultTemplate.getOptions().getLoginUser(), "user"); - assertEquals(defaultTemplate.getOptions().getLoginPassword(), "Password01"); - assertEquals(defaultTemplate.getOptions().getLoginPrivateKey(), null); - assertEquals(defaultTemplate.getOptions().shouldAuthenticateSudo(), Boolean.TRUE); - } else { - assertEquals(defaultTemplate.getImage(), this.view.getComputeService().templateBuilder().from(template) - .build().getImage()); - } - } - - @Override - protected Set getIso3166Codes() { - return ImmutableSet. of("AU-NSW"); - } -} diff --git a/providers/ninefold-storage/pom.xml b/providers/ninefold-storage/pom.xml deleted file mode 100644 index ba3c42ecad..0000000000 --- a/providers/ninefold-storage/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - 4.0.0 - - org.apache.jclouds - jclouds-project - 1.8.1-SNAPSHOT - ../../project/pom.xml - - org.apache.jclouds.provider - ninefold-storage - jclouds ninefold storage provider - BlobStore implementation targeted to ninefold storage - bundle - - - http://onlinestorage.ninefold.com - 1.4.0 - - FIXME_IDENTITY - FIXME_CREDENTIAL - - org.jclouds.ninefold.storage*;version="${project.version}" - org.jclouds*;version="${project.version}",* - - - - - org.apache.jclouds.api - atmos - ${project.version} - jar - - - org.apache.jclouds.api - atmos - ${project.version} - test-jar - test - - - org.apache.jclouds - jclouds-core - ${project.version} - test-jar - test - - - org.apache.jclouds - jclouds-blobstore - ${project.version} - test-jar - test - - - org.apache.jclouds.driver - jclouds-log4j - ${project.version} - test - - - log4j - log4j - test - - - - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - - ${test.ninefold-storage.endpoint} - ${test.ninefold-storage.api-version} - ${test.ninefold-storage.build-version} - ${test.ninefold-storage.identity} - ${test.ninefold-storage.credential} - ${jclouds.blobstore.httpstream.url} - ${jclouds.blobstore.httpstream.md5} - - - - - - - - - - - diff --git a/providers/ninefold-storage/src/main/java/org/jclouds/ninefold/storage/NinefoldStorageProviderMetadata.java b/providers/ninefold-storage/src/main/java/org/jclouds/ninefold/storage/NinefoldStorageProviderMetadata.java deleted file mode 100644 index e873b5dc14..0000000000 --- a/providers/ninefold-storage/src/main/java/org/jclouds/ninefold/storage/NinefoldStorageProviderMetadata.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.ninefold.storage; - -import java.net.URI; -import java.util.Properties; - -import org.jclouds.atmos.AtmosApiMetadata; -import org.jclouds.providers.ProviderMetadata; -import org.jclouds.providers.internal.BaseProviderMetadata; - -/** - * Implementation of {@link org.jclouds.types.ProviderMetadata} for Ninefold's - * Storage provider. - */ -public class NinefoldStorageProviderMetadata extends BaseProviderMetadata { - - public static Builder builder() { - return new Builder(); - } - - @Override - public Builder toBuilder() { - return builder().fromProviderMetadata(this); - } - - public NinefoldStorageProviderMetadata() { - super(builder()); - } - - public NinefoldStorageProviderMetadata(Builder builder) { - super(builder); - } - - public static Properties defaultProperties() { - Properties properties = new Properties(); - return properties; - } - - public static class Builder extends BaseProviderMetadata.Builder { - - protected Builder() { - id("ninefold-storage") - .name("Ninefold Storage") - .apiMetadata(new AtmosApiMetadata()) - .homepage(URI.create("http://ninefold.com/cloud-storage/")) - .console(URI.create("https://ninefold.com/portal/")) - .iso3166Codes("AU-NSW") - .endpoint("http://onlinestorage.ninefold.com") - .defaultProperties(NinefoldStorageProviderMetadata.defaultProperties()); - } - - @Override - public NinefoldStorageProviderMetadata build() { - return new NinefoldStorageProviderMetadata(this); - } - - @Override - public Builder fromProviderMetadata( - ProviderMetadata in) { - super.fromProviderMetadata(in); - return this; - } - } -} diff --git a/providers/ninefold-storage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/ninefold-storage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata deleted file mode 100644 index f87f414387..0000000000 --- a/providers/ninefold-storage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata +++ /dev/null @@ -1 +0,0 @@ -org.jclouds.ninefold.storage.NinefoldStorageProviderMetadata diff --git a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/NinefoldStorageAsyncClientTest.java b/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/NinefoldStorageAsyncClientTest.java deleted file mode 100644 index 71751650f2..0000000000 --- a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/NinefoldStorageAsyncClientTest.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.ninefold.storage; - -import org.testng.annotations.Test; - -// NOTE:without testName, this will not call @Before* and fail w/NPE during surefire -@Test(groups = "unit", testName = "NinefoldStorageAsyncClientTest") -public class NinefoldStorageAsyncClientTest extends org.jclouds.atmos.AtmosAsyncClientTest { - - public NinefoldStorageAsyncClientTest() { - this.provider = "ninefold-storage"; - } - -} diff --git a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/NinefoldStorageClientLiveTest.java b/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/NinefoldStorageClientLiveTest.java deleted file mode 100644 index 07e7f6e72b..0000000000 --- a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/NinefoldStorageClientLiveTest.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.ninefold.storage; - -import org.jclouds.atmos.AtmosClientLiveTest; -import org.testng.annotations.Test; - -/** - * Tests behavior of {@code AtmosClient} - */ -@Test(groups = "live", singleThreaded = true, testName = "NinefoldStorageClientLiveTest") -public class NinefoldStorageClientLiveTest extends AtmosClientLiveTest { - public NinefoldStorageClientLiveTest() { - provider = "ninefold-storage"; - } -} diff --git a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/NinefoldStorageProviderTest.java b/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/NinefoldStorageProviderTest.java deleted file mode 100644 index f2cd46236a..0000000000 --- a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/NinefoldStorageProviderTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.ninefold.storage; - -import org.jclouds.atmos.AtmosApiMetadata; -import org.jclouds.providers.internal.BaseProviderMetadataTest; -import org.testng.annotations.Test; - -/** - * The NinefoldStorageProviderTest tests the {@link NinefoldStorageProviderMetadata} class. - */ -@Test(groups = "unit", testName = "NinefoldStorageProviderTest") -public class NinefoldStorageProviderTest extends BaseProviderMetadataTest { - - public NinefoldStorageProviderTest() { - super(new NinefoldStorageProviderMetadata(), new AtmosApiMetadata()); - } - -} diff --git a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageBlobIntegrationLiveTest.java b/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageBlobIntegrationLiveTest.java deleted file mode 100644 index a17953da9f..0000000000 --- a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageBlobIntegrationLiveTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.ninefold.storage.blobstore.integration; - -import org.jclouds.atmos.blobstore.integration.AtmosIntegrationLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", testName = "NinefoldStorageBlobIntegrationLiveTest") -public class NinefoldStorageBlobIntegrationLiveTest extends AtmosIntegrationLiveTest { - - public NinefoldStorageBlobIntegrationLiveTest() { - provider = "ninefold-storage"; - } -} diff --git a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageBlobLiveTest.java b/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageBlobLiveTest.java deleted file mode 100644 index 25631c330a..0000000000 --- a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageBlobLiveTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.ninefold.storage.blobstore.integration; - -import org.jclouds.atmos.blobstore.integration.AtmosLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", testName = "NinefoldStorageBlobLiveTest") -public class NinefoldStorageBlobLiveTest extends AtmosLiveTest { - - public NinefoldStorageBlobLiveTest() { - provider = "ninefold-storage"; - } -} diff --git a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageBlobSignerLiveTest.java b/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageBlobSignerLiveTest.java deleted file mode 100644 index b62f164295..0000000000 --- a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageBlobSignerLiveTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.ninefold.storage.blobstore.integration; - -import org.jclouds.atmos.blobstore.integration.AtmosBlobSignerLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", testName = "NinefoldStorageBlobSignerLiveTest") -public class NinefoldStorageBlobSignerLiveTest extends AtmosBlobSignerLiveTest { - - public NinefoldStorageBlobSignerLiveTest() { - provider = "ninefold-storage"; - } -} diff --git a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageContainerIntegrationLiveTest.java b/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageContainerIntegrationLiveTest.java deleted file mode 100644 index 755af373f1..0000000000 --- a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageContainerIntegrationLiveTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.ninefold.storage.blobstore.integration; - -import org.jclouds.atmos.blobstore.integration.AtmosContainerIntegrationLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", testName = "NinefoldStorageContainerIntegrationLiveTest") -public class NinefoldStorageContainerIntegrationLiveTest extends AtmosContainerIntegrationLiveTest { - - public NinefoldStorageContainerIntegrationLiveTest() { - provider = "ninefold-storage"; - } -} diff --git a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageContainerLiveTest.java b/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageContainerLiveTest.java deleted file mode 100644 index 809da41f3e..0000000000 --- a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageContainerLiveTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.ninefold.storage.blobstore.integration; - -import org.jclouds.atmos.blobstore.integration.AtmosContainerLiveTest; -import org.testng.annotations.Test; - -@Test(groups = "live", testName = "NinefoldStorageContainerLiveTest") -public class NinefoldStorageContainerLiveTest extends AtmosContainerLiveTest { - - public NinefoldStorageContainerLiveTest() { - provider = "ninefold-storage"; - } -} diff --git a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageServiceIntegrationLiveTest.java b/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageServiceIntegrationLiveTest.java deleted file mode 100644 index 39af9f8790..0000000000 --- a/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/blobstore/integration/NinefoldStorageServiceIntegrationLiveTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.ninefold.storage.blobstore.integration; - -import java.util.Set; - -import org.jclouds.atmos.blobstore.integration.AtmosServiceIntegrationLiveTest; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableSet; - -@Test(groups = "live", testName = "NinefoldStorageServiceIntegrationLiveTest") -public class NinefoldStorageServiceIntegrationLiveTest extends AtmosServiceIntegrationLiveTest { - - public NinefoldStorageServiceIntegrationLiveTest() { - provider = "ninefold-storage"; - } - - @Override - protected Set getIso3166Codes() { - return ImmutableSet. of("AU-NSW"); - } -} diff --git a/providers/pom.xml b/providers/pom.xml index 0f5262f369..927eef222f 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -36,7 +36,6 @@ aws-ec2 aws-sqs aws-cloudwatch - ninefold-storage cloudonestorage bluelock-vcloud-zone01 elastichosts-lon-p @@ -54,7 +53,6 @@ greenhousedata-element-vcloud go2cloud-jhb1 softlayer - ninefold-compute hpcloud-compute hpcloud-blockstorage hpcloud-objectstorage