You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/26 13:54:52 UTC
git commit: updated refs/heads/4.4 to 9a730d4
Repository: cloudstack
Updated Branches:
refs/heads/4.4 244c361b5 -> 9a730d469
CLOUDSTACK-6353: Fix list to have correct LB IP for each rule
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit 0fe4acf525824650ea290f09edd5a71ed9e7b053)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9a730d46
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9a730d46
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9a730d46
Branch: refs/heads/4.4
Commit: 9a730d469c7d0baa51034761934791536260396e
Parents: 244c361
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Mar 26 18:20:59 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Mar 26 18:24:43 2015 +0530
----------------------------------------------------------------------
.../user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a730d46/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
index cc4203c..8827557 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
@@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.user.loadbalancer;
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;
@@ -129,7 +130,9 @@ public class ListLoadBalancerRuleInstancesCmd extends BaseListCmd {
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);
}