You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/10/05 22:21:05 UTC
[1/2] brooklyn-server git commit: Fix
JcloudsByonLocationResolverStubbedTest
Repository: brooklyn-server
Updated Branches:
refs/heads/master adf71d7f4 -> fcb325a16
Fix JcloudsByonLocationResolverStubbedTest
Was taking a very long time, because trying to find a reachable address
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/66c4ed0e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/66c4ed0e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/66c4ed0e
Branch: refs/heads/master
Commit: 66c4ed0e666bdb9b1f1ad8b4ec70b1eb18f3907e
Parents: adf71d7
Author: Aled Sage <al...@gmail.com>
Authored: Wed Oct 5 23:18:46 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Oct 5 23:18:46 2016 +0100
----------------------------------------------------------------------
.../jclouds/JcloudsByonLocationResolverStubbedTest.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/66c4ed0e/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedTest.java
index 45cd0d1..a3d7177 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedTest.java
@@ -93,8 +93,10 @@ public class JcloudsByonLocationResolverStubbedTest extends AbstractJcloudsStubb
@Test
public void testResolvesHostInSpec() throws Exception {
String spec = "jcloudsByon:(provider=\""+SOFTLAYER_PROVIDER+"\",region=\""+SOFTLAYER_AMS01_REGION_NAME+"\",user=\"myuser\",password=\"mypassword\",hosts=\""+nodeId+"\")";
- Map<?,?> specFlags = ImmutableMap.of(JcloudsLocationConfig.COMPUTE_SERVICE_REGISTRY, computeServiceRegistry);
-
+ Map<?,?> specFlags = ImmutableMap.of(
+ JcloudsLocationConfig.COMPUTE_SERVICE_REGISTRY, computeServiceRegistry,
+ JcloudsLocation.POLL_FOR_FIRST_REACHABLE_ADDRESS, "false");
+
FixedListMachineProvisioningLocation<MachineLocation> location = getLocationManaged(spec, specFlags);
JcloudsSshMachineLocation machine = (JcloudsSshMachineLocation) Iterables.getOnlyElement(location.getAllMachines());
@@ -126,6 +128,7 @@ public class JcloudsByonLocationResolverStubbedTest extends AbstractJcloudsStubb
String spec = "jcloudsByon:(provider=\""+SOFTLAYER_PROVIDER+"\",region=\""+SOFTLAYER_AMS01_REGION_NAME+"\")";
Map<?,?> specFlags = ImmutableMap.of(
JcloudsLocationConfig.COMPUTE_SERVICE_REGISTRY, computeServiceRegistry,
+ JcloudsLocation.POLL_FOR_FIRST_REACHABLE_ADDRESS, "false",
"hosts", hostsValInFlags);
FixedListMachineProvisioningLocation<MachineLocation> location = getLocationManaged(spec, specFlags);
@@ -138,7 +141,9 @@ public class JcloudsByonLocationResolverStubbedTest extends AbstractJcloudsStubb
public void testLocationSpecDoesNotCreateMachines() throws Exception {
Collection<Location> before = managementContext.getLocationManager().getLocations();
String spec = "jcloudsByon:(provider=\""+SOFTLAYER_PROVIDER+"\",region=\""+SOFTLAYER_AMS01_REGION_NAME+"\",user=\"myname\",hosts=\""+nodeId+"\")";
- Map<?,?> specFlags = ImmutableMap.of(JcloudsLocationConfig.COMPUTE_SERVICE_REGISTRY, computeServiceRegistry);
+ Map<?,?> specFlags = ImmutableMap.of(
+ JcloudsLocationConfig.COMPUTE_SERVICE_REGISTRY, computeServiceRegistry,
+ JcloudsLocation.POLL_FOR_FIRST_REACHABLE_ADDRESS, "false");
@SuppressWarnings("unused")
LocationSpec<FixedListMachineProvisioningLocation<MachineLocation>> locationSpec = getLocationSpec(spec, specFlags);
[2/2] brooklyn-server git commit: This closes #372
Posted by al...@apache.org.
This closes #372
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/fcb325a1
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/fcb325a1
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/fcb325a1
Branch: refs/heads/master
Commit: fcb325a16d4c1ba5ec5f4e1b1c0efde8f00bc433
Parents: adf71d7 66c4ed0
Author: Aled Sage <al...@gmail.com>
Authored: Wed Oct 5 23:20:51 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Oct 5 23:20:51 2016 +0100
----------------------------------------------------------------------
.../jclouds/JcloudsByonLocationResolverStubbedTest.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------