etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug CS-16167: Load Balancing Rules are not seen in the CloudStack GUI after Creation . 

Reviewed-by: Koushik Das

This fix ensures that public IP's allocated for ELB, system VM's, User VM's returned appropriatley
on listPublicIPAddresses command
This commit is contained in:
Murali Reddy 2012-08-30 15:10:46 +05:30
parent 4748c87349
commit bea69edd96
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -805,12 +805,14 @@ public class ApiResponseHelper implements ResponseGenerator {
if (ipAddr.getAssociatedWithVmId() != null) {
UserVm vm = ApiDBUtils.findUserVmById(ipAddr.getAssociatedWithVmId());
ipResponse.setVirtualMachineId(vm.getId());
ipResponse.setVirtualMachineName(vm.getHostName());
if (vm.getDisplayName() != null) {
ipResponse.setVirtualMachineDisplayName(vm.getDisplayName());
} else {
ipResponse.setVirtualMachineDisplayName(vm.getHostName());
if (vm != null) {
ipResponse.setVirtualMachineId(vm.getId());
ipResponse.setVirtualMachineName(vm.getHostName());
if (vm.getDisplayName() != null) {
ipResponse.setVirtualMachineDisplayName(vm.getDisplayName());
} else {
ipResponse.setVirtualMachineDisplayName(vm.getHostName());
}
}
}

3
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -1791,9 +1791,6 @@ public class ManagementServerImpl implements ManagementServer {
}
}
// We should not display public IPs assigned to System VMs which is a case in Basic Zone with EIP/ELB
sc.setParameters("isSystem", false);
if (zone != null) {
sc.setParameters("dataCenterId", zone);
}