You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/03/07 12:33:42 UTC

[1/2] brooklyn-server git commit: Fix hostname resolving for jclouds locations

Repository: brooklyn-server
Updated Branches:
  refs/heads/master ba57efa39 -> 52766279e


Fix hostname resolving for jclouds locations

* don't initialize hostname directly from the node
* correct lazy hostname initialization logic


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/737a77ed
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/737a77ed
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/737a77ed

Branch: refs/heads/master
Commit: 737a77ed58de5432e2b74fe0582ed2344571c272
Parents: 972854a
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Feb 29 18:17:04 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Feb 29 18:17:04 2016 +0200

----------------------------------------------------------------------
 locations/jclouds/pom.xml                                 | 10 ++++++++++
 .../location/jclouds/JcloudsSshMachineLocation.java       |  3 +--
 .../location/jclouds/JcloudsAddressesLiveTest.java        |  2 +-
 .../location/jclouds/RebindJcloudsLocationLiveTest.java   |  5 +++--
 4 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/737a77ed/locations/jclouds/pom.xml
----------------------------------------------------------------------
diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml
index 5db6ce7..2fcf96f 100644
--- a/locations/jclouds/pom.xml
+++ b/locations/jclouds/pom.xml
@@ -206,5 +206,15 @@
             <artifactId>mockito-all</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <!-- 
+                jsr311 excluded above, this module is JAX-RS version independent. Version decided at user.
+                For tests running in the module still need to use a specific dependency - use JAX-RS 2.0 as
+                that's what is used in standard build.
+            -->
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/737a77ed/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
index cddc98b..ffae5c6 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
@@ -197,7 +197,6 @@ public class JcloudsSshMachineLocation extends SshMachineLocation implements Jcl
         imageId = node.getImageId();
         privateAddresses = node.getPrivateAddresses();
         publicAddresses = node.getPublicAddresses();
-        hostname = node.getHostname();
         _node = Optional.of(node);
     }
 
@@ -281,7 +280,7 @@ public class JcloudsSshMachineLocation extends SshMachineLocation implements Jcl
         // was wrong on some clouds (e.g. vcloud-director, where VMs are often given a random 
         // hostname that does not resolve on the VM and is not in any DNS).
         // Now delegates to jcloudsParent.getPublicHostname(node).
-        if (privateHostname == null) {
+        if (hostname == null) {
             Optional<NodeMetadata> node = getOptionalNode();
             if (node.isPresent()) {
                 HostAndPort sshHostAndPort = getSshHostAndPort();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/737a77ed/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsAddressesLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsAddressesLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsAddressesLiveTest.java
index 4a91255..70e1bde 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsAddressesLiveTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsAddressesLiveTest.java
@@ -80,8 +80,8 @@ public class JcloudsAddressesLiveTest extends AbstractJcloudsLiveTest {
         Set<String> publicAddresses = machine.getPublicAddresses();
         Set<String> privateAddresses = machine.getPrivateAddresses();
         String subnetIp = machine.getSubnetIp();
-        String hostname = machine.getHostname();
         String subnetHostname = machine.getSubnetHostname();
+        String hostname = machine.getHostname();
         String msg = "locationAddress="+locationAddress+"; address="+address+"; publicAddrs="+publicAddresses+"; privateAddrs="+privateAddresses+"; subnetIp="+subnetIp+"; hostname="+hostname+"; subnetHostname="+subnetHostname;
         LOG.info("node: "+msg);
 

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/737a77ed/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java
index 57c803c..de2c2ec 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/RebindJcloudsLocationLiveTest.java
@@ -156,7 +156,8 @@ public class RebindJcloudsLocationLiveTest extends AbstractJcloudsLiveTest {
         assertEquals(machine2.getPrivateAddresses(), ImmutableSet.of("10.144.66.5"), errmsg);
         assertEquals(machine2.getPublicAddresses(), ImmutableSet.of("54.254.23.53"), errmsg);
         assertEquals(machine2.getPrivateAddress(), Optional.of("10.144.66.5"), errmsg);
-        assertEquals(machine2.getHostname(), "ip-10-144-66-5", errmsg); // TODO would prefer the hostname that works inside and out
+        assertEquals(machine2.getSubnetHostname(), "10.144.66.5", errmsg);
+        assertEquals(machine2.getHostname(), "54.254.23.53", errmsg);
         assertEquals(machine2.getOsDetails().isWindows(), false, errmsg);
         assertEquals(machine2.getOsDetails().isLinux(), true, errmsg);
         assertEquals(machine2.getOsDetails().isMac(), false, errmsg);
@@ -188,7 +189,7 @@ public class RebindJcloudsLocationLiveTest extends AbstractJcloudsLiveTest {
         assertEquals(machine3.getPrivateAddresses(), ImmutableSet.of("10.144.66.5"), errmsg);
         assertEquals(machine3.getPublicAddresses(), ImmutableSet.of("54.254.23.53"), errmsg);
         assertEquals(machine3.getPrivateAddress(), Optional.of("10.144.66.5"), errmsg);
-        assertEquals(machine3.getHostname(), "ip-10-144-66-5", errmsg); // TODO would prefer the hostname that works inside and out
+        assertEquals(machine3.getHostname(), "54.254.23.53", errmsg);
         
         // The VM is no longer running, so won't be able to infer OS Details.
         assertFalse(machine3.getOptionalOsDetails().isPresent(), errmsg);


[2/2] brooklyn-server git commit: This closes #43

Posted by he...@apache.org.
This closes #43


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/52766279
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/52766279
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/52766279

Branch: refs/heads/master
Commit: 52766279e1355d7aea29bee969a8718eca615012
Parents: ba57efa 737a77e
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Mar 7 11:33:20 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Mar 7 11:33:20 2016 +0000

----------------------------------------------------------------------
 locations/jclouds/pom.xml                                 | 10 ++++++++++
 .../location/jclouds/JcloudsSshMachineLocation.java       |  3 +--
 .../location/jclouds/JcloudsAddressesLiveTest.java        |  2 +-
 .../location/jclouds/RebindJcloudsLocationLiveTest.java   |  5 +++--
 4 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------