Repository: brooklyn-server Updated Branches: refs/heads/master 8c60da27e -> e224f80b6
Add AbstractJcloudsStubbedLiveTest.getLocationSpec Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e6f4708c Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e6f4708c Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e6f4708c Branch: refs/heads/master Commit: e6f4708cddc643ee6dc9239a9b1e9cbf41486433 Parents: 8c60da2 Author: Aled Sage <aled.s...@gmail.com> Authored: Wed Apr 27 23:38:48 2016 +0100 Committer: Aled Sage <aled.s...@gmail.com> Committed: Thu Apr 28 14:05:31 2016 +0100 ---------------------------------------------------------------------- .../location/jclouds/AbstractJcloudsStubbedLiveTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e6f4708c/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsStubbedLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsStubbedLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsStubbedLiveTest.java index cb2334a..c885197 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsStubbedLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsStubbedLiveTest.java @@ -115,7 +115,7 @@ public abstract class AbstractJcloudsStubbedLiveTest extends AbstractJcloudsLive } }; jcloudsLocation = (JcloudsLocation) managementContext.getLocationRegistry().getLocationManaged( - LOCATION_SPEC, + getLocationSpec(), jcloudsLocationConfig(ImmutableMap.<Object, Object>of( JcloudsLocationConfig.COMPUTE_SERVICE_REGISTRY, computeServiceRegistry, JcloudsLocationConfig.WAIT_FOR_SSHABLE, "false"))); @@ -127,6 +127,11 @@ public abstract class AbstractJcloudsStubbedLiveTest extends AbstractJcloudsLive protected Map<Object, Object> jcloudsLocationConfig(Map<Object, Object> defaults) { return defaults; } + + // For overriding + protected String getLocationSpec() { + return LOCATION_SPEC; + } protected abstract NodeCreator newNodeCreator(); }
