Repository: incubator-stratos
Updated Branches:
  refs/heads/master 4be49892f -> c578a5095


fixing ip retrieval - get the IP if and only if there's no assigned IP


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/fe9c0249
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/fe9c0249
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/fe9c0249

Branch: refs/heads/master
Commit: fe9c0249ba8eb8529ba1fc45cfe993e3684bda81
Parents: e2c5957
Author: Nirmal Fernando <[email protected]>
Authored: Fri Mar 21 19:46:11 2014 +0530
Committer: Nirmal Fernando <[email protected]>
Committed: Fri Mar 21 19:46:11 2014 +0530

----------------------------------------------------------------------
 .../apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fe9c0249/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
 
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
index 7378776..0241a62 100644
--- 
a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
+++ 
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
@@ -236,8 +236,7 @@ public class OpenstackNovaIaas extends Iaas {
 
                                                        @Override
                                                        public boolean 
apply(FloatingIP arg0) {
-                                                               // FIXME is 
this the correct filter?
-                                                               return 
arg0.getFixedIp() == null;
+                                                               return 
arg0.getInstanceId() == null;
                                                        }
 
                                                }));

Reply via email to