From 17db25cceb2b83b57588dec05fc62162822b6d4f Mon Sep 17 00:00:00 2001 From: Jeremy Whitlock Date: Thu, 2 Jun 2011 23:58:50 -0600 Subject: [PATCH 1/6] Issue 550: Added ProviderMetadata for AT&T Synaptic Storage. [in providers/synaptic-storage/src] * main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java, src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata, src/test/java/org/jclouds/synaptic/storage/SynapticStorageProviderTest.java: Added. --- .../SynapticStorageProviderMetadata.java | 109 ++++++++++++++++++ .../org.jclouds.providers.ProviderMetadata | 1 + .../storage/SynapticStorageProviderTest.java | 37 ++++++ 3 files changed, 147 insertions(+) create mode 100644 providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java create mode 100644 providers/synaptic-storage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata create mode 100644 providers/synaptic-storage/src/test/java/org/jclouds/synaptic/storage/SynapticStorageProviderTest.java diff --git a/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java b/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java new file mode 100644 index 0000000000..a5b8c84edc --- /dev/null +++ b/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java @@ -0,0 +1,109 @@ +/** + * + * Copyright (C) 2011 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.synaptic.storage; + +import com.google.common.collect.ImmutableSet; + +import java.net.URI; +import java.util.Set; + +import org.jclouds.providers.BaseProviderMetadata; +import org.jclouds.providers.ProviderMetadata; + +/** + * Implementation of {@link org.jclouds.types.ProviderMetadata} for AT&T's + * Synaptic Storage provider. + * + * @author Jeremy Whitlock + */ +public class SynapticStorageProviderMetadata extends BaseProviderMetadata { + + /** + * {@inheritDoc} + */ + @Override + public String getId() { + return "synaptic-storage"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getType() { + return ProviderMetadata.BLOBSTORE_TYPE; + } + + /** + * {@inheritDoc} + */ + @Override + public String getName() { + return "AT&T Synaptic Storage"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getIdentityName() { + return "Email Username"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getCredentialName() { + return "Password"; + } + + /** + * {@inheritDoc} + */ + @Override + public URI getHomepage() { + return URI.create("https://www.synaptic.att.com/"); + } + + /** + * {@inheritDoc} + */ + @Override + public URI getConsole() { + return URI.create("https://www.synaptic.att.com/clouduser/login.htm"); + } + + /** + * {@inheritDoc} + */ + @Override + public URI getApiDocumentation() { + return URI.create("https://www.synaptic.att.com/clouduser/emc_atmos_api.htm"); + } + + /** + * {@inheritDoc} + */ + @Override + public Set getIso3166Codes() { + return ImmutableSet.of("US-VA", "US-TX"); + } + +} \ No newline at end of file diff --git a/providers/synaptic-storage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/synaptic-storage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata new file mode 100644 index 0000000000..35deaa8fcb --- /dev/null +++ b/providers/synaptic-storage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata @@ -0,0 +1 @@ +org.jclouds.synaptic.storage.SynapticStorageProviderMetadata diff --git a/providers/synaptic-storage/src/test/java/org/jclouds/synaptic/storage/SynapticStorageProviderTest.java b/providers/synaptic-storage/src/test/java/org/jclouds/synaptic/storage/SynapticStorageProviderTest.java new file mode 100644 index 0000000000..92e7aab916 --- /dev/null +++ b/providers/synaptic-storage/src/test/java/org/jclouds/synaptic/storage/SynapticStorageProviderTest.java @@ -0,0 +1,37 @@ +/** + * + * Copyright (C) 2011 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.synaptic.storage; + +import org.jclouds.providers.BaseProviderMetadataTest; +import org.jclouds.providers.ProviderMetadata; +import org.testng.annotations.Test; + +/** + * The SynapticStorageProviderTest tests the {@link org.jclouds.synaptic.storage.SynapticStorageProviderMetadata} class. + * + * @author Jeremy Whitlock + */ +@Test(groups = "unit", testName = "SynapticStorageProviderTest") +public class SynapticStorageProviderTest extends BaseProviderMetadataTest { + + public SynapticStorageProviderTest() { + super(new SynapticStorageProviderMetadata(), ProviderMetadata.BLOBSTORE_TYPE); + } + +} \ No newline at end of file From 63cd9d0535ef40c8997d0142c110a99f2e73a498 Mon Sep 17 00:00:00 2001 From: Jeremy Whitlock Date: Fri, 3 Jun 2011 00:06:38 -0600 Subject: [PATCH 2/6] Issue 550: Cleaned up a few minor formatting nits and implemented linked services for Eucalyptus. [in providers] * aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java: Fixed a javadoc link. * aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ProviderTest.java: Fixed a javadoc link and fixed an erroneous full-qualified class reference. * eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java, eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java (getLinkedServices): Implemented. --- .../java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java | 2 +- .../test/java/org/jclouds/aws/s3/AWSS3ProviderTest.java | 3 ++- .../epc/EucalyptusPartnerCloudEC2ProviderMetadata.java | 8 ++++++++ .../epc/EucalyptusPartnerCloudS3ProviderMetadata.java | 8 ++++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java index a62c0e7aa5..975b258dc9 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java @@ -27,7 +27,7 @@ import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; /** - * Implementation of @ link org.jclouds.types.ProviderMetadata} for Amazon's Simple Storage Service + * Implementation of {@link org.jclouds.types.ProviderMetadata} for Amazon's Simple Storage Service * (S3) provider. * * @author Adrian Cole diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ProviderTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ProviderTest.java index 397c4ba7bf..cf959d187c 100644 --- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ProviderTest.java +++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ProviderTest.java @@ -23,7 +23,7 @@ import org.jclouds.providers.ProviderMetadata; import org.testng.annotations.Test; /** - * The AWSS3ProviderTest tests the org.jclouds.providers.AWSS3Provider class. + * The AWSS3ProviderTest tests the {@link org.jclouds.aws.s3.AWSS3ProviderMetadata} class. * * @author Adrian Cole */ @@ -33,4 +33,5 @@ public class AWSS3ProviderTest extends BaseProviderMetadataTest { public AWSS3ProviderTest() { super(new AWSS3ProviderMetadata(), ProviderMetadata.BLOBSTORE_TYPE); } + } \ No newline at end of file diff --git a/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java b/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java index c18ed12397..4158bdbac9 100644 --- a/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java +++ b/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java @@ -97,6 +97,14 @@ public class EucalyptusPartnerCloudEC2ProviderMetadata extends BaseProviderMetad return URI.create("http://open.eucalyptus.com/wiki/IntroducingEucalyptus_v2.0"); } + /** + * {@inheritDoc} + */ + @Override + public Set getLinkedServices() { + return ImmutableSet.of("eucalyptus-partnercloud-ec2", "eucalyptus-partnercloud-s3"); + } + /** * {@inheritDoc} */ diff --git a/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java b/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java index 0c1d6d2d38..38b97d7af1 100644 --- a/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java +++ b/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java @@ -97,6 +97,14 @@ public class EucalyptusPartnerCloudS3ProviderMetadata extends BaseProviderMetada return URI.create("http://open.eucalyptus.com/wiki/IntroducingEucalyptus_v2.0"); } + /** + * {@inheritDoc} + */ + @Override + public Set getLinkedServices() { + return ImmutableSet.of("eucalyptus-partnercloud-ec2", "eucalyptus-partnercloud-s3"); + } + /** * {@inheritDoc} */ From 691e69a961dccbd6e1a252f4505bfbc07bdeaa55 Mon Sep 17 00:00:00 2001 From: Jeremy Whitlock Date: Fri, 3 Jun 2011 00:11:14 -0600 Subject: [PATCH 3/6] Issue 550: Addressed the verbiage used for credentials for the synaptic-storage provider. [in providers/synaptic-storage/src] * main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java (getIdentityName, getCredentialName): Updated to use ATMOS verbiage per Adrian's feedback. --- .../synaptic/storage/SynapticStorageProviderMetadata.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java b/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java index a5b8c84edc..ad5196a1b8 100644 --- a/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java +++ b/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java @@ -63,7 +63,7 @@ public class SynapticStorageProviderMetadata extends BaseProviderMetadata { */ @Override public String getIdentityName() { - return "Email Username"; + return "Subtenant ID"; } /** @@ -71,7 +71,7 @@ public class SynapticStorageProviderMetadata extends BaseProviderMetadata { */ @Override public String getCredentialName() { - return "Password"; + return "Shared Secret"; } /** From e0bb0bc4d735a942bdd35151d73416258680852c Mon Sep 17 00:00:00 2001 From: Jeremy Whitlock Date: Fri, 3 Jun 2011 00:33:37 -0600 Subject: [PATCH 4/6] Issue 550: Added ProviderMetadata for OpenHosting East1 provider. [in jclouds/openhosting-east1/src] * main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java, main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata, test/java/org/jclouds/openhosting/OpenHostingEast1ProviderTest.java: Added. --- .../OpenHostingEast1ProviderMetadata.java | 108 ++++++++++++++++++ .../org.jclouds.providers.ProviderMetadata | 1 + .../OpenHostingEast1ProviderTest.java | 37 ++++++ 3 files changed, 146 insertions(+) create mode 100644 providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java create mode 100644 providers/openhosting-east1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata create mode 100644 providers/openhosting-east1/src/test/java/org/jclouds/openhosting/OpenHostingEast1ProviderTest.java diff --git a/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java b/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java new file mode 100644 index 0000000000..e5df64b112 --- /dev/null +++ b/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java @@ -0,0 +1,108 @@ +/** + * + * Copyright (C) 2011 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.openhosting; + +import com.google.common.collect.ImmutableSet; + +import java.net.URI; +import java.util.Set; + +import org.jclouds.providers.BaseProviderMetadata; + +/** + * Implementation of {@link org.jclouds.types.ProviderMetadata} for OpenHosting's + * East1 provider. + * + * @author Jeremy Whitlock + */ +public class OpenHostingEast1ProviderMetadata extends BaseProviderMetadata { + + /** + * {@inheritDoc} + */ + @Override + public String getId() { + return "openhosting-east1"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getType() { + return COMPUTE_TYPE; + } + + /** + * {@inheritDoc} + */ + @Override + public String getName() { + return "OpenHosting East1"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getIdentityName() { + return "User UUID"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getCredentialName() { + return "Secret API Key"; + } + + /** + * {@inheritDoc} + */ + @Override + public URI getHomepage() { + return URI.create("https://east1.openhosting.com/"); + } + + /** + * {@inheritDoc} + */ + @Override + public URI getConsole() { + return URI.create("https://east1.openhosting.com/accounts/login"); + } + + /** + * {@inheritDoc} + */ + @Override + public URI getApiDocumentation() { + return URI.create("http://www.openhosting.com/support/api/"); + } + + /** + * {@inheritDoc} + */ + @Override + public Set getIso3166Codes() { + return ImmutableSet.of("US-VA"); + } + +} diff --git a/providers/openhosting-east1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/openhosting-east1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata new file mode 100644 index 0000000000..996483c31e --- /dev/null +++ b/providers/openhosting-east1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata @@ -0,0 +1 @@ +org.jclouds.openhosting.OpenHostingEast1ProviderMetadata diff --git a/providers/openhosting-east1/src/test/java/org/jclouds/openhosting/OpenHostingEast1ProviderTest.java b/providers/openhosting-east1/src/test/java/org/jclouds/openhosting/OpenHostingEast1ProviderTest.java new file mode 100644 index 0000000000..3910128e9c --- /dev/null +++ b/providers/openhosting-east1/src/test/java/org/jclouds/openhosting/OpenHostingEast1ProviderTest.java @@ -0,0 +1,37 @@ +/** + * + * Copyright (C) 2011 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.openhosting; + +import org.jclouds.providers.BaseProviderMetadataTest; +import org.jclouds.providers.ProviderMetadata; +import org.testng.annotations.Test; + +/** + * The OpenHostingEast1ProviderTest tests the {@link OpenHostingEast1ProviderMetadata} class. + * + * @author Jeremy Whitlock + */ +@Test(groups = "unit", testName = "OpenHostingEast1ProviderTest") +public class OpenHostingEast1ProviderTest extends BaseProviderMetadataTest { + + public OpenHostingEast1ProviderTest() { + super(new OpenHostingEast1ProviderMetadata(), ProviderMetadata.COMPUTE_TYPE); + } + +} \ No newline at end of file From 1340e38728db3a34cb94d9b6892b0398c395157c Mon Sep 17 00:00:00 2001 From: Jeremy Whitlock Date: Fri, 3 Jun 2011 00:48:20 -0600 Subject: [PATCH 5/6] Issue 550: Added ProviderMetadata for Ninefold Storage. [in providers/ninefold-storage/src] * main/java/org/jclouds/ninefold/storage/NinefoldStorageProviderMetadata.java, main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata, test/java/org/jclouds/ninefold/storage/NinefoldStorageProviderTest.java: Added. --- .../NinefoldStorageProviderMetadata.java | 108 ++++++++++++++++++ .../org.jclouds.providers.ProviderMetadata | 1 + .../storage/NinefoldStorageProviderTest.java | 37 ++++++ 3 files changed, 146 insertions(+) create mode 100644 providers/ninefold-storage/src/main/java/org/jclouds/ninefold/storage/NinefoldStorageProviderMetadata.java create mode 100644 providers/ninefold-storage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata create mode 100644 providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/NinefoldStorageProviderTest.java 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 new file mode 100644 index 0000000000..b165afa4c0 --- /dev/null +++ b/providers/ninefold-storage/src/main/java/org/jclouds/ninefold/storage/NinefoldStorageProviderMetadata.java @@ -0,0 +1,108 @@ +/** + * + * Copyright (C) 2011 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.ninefold.storage; + +import com.google.common.collect.ImmutableSet; + +import java.net.URI; +import java.util.Set; + +import org.jclouds.providers.BaseProviderMetadata; + +/** + * Implementation of {@link org.jclouds.types.ProviderMetadata} for Ninefold's + * Storage provider. + * + * @author Jeremy Whitlock + */ +public class NinefoldStorageProviderMetadata extends BaseProviderMetadata { + + /** + * {@inheritDoc} + */ + @Override + public String getId() { + return "ninefold-storage"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getType() { + return BLOBSTORE_TYPE; + } + + /** + * {@inheritDoc} + */ + @Override + public String getName() { + return "Ninefold Storage"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getIdentityName() { + return "Subtenant ID (UID)"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getCredentialName() { + return "Shared Secret"; + } + + /** + * {@inheritDoc} + */ + @Override + public URI getHomepage() { + return URI.create("http://ninefold.com/cloud-storage/"); + } + + /** + * {@inheritDoc} + */ + @Override + public URI getConsole() { + return URI.create("https://ninefold.com/portal/"); + } + + /** + * {@inheritDoc} + */ + @Override + public URI getApiDocumentation() { + return URI.create("https://ninefold.com/support/display/SPT/API+Documentation"); + } + + /** + * {@inheritDoc} + */ + @Override + public Set getIso3166Codes() { + return ImmutableSet.of("AU-NSW"); + } + +} 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 new file mode 100644 index 0000000000..f87f414387 --- /dev/null +++ b/providers/ninefold-storage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata @@ -0,0 +1 @@ +org.jclouds.ninefold.storage.NinefoldStorageProviderMetadata 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 new file mode 100644 index 0000000000..e087c0ef19 --- /dev/null +++ b/providers/ninefold-storage/src/test/java/org/jclouds/ninefold/storage/NinefoldStorageProviderTest.java @@ -0,0 +1,37 @@ +/** + * + * Copyright (C) 2011 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.ninefold.storage; + +import org.jclouds.providers.BaseProviderMetadataTest; +import org.jclouds.providers.ProviderMetadata; +import org.testng.annotations.Test; + +/** + * The NinefoldStorageProviderTest tests the {@link NinefoldStorageProviderMetadata} class. + * + * @author Jeremy Whitlock + */ +@Test(groups = "unit", testName = "NinefoldStorageProviderTest") +public class NinefoldStorageProviderTest extends BaseProviderMetadataTest { + + public NinefoldStorageProviderTest() { + super(new NinefoldStorageProviderMetadata(), ProviderMetadata.BLOBSTORE_TYPE); + } + +} \ No newline at end of file From 770023a8920d42b4c21fcab778fde1e34f1af4a2 Mon Sep 17 00:00:00 2001 From: Jeremy Whitlock Date: Fri, 3 Jun 2011 00:50:28 -0600 Subject: [PATCH 6/6] Issue 550: Global ATMOS refactoring for identity. [in providers] * cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java, synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java (getIdentityName): Changed "Subtenant ID" to "Subtenant ID (UID)". --- .../cloudonestorage/CloudOneStorageProviderMetadata.java | 2 +- .../synaptic/storage/SynapticStorageProviderMetadata.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/providers/cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java b/providers/cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java index 5c0300b989..6f0c3102f5 100644 --- a/providers/cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java +++ b/providers/cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java @@ -62,7 +62,7 @@ public class CloudOneStorageProviderMetadata extends BaseProviderMetadata { */ @Override public String getIdentityName() { - return "Subtenant ID"; + return "Subtenant ID (UID)"; } /** diff --git a/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java b/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java index ad5196a1b8..1865fb4d9b 100644 --- a/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java +++ b/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java @@ -63,7 +63,7 @@ public class SynapticStorageProviderMetadata extends BaseProviderMetadata { */ @Override public String getIdentityName() { - return "Subtenant ID"; + return "Subtenant ID (UID)"; } /**