Renaming method findLoadBalancerIPList() to findLoadBalancerIps()
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7288794a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7288794a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7288794a Branch: refs/heads/stratos-4.1.x Commit: 7288794a2abab7620b52b7ee498243a312985a51 Parents: afbb25a Author: Imesh Gunaratne <[email protected]> Authored: Tue Oct 13 15:54:33 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Oct 13 15:54:33 2015 +0530 ---------------------------------------------------------------------- .../services/impl/CloudControllerServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7288794a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java index efbd002..9b067ba 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -1087,7 +1087,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { CloudControllerContext.getInstance().addClusterContext(clusterContext); // Create cluster object - List<String> loadBalancerIps = findLoadBalancerIPList(appId, appClusterCtxt); + List<String> loadBalancerIps = findLoadBalancerIps(appId, appClusterCtxt); Cluster cluster = new Cluster(appClusterCtxt.getCartridgeType(), appClusterCtxt.getClusterId(), appClusterCtxt.getDeploymentPolicyName(), appClusterCtxt.getAutoscalePolicyName(), appId); cluster.setLbCluster(false); @@ -1113,7 +1113,13 @@ public class CloudControllerServiceImpl implements CloudControllerService { return true; } - private List<String> findLoadBalancerIPList(String applicationId, ApplicationClusterContext applicationClusterContext) { + /** + * Find load balancer ips from application subscribable properties or network partition properties. + * @param applicationId + * @param applicationClusterContext + * @return + */ + private List<String> findLoadBalancerIps(String applicationId, ApplicationClusterContext applicationClusterContext) { Cartridge cartridge = CloudControllerContext.getInstance(). getCartridge(applicationClusterContext.getCartridgeType()); @@ -1125,6 +1131,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { org.apache.stratos.common.Properties appClusterContextProperties = applicationClusterContext.getProperties(); if(appClusterContextProperties != null) { + // Find load balancer ips from application subscribable properties Property ipListProperty = appClusterContextProperties.getProperty(CloudControllerConstants.LOAD_BALANCER_IPS); if (ipListProperty != null) { log.info(String.format("Load balancer IP list found in application: [application] %s [cluster] %s " + @@ -1133,6 +1140,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { return transformToList(ipListProperty); } + // Find load balancer ips from network partition properties Property npListProperty = appClusterContextProperties.getProperty(CloudControllerConstants.NETWORK_PARTITION_ID_LIST); if (npListProperty != null) { String npIdListStr = npListProperty.getValue();
