Repository: jclouds-labs Updated Branches: refs/heads/master 61e5651be -> d68a2d37c
Expose the Trackables utility to users Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/d68a2d37 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/d68a2d37 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/d68a2d37 Branch: refs/heads/master Commit: d68a2d37c079048ae2ce60b3bc5d96166e11bdf1 Parents: 61e5651 Author: Ignasi Barrera <[email protected]> Authored: Mon Oct 31 15:08:20 2016 +0100 Committer: Ignasi Barrera <[email protected]> Committed: Mon Oct 31 15:08:20 2016 +0100 ---------------------------------------------------------------------- .../profitbricks/rest/ProfitBricksApi.java | 5 +++ .../rest/features/DataCenterApiLiveTest.java | 1 - .../rest/internal/BaseProfitBricksLiveTest.java | 36 ++++++++++---------- 3 files changed, 23 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/d68a2d37/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/ProfitBricksApi.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/ProfitBricksApi.java b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/ProfitBricksApi.java index dc14b12..620f28c 100644 --- a/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/ProfitBricksApi.java +++ b/profitbricks-rest/src/main/java/org/apache/jclouds/profitbricks/rest/ProfitBricksApi.java @@ -33,6 +33,7 @@ import org.apache.jclouds.profitbricks.rest.features.NicApi; import org.apache.jclouds.profitbricks.rest.features.ServerApi; import org.apache.jclouds.profitbricks.rest.features.SnapshotApi; import org.apache.jclouds.profitbricks.rest.features.VolumeApi; +import org.apache.jclouds.profitbricks.rest.util.Trackables; import org.jclouds.Fallbacks; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.http.functions.ParseJson; @@ -44,11 +45,15 @@ import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.annotations.ResponseParser; import com.google.common.annotations.Beta; +import com.google.inject.Provides; import com.google.inject.TypeLiteral; @Beta public interface ProfitBricksApi extends Closeable { + @Provides + Trackables trackables(); + @Delegate DataCenterApi dataCenterApi(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/d68a2d37/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/DataCenterApiLiveTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/DataCenterApiLiveTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/DataCenterApiLiveTest.java index 852d66a..27938dd 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/DataCenterApiLiveTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/DataCenterApiLiveTest.java @@ -73,7 +73,6 @@ public class DataCenterApiLiveTest extends BaseProfitBricksLiveTest { DataCenter dataCenter = createDataCenter(); dataCenterApi().delete(dataCenter.id()); dataCenter = getDataCenter(dataCenter.id()); - //assertEquals(dataCenter, null); } @Test http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/d68a2d37/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/internal/BaseProfitBricksLiveTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/internal/BaseProfitBricksLiveTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/internal/BaseProfitBricksLiveTest.java index 3cacf09..c741888 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/internal/BaseProfitBricksLiveTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/internal/BaseProfitBricksLiveTest.java @@ -16,25 +16,22 @@ */ package org.apache.jclouds.profitbricks.rest.internal; -import com.google.common.base.Joiner; -import com.google.common.base.Predicate; -import com.google.common.collect.ImmutableSet; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.Module; -import com.google.inject.TypeLiteral; -import com.google.inject.name.Names; +import static org.apache.jclouds.profitbricks.rest.config.ProfitBricksComputeProperties.POLL_PREDICATE_DATACENTER; +import static org.apache.jclouds.profitbricks.rest.domain.Location.US_LAS; +import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_RUNNING; +import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_SUSPENDED; +import static org.testng.Assert.assertTrue; + import java.net.URI; import java.util.Properties; import java.util.concurrent.TimeUnit; + import org.apache.jclouds.profitbricks.rest.ProfitBricksApi; import org.apache.jclouds.profitbricks.rest.compute.config.ProfitBricksComputeServiceContextModule.ComputeConstants; -import static org.apache.jclouds.profitbricks.rest.config.ProfitBricksComputeProperties.POLL_PREDICATE_DATACENTER; import org.apache.jclouds.profitbricks.rest.config.ProfitBricksRateLimitModule; import org.apache.jclouds.profitbricks.rest.domain.DataCenter; import org.apache.jclouds.profitbricks.rest.domain.LicenceType; import org.apache.jclouds.profitbricks.rest.domain.Location; -import static org.apache.jclouds.profitbricks.rest.domain.Location.US_LAS; import org.apache.jclouds.profitbricks.rest.domain.Nic; import org.apache.jclouds.profitbricks.rest.domain.Server; import org.apache.jclouds.profitbricks.rest.domain.State; @@ -43,12 +40,17 @@ import org.apache.jclouds.profitbricks.rest.domain.Volume; import org.apache.jclouds.profitbricks.rest.domain.VolumeType; import org.apache.jclouds.profitbricks.rest.ids.ServerRef; import org.apache.jclouds.profitbricks.rest.ids.VolumeRef; -import org.apache.jclouds.profitbricks.rest.util.Trackables; import org.jclouds.apis.BaseApiLiveTest; -import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_RUNNING; -import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_SUSPENDED; import org.jclouds.util.Predicates2; -import static org.testng.Assert.assertTrue; + +import com.google.common.base.Joiner; +import com.google.common.base.Predicate; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.Module; +import com.google.inject.TypeLiteral; +import com.google.inject.name.Names; public class BaseProfitBricksLiveTest extends BaseApiLiveTest<ProfitBricksApi> { @@ -60,7 +62,6 @@ public class BaseProfitBricksLiveTest extends BaseApiLiveTest<ProfitBricksApi> { private Predicate<ServerRef> serverAvailable; private Predicate<ServerRef> serverRemoved; private Predicate<VolumeRef> volumeAvailable; - private Trackables trackables; ComputeConstants computeConstants; @@ -78,7 +79,6 @@ public class BaseProfitBricksLiveTest extends BaseApiLiveTest<ProfitBricksApi> { Injector injector = newBuilder().modules(modules).overrides(props).buildInjector(); computeConstants = injector.getInstance(ComputeConstants.class); - trackables = injector.getInstance(Trackables.class); dataCenterAvailable = injector.getInstance( Key.get(new TypeLiteral<Predicate<String>>() { @@ -176,11 +176,11 @@ public class BaseProfitBricksLiveTest extends BaseApiLiveTest<ProfitBricksApi> { } protected void assertRequestCompleted(URI uri) { - trackables.waitUntilRequestCompleted(uri); + api.trackables().waitUntilRequestCompleted(uri); } protected void assertRequestCompleted(Trackable trackable) { - trackables.waitUntilRequestCompleted(trackable); + api.trackables().waitUntilRequestCompleted(trackable); } protected void assertNicAvailable(Nic nic) {
