From 5d6e005e8bcfde26d09145ab6e94c1bf5c38aa27 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Tue, 24 Jul 2012 22:38:55 -0700 Subject: [PATCH] Issue 1030:defaults not picking up on compute.templateOptions() --- .../main/java/org/jclouds/ec2/compute/EC2ComputeService.java | 2 +- .../jclouds/openstack/nova/v2_0/compute/NovaComputeService.java | 2 +- .../trmk/vcloud_0_8/compute/TerremarkVCloudComputeService.java | 2 +- .../java/org/jclouds/compute/internal/BaseComputeService.java | 2 +- .../java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java | 2 +- .../java/org/jclouds/gogrid/compute/GoGridComputeService.java | 2 +- .../ecloud/compute/TerremarkECloudTemplateBuilderLiveTest.java | 2 +- .../compute/TerremarkVCloudExpressTemplateBuilderLiveTest.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java index 4a7d24bdd9..ef75d913fc 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java @@ -102,7 +102,7 @@ public class EC2ComputeService extends BaseComputeService { CreateNodesInGroupThenAddToSet runNodesAndAddToSetStrategy, RebootNodeStrategy rebootNodeStrategy, DestroyNodeStrategy destroyNodeStrategy, ResumeNodeStrategy startNodeStrategy, SuspendNodeStrategy stopNodeStrategy, Provider templateBuilderProvider, - Provider templateOptionsProvider, + @Named("DEFAULT") Provider templateOptionsProvider, @Named(TIMEOUT_NODE_RUNNING) Predicate> nodeRunning, @Named(TIMEOUT_NODE_TERMINATED) Predicate> nodeTerminated, @Named(TIMEOUT_NODE_SUSPENDED) Predicate> nodeSuspended, diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeService.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeService.java index b2c5b3a2c2..622644b8df 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeService.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeService.java @@ -97,7 +97,7 @@ public class NovaComputeService extends BaseComputeService { CreateNodesInGroupThenAddToSet runNodesAndAddToSetStrategy, RebootNodeStrategy rebootNodeStrategy, DestroyNodeStrategy destroyNodeStrategy, ResumeNodeStrategy startNodeStrategy, SuspendNodeStrategy stopNodeStrategy, Provider templateBuilderProvider, - Provider templateOptionsProvider, + @Named("DEFAULT") Provider templateOptionsProvider, @Named(TIMEOUT_NODE_RUNNING) Predicate> nodeRunning, @Named(TIMEOUT_NODE_TERMINATED) Predicate> nodeTerminated, @Named(TIMEOUT_NODE_SUSPENDED) Predicate> nodeSuspended, diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/TerremarkVCloudComputeService.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/TerremarkVCloudComputeService.java index ce6ee0f161..f65c503561 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/TerremarkVCloudComputeService.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/TerremarkVCloudComputeService.java @@ -78,7 +78,7 @@ public class TerremarkVCloudComputeService extends BaseComputeService { CreateNodesInGroupThenAddToSet runNodesAndAddToSetStrategy, RebootNodeStrategy rebootNodeStrategy, DestroyNodeStrategy destroyNodeStrategy, ResumeNodeStrategy resumeNodeStrategy, SuspendNodeStrategy suspendNodeStrategy, Provider templateBuilderProvider, - Provider templateOptionsProvider, + @Named("DEFAULT") Provider templateOptionsProvider, @Named(TIMEOUT_NODE_RUNNING) Predicate> nodeRunning, @Named(TIMEOUT_NODE_TERMINATED) Predicate> nodeTerminated, @Named(TIMEOUT_NODE_SUSPENDED) Predicate> nodeSuspended, diff --git a/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java b/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java index 92b07ac1af..65b422682c 100644 --- a/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java +++ b/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java @@ -152,7 +152,7 @@ public class BaseComputeService implements ComputeService { CreateNodesInGroupThenAddToSet runNodesAndAddToSetStrategy, RebootNodeStrategy rebootNodeStrategy, DestroyNodeStrategy destroyNodeStrategy, ResumeNodeStrategy resumeNodeStrategy, SuspendNodeStrategy suspendNodeStrategy, Provider templateBuilderProvider, - Provider templateOptionsProvider, + @Named("DEFAULT") Provider templateOptionsProvider, @Named(TIMEOUT_NODE_RUNNING) Predicate> nodeRunning, @Named(TIMEOUT_NODE_TERMINATED) Predicate> nodeTerminated, @Named(TIMEOUT_NODE_SUSPENDED) Predicate> nodeSuspended, diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java index b754e4b661..23d5c8775f 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java @@ -106,7 +106,7 @@ public class AWSEC2ComputeService extends EC2ComputeService { CreateNodesInGroupThenAddToSet runNodesAndAddToSetStrategy, RebootNodeStrategy rebootNodeStrategy, DestroyNodeStrategy destroyNodeStrategy, ResumeNodeStrategy startNodeStrategy, SuspendNodeStrategy stopNodeStrategy, Provider templateBuilderProvider, - Provider templateOptionsProvider, + @Named("DEFAULT") Provider templateOptionsProvider, @Named(TIMEOUT_NODE_RUNNING) Predicate> nodeRunning, @Named(TIMEOUT_NODE_TERMINATED) Predicate> nodeTerminated, @Named(TIMEOUT_NODE_SUSPENDED) Predicate> nodeSuspended, diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/GoGridComputeService.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/GoGridComputeService.java index c8efd53f1f..9daa0b05c7 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/GoGridComputeService.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/GoGridComputeService.java @@ -76,7 +76,7 @@ public class GoGridComputeService extends BaseComputeService { CreateNodesInGroupThenAddToSet runNodesAndAddToSetStrategy, RebootNodeStrategy rebootNodeStrategy, DestroyNodeStrategy destroyNodeStrategy, ResumeNodeStrategy resumeNodeStrategy, SuspendNodeStrategy suspendNodeStrategy, Provider templateBuilderProvider, - Provider templateOptionsProvider, + @Named("DEFAULT") Provider templateOptionsProvider, @Named(TIMEOUT_NODE_RUNNING) Predicate> nodeRunning, @Named(TIMEOUT_NODE_TERMINATED) Predicate> nodeTerminated, @Named(TIMEOUT_NODE_SUSPENDED) Predicate> nodeSuspended, diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/TerremarkECloudTemplateBuilderLiveTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/TerremarkECloudTemplateBuilderLiveTest.java index f25b8e058b..731972b376 100644 --- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/TerremarkECloudTemplateBuilderLiveTest.java +++ b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/compute/TerremarkECloudTemplateBuilderLiveTest.java @@ -39,7 +39,7 @@ import com.google.common.collect.ImmutableSet; * * @author Adrian Cole */ -@Test(groups = "live") +@Test(groups = "live", testName = "TerremarkECloudTemplateBuilderLiveTest") public class TerremarkECloudTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest { @Override protected Properties setupProperties() { diff --git a/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/compute/TerremarkVCloudExpressTemplateBuilderLiveTest.java b/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/compute/TerremarkVCloudExpressTemplateBuilderLiveTest.java index 6a2f989a6b..0bd3eca1b0 100644 --- a/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/compute/TerremarkVCloudExpressTemplateBuilderLiveTest.java +++ b/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/compute/TerremarkVCloudExpressTemplateBuilderLiveTest.java @@ -38,7 +38,7 @@ import com.google.common.collect.ImmutableSet; * * @author Adrian Cole */ -@Test(groups = "live") +@Test(groups = "live", testName = "TerremarkVCloudExpressTemplateBuilderLiveTest") public class TerremarkVCloudExpressTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest { public TerremarkVCloudExpressTemplateBuilderLiveTest() {