From 7e28286dd083ce3ab55abd90fcc319218ba1c71a Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Mon, 28 Jun 2010 12:03:35 -0700 Subject: [PATCH] Issue 293: normalized on provider vocab --- .../compute/__providerName__ComputeServiceLiveTest.java | 4 ++-- .../aws/ec2/compute/EC2ComputeServiceLiveTest.java | 2 +- .../aws/ec2/compute/EC2LoadBalancerServiceLiveTest.java | 2 +- .../aws/ec2/compute/EucalyptusComputeServiceLiveTest.java | 2 +- .../jclouds/blobstore/BlobStoreContextFactoryTest.java | 8 ++++---- .../internal/BaseBlobStoreIntegrationTest.java | 2 +- .../org/jclouds/compute/BaseComputeServiceLiveTest.java | 8 ++++---- .../jclouds/compute/BaseLoadBalancerServiceLiveTest.java | 6 +++--- .../compute/StubComputeServiceIntegrationTest.java | 4 ++-- .../org/jclouds/gogrid/GoGridComputeServiceLiveTest.java | 4 ++-- .../compute/IBMDeveloperCloudComputeServiceLiveTest.java | 4 ++-- .../compute/CloudServersComputeServiceLiveTest.java | 4 ++-- .../miro/compute/RimuHostingComputeServiceLiveTest.java | 2 +- .../compute/BlueLockVCloudComputeServiceLiveTest.java | 2 +- .../vcloud/compute/VCloudComputeClientLiveTest.java | 4 ++-- .../vcloud/compute/VCloudComputeServiceLiveTest.java | 4 ++-- .../compute/HostingDotComVCloudComputeClientLiveTest.java | 2 +- .../HostingDotComVCloudComputeServiceLiveTest.java | 2 +- .../compute/TerremarkVCloudComputeServiceLiveTest.java | 4 ++-- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/archetypes/compute-service-archetype/src/main/resources/archetype-resources/src/test/java/compute/__providerName__ComputeServiceLiveTest.java b/archetypes/compute-service-archetype/src/main/resources/archetype-resources/src/test/java/compute/__providerName__ComputeServiceLiveTest.java index 0937bee3bc..25f181bab4 100644 --- a/archetypes/compute-service-archetype/src/main/resources/archetype-resources/src/test/java/compute/__providerName__ComputeServiceLiveTest.java +++ b/archetypes/compute-service-archetype/src/main/resources/archetype-resources/src/test/java/compute/__providerName__ComputeServiceLiveTest.java @@ -44,7 +44,7 @@ public class ${providerName}ComputeServiceLiveTest extends BaseComputeServiceLiv @BeforeClass @Override public void setServiceDefaults() { - service = "${lcaseProviderName}"; + provider = "${lcaseProviderName}"; } @Test @@ -64,7 +64,7 @@ public class ${providerName}ComputeServiceLiveTest extends BaseComputeServiceLiv public void testAssignability() throws Exception { @SuppressWarnings("unused") RestContext<${providerName}Client, ${providerName}AsyncClient> tmContext = new ComputeServiceContextFactory() - .createContext(service, user, password).getProviderSpecificContext(); + .createContext(provider, user, password).getProviderSpecificContext(); } } \ No newline at end of file diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2ComputeServiceLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2ComputeServiceLiveTest.java index 5e89b87af0..311e45b6be 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2ComputeServiceLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2ComputeServiceLiveTest.java @@ -52,7 +52,7 @@ public class EC2ComputeServiceLiveTest extends BaseComputeServiceLiveTest { @BeforeClass @Override public void setServiceDefaults() { - service = "ec2"; + provider = "ec2"; } @Override diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2LoadBalancerServiceLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2LoadBalancerServiceLiveTest.java index bc61cb062d..cd8e2ec2a5 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2LoadBalancerServiceLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2LoadBalancerServiceLiveTest.java @@ -53,7 +53,7 @@ public class EC2LoadBalancerServiceLiveTest extends BaseLoadBalancerServiceLiveT @BeforeClass @Override public void setServiceDefaults() { - service = "ec2"; + provider = "ec2"; } @Override diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EucalyptusComputeServiceLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EucalyptusComputeServiceLiveTest.java index f23f544e8e..13db7748d1 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EucalyptusComputeServiceLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EucalyptusComputeServiceLiveTest.java @@ -30,7 +30,7 @@ public class EucalyptusComputeServiceLiveTest extends EC2ComputeServiceLiveTest @BeforeClass @Override public void setServiceDefaults() { - service = "eucalyptus"; + provider = "eucalyptus"; // security groups must be <30 characters tag = "euc"; } diff --git a/blobstore/src/test/java/org/jclouds/blobstore/BlobStoreContextFactoryTest.java b/blobstore/src/test/java/org/jclouds/blobstore/BlobStoreContextFactoryTest.java index 23c8740d1f..e02da6c49f 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/BlobStoreContextFactoryTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/BlobStoreContextFactoryTest.java @@ -38,8 +38,8 @@ import com.google.common.base.Splitter; public class BlobStoreContextFactoryTest { public void test() throws IOException { - URI blobStore = URI.create("service://identity:key@container/path"); - assertEquals(blobStore.getScheme(), "service"); + URI blobStore = URI.create("provider://identity:key@container/path"); + assertEquals(blobStore.getScheme(), "provider"); Iterator identityKey = Splitter.on(":").split( checkNotNull(blobStore.getUserInfo(), "userInfo")).iterator(); assertEquals(identityKey.next(), "identity"); @@ -49,8 +49,8 @@ public class BlobStoreContextFactoryTest { } public void testNoPassword() throws IOException { - URI blobStore = URI.create("service://identity@container/path"); - assertEquals(blobStore.getScheme(), "service"); + URI blobStore = URI.create("provider://identity@container/path"); + assertEquals(blobStore.getScheme(), "provider"); Iterator identityKey = Splitter.on(":").split( checkNotNull(blobStore.getUserInfo(), "userInfo")).iterator(); assertEquals(identityKey.next(), "identity"); diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java index 272a3333be..9e7cecbae5 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java @@ -305,7 +305,7 @@ public class BaseBlobStoreIntegrationTest { /** * requestor will create a container using the name returned from this. This method will take - * care not to exceed the maximum containers permitted by a service by deleting an existing + * care not to exceed the maximum containers permitted by a provider by deleting an existing * container first. * * @throws InterruptedException diff --git a/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java index 4dcaf066d7..cf1becc9a2 100755 --- a/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java @@ -85,7 +85,7 @@ public abstract class BaseComputeServiceLiveTest { @BeforeClass abstract public void setServiceDefaults(); - protected String service; + protected String provider; protected SshClient.Factory sshFactory; protected String tag; @@ -102,7 +102,7 @@ public abstract class BaseComputeServiceLiveTest { public void setupClient() throws InterruptedException, ExecutionException, TimeoutException, IOException { if (tag == null) - tag = checkNotNull(service, "service"); + tag = checkNotNull(provider, "provider"); setupCredentials(); setupKeyPair(); initializeContextAndClient(); @@ -147,7 +147,7 @@ public abstract class BaseComputeServiceLiveTest { if (context != null) context.close(); context = new ComputeServiceContextFactory() - .createContext(service, identity, credential, ImmutableSet.of( + .createContext(provider, identity, credential, ImmutableSet.of( new Log4JLoggingModule(), getSshModule())); client = context.getComputeService(); } @@ -168,7 +168,7 @@ public abstract class BaseComputeServiceLiveTest { // wait up to 5 seconds for an auth exception @Test(enabled = true, expectedExceptions = AuthorizationException.class) public void testCorrectAuthException() throws Exception { - new ComputeServiceContextFactory().createContext(service, "MOMMA", "MIA", + new ComputeServiceContextFactory().createContext(provider, "MOMMA", "MIA", ImmutableSet. of(new Log4JLoggingModule())).close(); } diff --git a/compute/src/test/java/org/jclouds/compute/BaseLoadBalancerServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/BaseLoadBalancerServiceLiveTest.java index 931e4633db..d9373b0ee0 100644 --- a/compute/src/test/java/org/jclouds/compute/BaseLoadBalancerServiceLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/BaseLoadBalancerServiceLiveTest.java @@ -60,7 +60,7 @@ public abstract class BaseLoadBalancerServiceLiveTest { @BeforeClass abstract public void setServiceDefaults(); - protected String service; + protected String provider; protected SshClient.Factory sshFactory; protected String tag; @@ -79,7 +79,7 @@ public abstract class BaseLoadBalancerServiceLiveTest { public void setupClient() throws InterruptedException, ExecutionException, TimeoutException, IOException, RunNodesException { if (tag == null) - tag = checkNotNull(service, "service") + "lb"; + tag = checkNotNull(provider, "provider") + "lb"; identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity"); credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential"); @@ -99,7 +99,7 @@ public abstract class BaseLoadBalancerServiceLiveTest { private void initializeContextAndClient() throws IOException { if (context != null) context.close(); - context = new ComputeServiceContextFactory().createContext(service, identity, credential, + context = new ComputeServiceContextFactory().createContext(provider, identity, credential, ImmutableSet.of(new Log4JLoggingModule(), getSshModule())); client = context.getComputeService(); lbClient = context.getLoadBalancerService(); diff --git a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java index cf0ee663aa..ebf13f79be 100644 --- a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java +++ b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java @@ -75,7 +75,7 @@ public class StubComputeServiceIntegrationTest extends @BeforeClass @Override public void setServiceDefaults() { - service = "stub"; + provider = "stub"; } @Override @@ -279,7 +279,7 @@ public class StubComputeServiceIntegrationTest extends public void testAssignability() throws Exception { @SuppressWarnings("unused") RestContext, ConcurrentMap> stubContext = new ComputeServiceContextFactory() - .createContext(service, identity, credential) + .createContext(provider, identity, credential) .getProviderSpecificContext(); } diff --git a/gogrid/src/test/java/org/jclouds/gogrid/GoGridComputeServiceLiveTest.java b/gogrid/src/test/java/org/jclouds/gogrid/GoGridComputeServiceLiveTest.java index a15cab02dc..125717206e 100644 --- a/gogrid/src/test/java/org/jclouds/gogrid/GoGridComputeServiceLiveTest.java +++ b/gogrid/src/test/java/org/jclouds/gogrid/GoGridComputeServiceLiveTest.java @@ -39,7 +39,7 @@ public class GoGridComputeServiceLiveTest extends BaseComputeServiceLiveTest { @BeforeClass @Override public void setServiceDefaults() { - service = "gogrid"; + provider = "gogrid"; } @Test @@ -59,6 +59,6 @@ public class GoGridComputeServiceLiveTest extends BaseComputeServiceLiveTest { public void testAssignability() throws Exception { @SuppressWarnings("unused") RestContext goGridContext = new ComputeServiceContextFactory() - .createContext(service, identity, credential).getProviderSpecificContext(); + .createContext(provider, identity, credential).getProviderSpecificContext(); } } diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTest.java b/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTest.java index 314b7679e6..98199c7119 100644 --- a/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTest.java +++ b/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTest.java @@ -43,7 +43,7 @@ public class IBMDeveloperCloudComputeServiceLiveTest extends BaseComputeServiceL @BeforeClass @Override public void setServiceDefaults() { - service = "ibmdev"; + provider = "ibmdev"; } @Test @@ -72,7 +72,7 @@ public class IBMDeveloperCloudComputeServiceLiveTest extends BaseComputeServiceL public void testAssignability() throws Exception { @SuppressWarnings("unused") RestContext tmContext = new ComputeServiceContextFactory() - .createContext(service, identity, credential).getProviderSpecificContext(); + .createContext(provider, identity, credential).getProviderSpecificContext(); } } \ No newline at end of file diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersComputeServiceLiveTest.java b/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersComputeServiceLiveTest.java index dedc946c15..70f26943cd 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersComputeServiceLiveTest.java +++ b/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersComputeServiceLiveTest.java @@ -49,7 +49,7 @@ public class CloudServersComputeServiceLiveTest extends BaseComputeServiceLiveTe @BeforeClass @Override public void setServiceDefaults() { - service = "cloudservers"; + provider = "cloudservers"; } @Test @@ -69,7 +69,7 @@ public class CloudServersComputeServiceLiveTest extends BaseComputeServiceLiveTe public void testAssignability() throws Exception { @SuppressWarnings("unused") RestContext tmContext = new ComputeServiceContextFactory() - .createContext(service, identity, credential).getProviderSpecificContext(); + .createContext(provider, identity, credential).getProviderSpecificContext(); } @Override diff --git a/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingComputeServiceLiveTest.java b/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingComputeServiceLiveTest.java index 9b2f812ed8..0cb833ab46 100755 --- a/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingComputeServiceLiveTest.java +++ b/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingComputeServiceLiveTest.java @@ -36,7 +36,7 @@ public class RimuHostingComputeServiceLiveTest extends BaseComputeServiceLiveTes @BeforeClass @Override public void setServiceDefaults() { - service = "rimuhosting"; + provider = "rimuhosting"; tag = "rimuhosting.jclouds"; } diff --git a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudComputeServiceLiveTest.java b/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudComputeServiceLiveTest.java index d1e5704b9e..1c15fd2ce4 100644 --- a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudComputeServiceLiveTest.java +++ b/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudComputeServiceLiveTest.java @@ -42,7 +42,7 @@ public class BlueLockVCloudComputeServiceLiveTest extends VCloudComputeServiceLi @BeforeClass @Override public void setServiceDefaults() { - service = "bluelock"; + provider = "bluelock"; } @Test diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeClientLiveTest.java b/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeClientLiveTest.java index 066005ef3e..ab1f4a231c 100644 --- a/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeClientLiveTest.java +++ b/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeClientLiveTest.java @@ -57,7 +57,7 @@ import com.google.inject.internal.ImmutableMap; */ @Test(groups = "live", enabled = true, sequential = true, testName = "vcloud.VCloudClientLiveTest") public class VCloudComputeClientLiveTest { - protected String service; + protected String provider; protected VCloudComputeClient computeClient; protected VCloudClient client; @@ -157,7 +157,7 @@ public class VCloudComputeClientLiveTest { })); expectationMap = ImmutableMap. builder().put(OsFamily.CENTOS, new Expectation(4194304 / 2 * 10, "Red Hat Enterprise Linux 5 (64-bit)")).build(); - service = "vcloudtest"; + provider = "vcloudtest"; templateId = "3"; } diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java b/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java index a350d6bc3e..4e67759563 100644 --- a/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java +++ b/vcloud/core/src/test/java/org/jclouds/vcloud/compute/VCloudComputeServiceLiveTest.java @@ -28,7 +28,7 @@ public class VCloudComputeServiceLiveTest extends BaseComputeServiceLiveTest { public void setServiceDefaults() { System.setProperty("vcloud.endpoint", checkNotNull(System .getProperty("jclouds.test.endpoint"), "jclouds.test.endpoint")); - service = "vcloud"; + provider = "vcloud"; } @Override @@ -39,7 +39,7 @@ public class VCloudComputeServiceLiveTest extends BaseComputeServiceLiveTest { public void testAssignability() throws Exception { @SuppressWarnings("unused") RestContext tmContext = new ComputeServiceContextFactory() - .createContext(service, identity, credential) + .createContext(provider, identity, credential) .getProviderSpecificContext(); } diff --git a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeClientLiveTest.java b/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeClientLiveTest.java index 0d59cd1675..c4b092c869 100644 --- a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeClientLiveTest.java +++ b/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeClientLiveTest.java @@ -61,7 +61,7 @@ public class HostingDotComVCloudComputeClientLiveTest extends VCloudComputeClien })); expectationMap = ImmutableMap. builder().put(OsFamily.CENTOS, new Expectation(4194304 / 2 * 10, "Red Hat Enterprise Linux 5 (64-bit)")).build(); - service = "vcloudtest"; + provider = "vcloudtest"; templateId = "3"; } diff --git a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeServiceLiveTest.java b/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeServiceLiveTest.java index f4225b499c..51bfb8fff4 100644 --- a/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeServiceLiveTest.java +++ b/vcloud/hostingdotcom/src/test/java/org/jclouds/vcloud/hostingdotcom/compute/HostingDotComVCloudComputeServiceLiveTest.java @@ -38,7 +38,7 @@ public class HostingDotComVCloudComputeServiceLiveTest extends VCloudComputeServ @BeforeClass @Override public void setServiceDefaults() { - service = "hostingdotcom"; + provider = "hostingdotcom"; } @Test diff --git a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeServiceLiveTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeServiceLiveTest.java index d6cf58fdcb..7e7ba63c1c 100644 --- a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeServiceLiveTest.java +++ b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeServiceLiveTest.java @@ -49,7 +49,7 @@ public class TerremarkVCloudComputeServiceLiveTest extends VCloudComputeServiceL String endpoint = System.getProperty("jclouds.test.endpoint"); if (endpoint != null && !"".equals(endpoint)) System.setProperty("terremark.endpoint", endpoint); - service = "terremark"; + provider = "terremark"; tag = "trmk"; } @@ -65,7 +65,7 @@ public class TerremarkVCloudComputeServiceLiveTest extends VCloudComputeServiceL public void testAssignability() throws Exception { @SuppressWarnings("unused") RestContext tmContext = new ComputeServiceContextFactory() - .createContext(service, identity, credential).getProviderSpecificContext(); + .createContext(provider, identity, credential).getProviderSpecificContext(); } @Override