You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/07/24 14:39:29 UTC
[1/2] brooklyn-library git commit: use new reachable localhost
Repository: brooklyn-library
Updated Branches:
refs/heads/master 2420536d6 -> 2b7d2ba17
use new reachable localhost
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/a1b117c1
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/a1b117c1
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/a1b117c1
Branch: refs/heads/master
Commit: a1b117c1634471c499b388a599cd387425769283
Parents: 2420536
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Jul 19 13:44:38 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Jul 19 13:44:38 2017 +0100
----------------------------------------------------------------------
.../brooklyn/entity/database/mysql/MySqlIntegrationTest.java | 2 +-
.../brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java | 2 +-
.../entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a1b117c1/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlIntegrationTest.java
index 139a1e7..f1aa3b7 100644
--- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlIntegrationTest.java
+++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlIntegrationTest.java
@@ -46,7 +46,7 @@ public class MySqlIntegrationTest extends BrooklynAppLiveTestSupport {
public static final Logger log = LoggerFactory.getLogger(MySqlIntegrationTest.class);
// can start in AWS by running this -- or use brooklyn CLI/REST for most clouds, or programmatic/config for set of fixed IP machines
- static String hostname = Networking.getLocalHost().getHostName();
+ static String hostname = Networking.getReachableLocalHost().getHostName();
// From http://www.vogella.de/articles/MySQLJava/article.html
// Expects COMMENTS to be injected as the test.table.name config value, for VogellaExampleAccess to work.
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a1b117c1/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java
index 75c6c2f..74960bd 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java
@@ -61,7 +61,7 @@ public class GeoscalingIntegrationTest extends BrooklynAppUnitTestSupport {
private final String primaryDomain = "geopaas.org";//"domain"+((int)(Math.random()*10000))+".test.org";
private final String subDomain = "subdomain"+((int)(Math.random()*10000));
- private final InetAddress addrWithGeo = Networking.getLocalHost();
+ private final InetAddress addrWithGeo = Networking.getReachableLocalHost();
private final InetAddress addrWithoutGeo = Networking.getInetAddressWithFixedName(StubHostGeoLookup.HOMELESS_IP);
private TestEntity target;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a1b117c1/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java
index cc59721..701e80a 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java
@@ -92,7 +92,7 @@ public class NginxRebindWithHaIntegrationTest extends RebindTestFixtureWithApp {
public void setUp() throws Exception {
super.setUp();
loc = origManagementContext.getLocationManager().createLocation(LocationSpec.create(LocalhostMachineProvisioningLocation.class)
- .configure("address", Networking.getLocalHost())
+ .configure("address", Networking.getReachableLocalHost())
.configure(SshMachineLocation.SSH_TOOL_CLASS, RecordingSshjTool.class.getName()));
executor = Executors.newCachedThreadPool();
[2/2] brooklyn-library git commit: This closes #121
Posted by dr...@apache.org.
This closes #121
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/2b7d2ba1
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/2b7d2ba1
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/2b7d2ba1
Branch: refs/heads/master
Commit: 2b7d2ba17637c289892080c48777f2789bcde6e7
Parents: 2420536 a1b117c
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Mon Jul 24 15:39:23 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Mon Jul 24 15:39:23 2017 +0100
----------------------------------------------------------------------
.../brooklyn/entity/database/mysql/MySqlIntegrationTest.java | 2 +-
.../brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java | 2 +-
.../entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------