Refactor aws lb extension
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2e47aa70 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2e47aa70 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2e47aa70 Branch: refs/heads/stratos-4.1.x Commit: 2e47aa70ac77874f2ba36a06dcae5ee27267195b Parents: d134a28 Author: gayangunarathne <[email protected]> Authored: Tue Dec 8 11:35:56 2015 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Fri Dec 25 17:09:20 2015 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/aws/extension/AWSLoadBalancer.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2e47aa70/extensions/load-balancer/modules/aws-extension/src/main/java/org/apache/stratos/aws/extension/AWSLoadBalancer.java ---------------------------------------------------------------------- diff --git a/extensions/load-balancer/modules/aws-extension/src/main/java/org/apache/stratos/aws/extension/AWSLoadBalancer.java b/extensions/load-balancer/modules/aws-extension/src/main/java/org/apache/stratos/aws/extension/AWSLoadBalancer.java index 1bfb10a..0274172 100644 --- a/extensions/load-balancer/modules/aws-extension/src/main/java/org/apache/stratos/aws/extension/AWSLoadBalancer.java +++ b/extensions/load-balancer/modules/aws-extension/src/main/java/org/apache/stratos/aws/extension/AWSLoadBalancer.java @@ -120,6 +120,8 @@ public class AWSLoadBalancer implements LoadBalancer { initialAvailabilityZones.add(region + zone); } } + + String loadBalancerDNSName = createAWSLoadBalancer(loadBalancerName, region, listenersForThisCluster,initialAvailabilityZones); @@ -141,8 +143,6 @@ public class AWSLoadBalancer implements LoadBalancer { cluster.getClusterId())); } clusterIdToLoadBalancerMap.put(cluster.getClusterId(), lbInfoDTO); - LoadBalancerInfo loadBalancerInfo = new LoadBalancerInfo(loadBalancerName, region); - clusterIdToLoadBalancerMap.put(cluster.getClusterId(),loadBalancerInfo); } pause(3000); @@ -276,10 +276,10 @@ public class AWSLoadBalancer implements LoadBalancer { private Boolean updateExistingLoadBalancer(Cluster cluster) { Boolean isUpdated=false; - LoadBalancerInfo loadBalancerInfo = clusterIdToLoadBalancerMap.get(cluster.getClusterId()); + LBInfoDTO lbInfoDTO = clusterIdToLoadBalancerMap.get(cluster.getClusterId()); - String loadBalancerName = loadBalancerInfo.getName(); - String region = loadBalancerInfo.getRegion(); + String loadBalancerName = lbInfoDTO.getName(); + String region = lbInfoDTO.getRegion(); // Get all the instances attached - Attach newly added instances to load balancer
