From efb8f0103e88f11a8e76b732df481f0df29d3b4e Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sun, 29 May 2011 22:44:00 -0700 Subject: [PATCH] Issue 550: added providermetadata for Bluelock --- core/src/main/resources/rest.properties | 4 +- .../BlueLockVCloudDirectorContextBuilder.java | 9 +- ...ueLockVCloudDirectorPropertiesBuilder.java | 4 +- ...luelockVCloudDirectorProviderMetadata.java | 116 ++++++++++++++++++ ...lueLockVCloudDirectorRestClientModule.java | 2 +- .../org.jclouds.providers.ProviderMetadata | 1 + ...> BluelockVCloudDirectorProviderTest.java} | 27 ++-- ...dBlueLockVCloudDirectorClientLiveTest.java | 7 +- ...kVCloudDirectorComputeServiceLiveTest.java | 6 +- ...VCloudDirectorTemplateBuilderLiveTest.java | 6 +- ...ckVCloudDirectorCatalogClientLiveTest.java | 6 +- ...ckVCloudDirectorNetworkClientLiveTest.java | 6 +- ...ueLockVCloudDirectorOrgClientLiveTest.java | 6 +- ...eLockVCloudDirectorTaskClientLiveTest.java | 6 +- ...eLockVCloudDirectorVAppClientLiveTest.java | 6 +- ...oudDirectorVAppTemplateClientLiveTest.java | 6 +- ...ueLockVCloudDirectorVDCClientLiveTest.java | 6 +- ...lueLockVCloudDirectorVmClientLiveTest.java | 6 +- 18 files changed, 166 insertions(+), 64 deletions(-) create mode 100644 providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/BluelockVCloudDirectorProviderMetadata.java create mode 100644 providers/bluelock-vcdirector/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata rename providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/{ProvidersInPropertiesTest.java => BluelockVCloudDirectorProviderTest.java} (58%) diff --git a/core/src/main/resources/rest.properties b/core/src/main/resources/rest.properties index 27b3da4a8f..af8b0e75e3 100644 --- a/core/src/main/resources/rest.properties +++ b/core/src/main/resources/rest.properties @@ -92,8 +92,8 @@ cloudservers-uk.propertiesbuilder=org.jclouds.rackspace.cloudservers.CloudServer cloudservers-us.contextbuilder=org.jclouds.cloudservers.CloudServersContextBuilder cloudservers-us.propertiesbuilder=org.jclouds.rackspace.cloudservers.CloudServersUSPropertiesBuilder -bluelock-vcdirector.contextbuilder=org.jclouds.vcloud.bluelock.BlueLockVCloudDirectorContextBuilder -bluelock-vcdirector.propertiesbuilder=org.jclouds.vcloud.bluelock.BlueLockVCloudDirectorPropertiesBuilder +bluelock-vcdirector.contextbuilder=org.jclouds.vcloud.bluelock.BluelockVCloudDirectorContextBuilder +bluelock-vcdirector.propertiesbuilder=org.jclouds.vcloud.bluelock.BluelockVCloudDirectorPropertiesBuilder gogrid.propertiesbuilder=org.jclouds.gogrid.GoGridPropertiesBuilder gogrid.contextbuilder=org.jclouds.gogrid.GoGridContextBuilder diff --git a/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorContextBuilder.java b/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorContextBuilder.java index e01aab7340..8df5951a8e 100644 --- a/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorContextBuilder.java +++ b/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorContextBuilder.java @@ -24,7 +24,7 @@ import java.util.Properties; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.logging.jdk.config.JDKLoggingModule; import org.jclouds.vcloud.VCloudContextBuilder; -import org.jclouds.vcloud.bluelock.config.BlueLockVCloudDirectorRestClientModule; +import org.jclouds.vcloud.bluelock.config.BluelockVCloudDirectorRestClientModule; import org.jclouds.vcloud.compute.config.VCloudComputeServiceContextModule; import com.google.inject.Injector; @@ -41,11 +41,10 @@ import com.google.inject.Module; * {@link JavaUrlHttpCommandExecutorServiceModule http transports} will be installed. * * @author Adrian Cole - * @see BlueLockVCloudComputeServiceContext */ -public class BlueLockVCloudDirectorContextBuilder extends VCloudContextBuilder { +public class BluelockVCloudDirectorContextBuilder extends VCloudContextBuilder { - public BlueLockVCloudDirectorContextBuilder(Properties props) { + public BluelockVCloudDirectorContextBuilder(Properties props) { super(props); } @@ -56,7 +55,7 @@ public class BlueLockVCloudDirectorContextBuilder extends VCloudContextBuilder { @Override protected void addClientModule(List modules) { - modules.add(new BlueLockVCloudDirectorRestClientModule()); + modules.add(new BluelockVCloudDirectorRestClientModule()); } } diff --git a/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorPropertiesBuilder.java b/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorPropertiesBuilder.java index 3954b3fe50..899a3912ee 100644 --- a/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorPropertiesBuilder.java +++ b/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/BlueLockVCloudDirectorPropertiesBuilder.java @@ -31,7 +31,7 @@ import org.jclouds.vcloud.VCloudPropertiesBuilder; * * @author Adrian Cole */ -public class BlueLockVCloudDirectorPropertiesBuilder extends VCloudPropertiesBuilder { +public class BluelockVCloudDirectorPropertiesBuilder extends VCloudPropertiesBuilder { @Override protected Properties defaultProperties() { Properties properties = super.defaultProperties(); @@ -41,7 +41,7 @@ public class BlueLockVCloudDirectorPropertiesBuilder extends VCloudPropertiesBui return properties; } - public BlueLockVCloudDirectorPropertiesBuilder(Properties properties) { + public BluelockVCloudDirectorPropertiesBuilder(Properties properties) { super(properties); } } diff --git a/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/BluelockVCloudDirectorProviderMetadata.java b/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/BluelockVCloudDirectorProviderMetadata.java new file mode 100644 index 0000000000..17c285f082 --- /dev/null +++ b/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/BluelockVCloudDirectorProviderMetadata.java @@ -0,0 +1,116 @@ +/** + * + * 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.vcloud.bluelock; + +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 Bluelock vCloud Director. + * + * @author Adrian Cole + */ +public class BluelockVCloudDirectorProviderMetadata extends BaseProviderMetadata { + + /** + * {@inheritDoc} + */ + @Override + public String getId() { + return "bluelock-vcdirector"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getType() { + return ProviderMetadata.COMPUTE_TYPE; + } + + /** + * {@inheritDoc} + */ + @Override + public String getName() { + return "Bluelock vCloud Director"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getIdentityName() { + return "User at Organization (user@org)"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getCredentialName() { + return "Password"; + } + + /** + * {@inheritDoc} + */ + @Override + public URI getHomepage() { + return URI.create("http://www.bluelock.com/bluelock-cloud-hosting"); + } + + /** + * {@inheritDoc} + */ + @Override + public URI getConsole() { + return URI.create("https://vcenterprise.bluelock.com/cloud/"); + } + + /** + * {@inheritDoc} + */ + @Override + public URI getApiDocumentation() { + return URI.create("http://www.vmware.com/support/pubs/vcd_pubs.html"); + } + + /** + * {@inheritDoc} + */ + @Override + public Set getLinkedServices() { + return ImmutableSet.of("bluelock-vcdirector"); + } + + /** + * {@inheritDoc} + */ + @Override + public Set getIso3166Codes() { + return ImmutableSet.of("US-IN"); + } + +} \ No newline at end of file diff --git a/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/config/BlueLockVCloudDirectorRestClientModule.java b/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/config/BlueLockVCloudDirectorRestClientModule.java index 20539e7719..656876228e 100644 --- a/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/config/BlueLockVCloudDirectorRestClientModule.java +++ b/providers/bluelock-vcdirector/src/main/java/org/jclouds/vcloud/bluelock/config/BlueLockVCloudDirectorRestClientModule.java @@ -29,6 +29,6 @@ import org.jclouds.vcloud.config.VCloudRestClientModule; */ @RequiresHttp @ConfiguresRestClient -public class BlueLockVCloudDirectorRestClientModule extends VCloudRestClientModule { +public class BluelockVCloudDirectorRestClientModule extends VCloudRestClientModule { } diff --git a/providers/bluelock-vcdirector/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/bluelock-vcdirector/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata new file mode 100644 index 0000000000..641c685c91 --- /dev/null +++ b/providers/bluelock-vcdirector/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata @@ -0,0 +1 @@ +org.jclouds.vcloud.bluelock.BluelockVCloudDirectorProviderMetadata diff --git a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/ProvidersInPropertiesTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/BluelockVCloudDirectorProviderTest.java similarity index 58% rename from providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/ProvidersInPropertiesTest.java rename to providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/BluelockVCloudDirectorProviderTest.java index ea8df16d06..ca9fcf63b4 100644 --- a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/ProvidersInPropertiesTest.java +++ b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/BluelockVCloudDirectorProviderTest.java @@ -18,31 +18,18 @@ */ package org.jclouds.vcloud.bluelock; -import org.jclouds.compute.util.ComputeServiceUtils; -import org.jclouds.rest.Providers; +import org.jclouds.providers.BaseProviderMetadataTest; +import org.jclouds.providers.ProviderMetadata; import org.testng.annotations.Test; -import com.google.common.collect.Iterables; - /** * * @author Adrian Cole - * */ -@Test(groups = "unit") -public class ProvidersInPropertiesTest { - - @Test - public void testSupportedProviders() { - Iterable providers = Providers.getSupportedProviders(); - assert Iterables.contains(providers, "bluelock-vcdirector") : providers; +@Test(groups = "unit", testName = "BluelockVCloudDirectorProviderTest") +public class BluelockVCloudDirectorProviderTest extends BaseProviderMetadataTest { + public BluelockVCloudDirectorProviderTest() { + super(new BluelockVCloudDirectorProviderMetadata(), ProviderMetadata.COMPUTE_TYPE); } - - @Test - public void testSupportedComputeServiceProviders() { - Iterable providers = ComputeServiceUtils.getSupportedProviders(); - assert Iterables.contains(providers, "bluelock-vcdirector") : providers; - } - -} +} \ No newline at end of file diff --git a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/DeprecatedBlueLockVCloudDirectorClientLiveTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/DeprecatedBlueLockVCloudDirectorClientLiveTest.java index 2d1f3a83cd..c6635364b2 100644 --- a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/DeprecatedBlueLockVCloudDirectorClientLiveTest.java +++ b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/DeprecatedBlueLockVCloudDirectorClientLiveTest.java @@ -22,14 +22,13 @@ import org.jclouds.vcloud.DeprecatedVCloudClientLiveTest; import org.testng.annotations.Test; /** - * Tests behavior of {@code BlueLockVCloudClient} * * @author Adrian Cole */ @Deprecated -@Test(groups = "live", singleThreaded = true) -public class DeprecatedBlueLockVCloudDirectorClientLiveTest extends DeprecatedVCloudClientLiveTest { - public DeprecatedBlueLockVCloudDirectorClientLiveTest() { +@Test(groups = "live", singleThreaded = true, testName = "DeprecatedBluelockVCloudDirectorClientLiveTest") +public class DeprecatedBluelockVCloudDirectorClientLiveTest extends DeprecatedVCloudClientLiveTest { + public DeprecatedBluelockVCloudDirectorClientLiveTest() { provider = "bluelock-vcdirector"; } diff --git a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java index abbbde100a..0cf76f581c 100644 --- a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java +++ b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java @@ -34,9 +34,9 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(groups = "live", enabled = true, sequential = true) -public class BlueLockVCloudDirectorComputeServiceLiveTest extends VCloudComputeServiceLiveTest { - public BlueLockVCloudDirectorComputeServiceLiveTest() { +@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudDirectorComputeServiceLiveTest") +public class BluelockVCloudDirectorComputeServiceLiveTest extends VCloudComputeServiceLiveTest { + public BluelockVCloudDirectorComputeServiceLiveTest() { provider = "bluelock-vcdirector"; // vcloud requires instantiate before deploy, which takes longer than 30 seconds nonBlockDuration = 300; diff --git a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorTemplateBuilderLiveTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorTemplateBuilderLiveTest.java index c086966e3a..29b2ec445d 100644 --- a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorTemplateBuilderLiveTest.java +++ b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorTemplateBuilderLiveTest.java @@ -37,10 +37,10 @@ import com.google.common.collect.ImmutableSet; * * @author Adrian Cole */ -@Test(groups = "live") -public class BlueLockVCloudDirectorTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest { +@Test(groups = "live", testName = "BluelockVCloudDirectorTemplateBuilderLiveTest") +public class BluelockVCloudDirectorTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest { - public BlueLockVCloudDirectorTemplateBuilderLiveTest() { + public BluelockVCloudDirectorTemplateBuilderLiveTest() { provider = "bluelock-vcdirector"; } diff --git a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorCatalogClientLiveTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorCatalogClientLiveTest.java index 06c05c42d7..c19a5ee58f 100644 --- a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorCatalogClientLiveTest.java +++ b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorCatalogClientLiveTest.java @@ -26,10 +26,10 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BlueLockVCloudDirectorCatalogClientLiveTest") -public class BlueLockVCloudDirectorCatalogClientLiveTest extends CatalogClientLiveTest { +@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudDirectorCatalogClientLiveTest") +public class BluelockVCloudDirectorCatalogClientLiveTest extends CatalogClientLiveTest { - public BlueLockVCloudDirectorCatalogClientLiveTest() { + public BluelockVCloudDirectorCatalogClientLiveTest() { provider = "bluelock-vcdirector"; } } \ No newline at end of file diff --git a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorNetworkClientLiveTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorNetworkClientLiveTest.java index 0f104d7ad4..27bf92d17d 100644 --- a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorNetworkClientLiveTest.java +++ b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorNetworkClientLiveTest.java @@ -26,10 +26,10 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BlueLockVCloudDirectorNetworkClientLiveTest") -public class BlueLockVCloudDirectorNetworkClientLiveTest extends NetworkClientLiveTest { +@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudDirectorNetworkClientLiveTest") +public class BluelockVCloudDirectorNetworkClientLiveTest extends NetworkClientLiveTest { - public BlueLockVCloudDirectorNetworkClientLiveTest() { + public BluelockVCloudDirectorNetworkClientLiveTest() { provider = "bluelock-vcdirector"; } } \ No newline at end of file diff --git a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorOrgClientLiveTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorOrgClientLiveTest.java index c8d1f5fb7b..de188132f4 100644 --- a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorOrgClientLiveTest.java +++ b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorOrgClientLiveTest.java @@ -26,10 +26,10 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BlueLockVCloudDirectorOrgClientLiveTest") -public class BlueLockVCloudDirectorOrgClientLiveTest extends OrgClientLiveTest { +@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudDirectorOrgClientLiveTest") +public class BluelockVCloudDirectorOrgClientLiveTest extends OrgClientLiveTest { - public BlueLockVCloudDirectorOrgClientLiveTest() { + public BluelockVCloudDirectorOrgClientLiveTest() { provider = "bluelock-vcdirector"; } } \ No newline at end of file diff --git a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorTaskClientLiveTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorTaskClientLiveTest.java index 03196defbf..cb9fba9d43 100644 --- a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorTaskClientLiveTest.java +++ b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorTaskClientLiveTest.java @@ -26,10 +26,10 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BlueLockVCloudDirectorTaskClientLiveTest") -public class BlueLockVCloudDirectorTaskClientLiveTest extends TaskClientLiveTest { +@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudDirectorTaskClientLiveTest") +public class BluelockVCloudDirectorTaskClientLiveTest extends TaskClientLiveTest { - public BlueLockVCloudDirectorTaskClientLiveTest() { + public BluelockVCloudDirectorTaskClientLiveTest() { provider = "bluelock-vcdirector"; } } \ No newline at end of file diff --git a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorVAppClientLiveTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorVAppClientLiveTest.java index 1eda321235..12d258a015 100644 --- a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorVAppClientLiveTest.java +++ b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorVAppClientLiveTest.java @@ -26,10 +26,10 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BlueLockVCloudDirectorVAppClientLiveTest") -public class BlueLockVCloudDirectorVAppClientLiveTest extends VAppClientLiveTest { +@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudDirectorVAppClientLiveTest") +public class BluelockVCloudDirectorVAppClientLiveTest extends VAppClientLiveTest { - public BlueLockVCloudDirectorVAppClientLiveTest() { + public BluelockVCloudDirectorVAppClientLiveTest() { provider = "bluelock-vcdirector"; } } \ No newline at end of file diff --git a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorVAppTemplateClientLiveTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorVAppTemplateClientLiveTest.java index e1885fc9a0..02700fab35 100644 --- a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorVAppTemplateClientLiveTest.java +++ b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorVAppTemplateClientLiveTest.java @@ -26,10 +26,10 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BlueLockVCloudDirectorVAppTemplateClientLiveTest") -public class BlueLockVCloudDirectorVAppTemplateClientLiveTest extends VAppTemplateClientLiveTest { +@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudDirectorVAppTemplateClientLiveTest") +public class BluelockVCloudDirectorVAppTemplateClientLiveTest extends VAppTemplateClientLiveTest { - public BlueLockVCloudDirectorVAppTemplateClientLiveTest() { + public BluelockVCloudDirectorVAppTemplateClientLiveTest() { provider = "bluelock-vcdirector"; } } \ No newline at end of file diff --git a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorVDCClientLiveTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorVDCClientLiveTest.java index d9614840a0..3dff1a957d 100644 --- a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorVDCClientLiveTest.java +++ b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorVDCClientLiveTest.java @@ -26,10 +26,10 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BlueLockVCloudDirectorVDCClientLiveTest") -public class BlueLockVCloudDirectorVDCClientLiveTest extends VDCClientLiveTest { +@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudDirectorVDCClientLiveTest") +public class BluelockVCloudDirectorVDCClientLiveTest extends VDCClientLiveTest { - public BlueLockVCloudDirectorVDCClientLiveTest() { + public BluelockVCloudDirectorVDCClientLiveTest() { provider = "bluelock-vcdirector"; } } \ No newline at end of file diff --git a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorVmClientLiveTest.java b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorVmClientLiveTest.java index d8c3199c43..fdb44fcd77 100644 --- a/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorVmClientLiveTest.java +++ b/providers/bluelock-vcdirector/src/test/java/org/jclouds/vcloud/bluelock/features/BlueLockVCloudDirectorVmClientLiveTest.java @@ -26,10 +26,10 @@ import org.testng.annotations.Test; * * @author Adrian Cole */ -@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BlueLockVCloudDirectorVmClientLiveTest") -public class BlueLockVCloudDirectorVmClientLiveTest extends VmClientLiveTest { +@Test(groups = "live", enabled = true, singleThreaded = true, testName = "BluelockVCloudDirectorVmClientLiveTest") +public class BluelockVCloudDirectorVmClientLiveTest extends VmClientLiveTest { - public BlueLockVCloudDirectorVmClientLiveTest() { + public BluelockVCloudDirectorVmClientLiveTest() { provider = "bluelock-vcdirector"; }