From bea69edd960484440ab160dc56de46c528f75624 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Thu, 30 Aug 2012 15:10:46 +0530 Subject: [PATCH] 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 --- server/src/com/cloud/api/ApiResponseHelper.java | 14 ++++++++------ .../src/com/cloud/server/ManagementServerImpl.java | 3 --- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 1773e06daab..74d1711b260 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -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()); + } } } diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 3e8ae6be1e7..1dd76f016a5 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -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); }