From 3ec7f8b99ebe9c02a6b6ed69efdb72dfb9543b3b Mon Sep 17 00:00:00 2001 From: Sateesh Chodapuneedi Date: Thu, 6 Jun 2013 14:33:05 +0530 Subject: [PATCH] CLOUDSTACK-2867 Cannot add multiple vmware zones in vCenter Checking guid in database, if association of DC to zone exists already. --- .../cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index 78b7582ca89..664651e1fff 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -947,8 +947,8 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw // Check if DC is already part of zone // In that case vmware_data_center table should have the DC String vCenterHost = uri.getHost(); - List vmwareDcs = _vmwareDcDao.getVmwareDatacenterByNameAndVcenter(vmwareDcName, vCenterHost); - if (vmwareDcs != null && vmwareDcs.size() != 0) { + vmwareDc = _vmwareDcDao.getVmwareDatacenterByGuid(vmwareDcName + "@" + vCenterHost); + if (vmwareDc != null) { throw new ResourceInUseException("This DC is already part of other CloudStack zone(s). Cannot add this DC to more zones."); }