Fixes for multiple ports in load balancer

Daniel Vega · Daniel Vega · commit d88d75bdb152 · 2015-03-17T18:39:30.000-03:00
diff --git a/plugins/network-elements/globonetwork/src/com/globo/globonetwork/cloudstack/manager/GloboNetworkManager.java b/plugins/network-elements/globonetwork/src/com/globo/globonetwork/cloudstack/manager/GloboNetworkManager.java
@@ -1936,14 +1936,11 @@ public boolean applyLbRuleInGloboNetwork(final Network network, final LoadBalanc
 
             // Port mapping
             List<String> ports = new ArrayList<String>();
-            List<String> realPorts = new ArrayList<String>();
             ports.add(rule.getSourcePortStart() + ":" + rule.getDefaultPortStart());
-            realPorts.add(String.valueOf(rule.getDefaultPortStart()));
             if (rule.getAdditionalPortMap() != null) {
                 for (String portMap : rule.getAdditionalPortMap()) {
                     // Right format of ports has already been validated in validateLBRule()
                     ports.add(portMap);
-                    realPorts.add(portMap.split(":")[1]);
                 }
             }
 
@@ -1956,7 +1953,7 @@ public boolean applyLbRuleInGloboNetwork(final Network network, final LoadBalanc
                         GloboNetworkVipResponse.Real real = new GloboNetworkVipResponse.Real();
                         real.setIp(destVM.getIpAddress());
                         real.setVmName(getEquipNameFromUuid(vm.getUuid()));
-                        real.setPorts(realPorts);
+                        real.setPorts(ports);
                         real.setRevoked(destVM.isRevoked());
 
                         GloboNetworkNetworkVO globoNetworkRealNetworkVO = _globoNetworkNetworkDao.findByNetworkId(destVM.getNetworkId());
@@ -2103,8 +2100,8 @@ public boolean validateLBRule(Network network, LoadBalancingRule rule) {
                 if (portMapArray.length != 2) {
                     throw new InvalidParameterValueException("Additional port mapping is invalid, should be in the form '80:8080,443:8443'");
                 }
-                Integer lbPort = Integer.valueOf(portMapArray[0]);
-                Integer realPort = Integer.valueOf(portMapArray[1]);
+                Integer lbPort = Integer.valueOf(portMapArray[0].trim());
+                Integer realPort = Integer.valueOf(portMapArray[1].trim());
                 if (portsAlreadyMapped.contains(lbPort)) {
                     throw new InvalidParameterValueException("Additional port mapping is invalid. Duplicated Load Balancer port");
                 }
diff --git a/plugins/network-elements/globonetwork/src/com/globo/globonetwork/cloudstack/resource/GloboNetworkResource.java b/plugins/network-elements/globonetwork/src/com/globo/globonetwork/cloudstack/resource/GloboNetworkResource.java
@@ -706,8 +706,8 @@ public Answer execute(AddOrRemoveVipInGloboNetworkCommand cmd) {
                     RealIP realIP = new RealIP();
                     realIP.setName(real.getVmName());
                     realIP.setRealIp(real.getIp());
-
-                    realIP.setRealPort(Integer.valueOf(port));
+                    realIP.setVipPort(Integer.valueOf(port.split(":")[0]));
+                    realIP.setRealPort(Integer.valueOf(port.split(":")[1]));
                     realIP.setIpId(ip.getId());
                     realsIp.add(realIP);
 
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -1972,6 +1972,17 @@ private LoadBalancingRule getLoadBalancerRuleToApply(LoadBalancerVO lb) {
         }
         loadBalancing.setAdditionalNetworks(additionalNetworks);
 
+        List<String> additionalPorts = new ArrayList<String>();
+        List<LoadBalancerPortMapVO> lbPortMaps = ApiDBUtils.listLoadBalancerAdditionalPorts(lb.getId());
+        if (lbPortMaps != null) {
+            for (LoadBalancerPortMapVO lbPortMap : lbPortMaps) {
+                if (lbPortMap.getLoadBalancerId() == lb.getId()) { // FIXME Double-check lbID because query doesn't seem to be working
+                    additionalPorts.add(lbPortMap.getPublicPort() + ":" + lbPortMap.getPrivatePort());
+                }
+            }
+        }
+        loadBalancing.setAdditionalPortMap(additionalPorts);
+
         List<LbHealthCheckPolicy> hcPolicyList = getHealthCheckPolicies(lb.getId());
         loadBalancing.setHealthCheckPolicies(hcPolicyList);
 
