svn commit: r1365534 - in /whirr/trunk: CHANGES.txt core/src/main/java/org/apache/whirr/ClusterController.java core/src/main/java/org/apache/whirr/actions/BootstrapClusterAction.java core/src/main/java/org/apache/whirr/actions/ByonClusterAction.java

[asavu]

Author: asavu
Date: Wed Jul 25 11:45:39 2012
New Revision: 1365534

URL: http://svn.apache.org/viewvc?rev=1365534&view=rev
Log:
WHIRR-602. Cloud providers may only return private IPs (Andrew Bayer via asavu)

Modified:
    whirr/trunk/CHANGES.txt
    whirr/trunk/core/src/main/java/org/apache/whirr/ClusterController.java
    
whirr/trunk/core/src/main/java/org/apache/whirr/actions/BootstrapClusterAction.java
    
whirr/trunk/core/src/main/java/org/apache/whirr/actions/ByonClusterAction.java

Modified: whirr/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1365534&r1=1365533&r2=1365534&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Wed Jul 25 11:45:39 2012
@@ -145,6 +145,8 @@ Trunk (unreleased changes)
 
     WHIRR-601. Cassandra 1.0.8 download URL no longer valid (Andrew Bayer via 
asavu)
 
+    WHIRR-602. Cloud providers may only return "private" IPs (Andrew Bayer via 
asavu)
+
 Release 0.7.1 - 2012-02-23
 
   IMPROVEMENTS

Modified: whirr/trunk/core/src/main/java/org/apache/whirr/ClusterController.java
URL: 
http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/ClusterController.java?rev=1365534&r1=1365533&r2=1365534&view=diff
==============================================================================
--- whirr/trunk/core/src/main/java/org/apache/whirr/ClusterController.java 
(original)
+++ whirr/trunk/core/src/main/java/org/apache/whirr/ClusterController.java Wed 
Jul 25 11:45:39 2012
@@ -331,7 +331,7 @@ public class ClusterController {
     }
 
     return new Cluster.Instance(credentials, roles,
-      Iterables.getFirst(metadata.getPublicAddresses(), null),
+      Iterables.getFirst(metadata.getPublicAddresses().size() > 0 ? 
metadata.getPublicAddresses() : metadata.getPrivateAddresses(), null),
       Iterables.getFirst(metadata.getPrivateAddresses(), null),
       metadata.getId(), metadata);
   }

Modified: 
whirr/trunk/core/src/main/java/org/apache/whirr/actions/BootstrapClusterAction.java
URL: 
http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/actions/BootstrapClusterAction.java?rev=1365534&r1=1365533&r2=1365534&view=diff
==============================================================================
--- 
whirr/trunk/core/src/main/java/org/apache/whirr/actions/BootstrapClusterAction.java
 (original)
+++ 
whirr/trunk/core/src/main/java/org/apache/whirr/actions/BootstrapClusterAction.java
 Wed Jul 25 11:45:39 2012
@@ -140,7 +140,7 @@ public class BootstrapClusterAction exte
       @Override
       public Instance apply(NodeMetadata node) {
         return new Instance(node.getCredentials(), roles,
-            Iterables.get(node.getPublicAddresses(), 0),
+                            Iterables.get(node.getPublicAddresses().size() > 0 
? node.getPublicAddresses() : node.getPrivateAddresses(), 0),
             Iterables.get(node.getPrivateAddresses(), 0),
             node.getId(), node);
       }

Modified: 
whirr/trunk/core/src/main/java/org/apache/whirr/actions/ByonClusterAction.java
URL: 
http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/actions/ByonClusterAction.java?rev=1365534&r1=1365533&r2=1365534&view=diff
==============================================================================
--- 
whirr/trunk/core/src/main/java/org/apache/whirr/actions/ByonClusterAction.java 
(original)
+++ 
whirr/trunk/core/src/main/java/org/apache/whirr/actions/ByonClusterAction.java 
Wed Jul 25 11:45:39 2012
@@ -158,7 +158,7 @@ public class ByonClusterAction extends S
         new Function<NodeMetadata, Instance>() {
           @Override
           public Instance apply(NodeMetadata node) {
-            String publicIp = get(node.getPublicAddresses(), 0);
+            String publicIp = get(node.getPublicAddresses().size() > 0 ? 
node.getPublicAddresses() : node.getPrivateAddresses(), 0);
             return new Instance(
                 credentials, roles, publicIp, publicIp, node.getId(), node
             );