CLOUDSTACK-6353 Fixed listing vm ip details for lb rule

Jayapal · Jayapal · commit e6e4fe4d2695 · 2014-04-08T12:56:02.000+05:30
diff --git a/api/src/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java
@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.api.response.LoadBalancerRuleVmMapResponse;
 import org.apache.log4j.Logger;
 
@@ -75,7 +76,9 @@ public void execute(){
                     LoadBalancerRuleVmMapResponse lbRuleVmIpResponse = new LoadBalancerRuleVmMapResponse();
                     vmResponses.get(i).setServiceState(serviceStates.get(i));
                     lbRuleVmIpResponse.setUserVmResponse(vmResponses.get(i));
-                    lbRuleVmIpResponse.setIpAddr(_lbService.listLbVmIpAddress(getId(), result.get(i).getId()));
+                    //get vm id from the uuid
+                    VirtualMachine lbvm = _entityMgr.findByUuid(VirtualMachine.class, vmResponses.get(i).getId());
+                    lbRuleVmIpResponse.setIpAddr(_lbService.listLbVmIpAddress(getId(), lbvm.getId()));
                     lbRuleVmIpResponse.setObjectName("lbrulevmidip");
                     listlbVmRes.add(lbRuleVmIpResponse);
                 }
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -1044,6 +1044,11 @@ public boolean assignToLoadBalancer(long loadBalancerId, List<Long> instanceIds,
                 vmIpsList.add(priIp);
                 vmIdIpMap.put(instanceId, vmIpsList);
             } else {
+                // skip the primary ip from vm secondary ip comparisions
+                if (vmIpsList.contains(priIp)) {
+                    vmIpsList.remove(priIp);
+                }
+
                 //check if the ips belongs to nic secondary ip
                 for (String ip: vmIpsList) {
                     if(_nicSecondaryIpDao.findByIp4AddressAndNicId(ip,nicInSameNetwork.getId()) == null) {
