From 96e14f309ea71b212e4ad99b402c289c819d4dc9 Mon Sep 17 00:00:00 2001 From: Sateesh Chodapuneedi Date: Fri, 27 Jun 2014 14:01:39 +0530 Subject: [PATCH] CLOUDSTACK-6996 Adding cluster to legacy zone failed Lookup zone_id field in legacy_zones table to search the table for legacy zone. Signed-off-by: Sateesh Chodapuneedi (cherry picked from commit 71f76edf71d155e14500f222d81c82ce03397dbf) Signed-off-by: Rohit Yadav Conflicts: plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java --- .../src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java | 2 +- .../com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java | 6 +++--- .../cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java index 290f1afd90f..882084b48b9 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java @@ -27,7 +27,7 @@ public interface LegacyZoneDao extends GenericDao { * @param zoneId - id of zone * @return Object of legacy zone (LegacyZoneVO) identified by zoneId */ - LegacyZoneVO findByZoneId(String zoneId); + LegacyZoneVO findByZoneId(Long zoneId); /** * Lists all legacy CloudStack zones diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java index 20d68b0b8d1..dc121a11889 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java @@ -51,16 +51,16 @@ } @Override - public LegacyZoneVO findByZoneId(String zoneId) { + public LegacyZoneVO findByZoneId(Long zoneId) { SearchCriteria sc = zoneSearch.create(); sc.setParameters("zoneId", zoneId); return findOneBy(sc); } @Override - public List listAllLegacyZones() { + public List listAllLegacyZones() { SearchCriteria sc = fullTableSearch.create(); return search(sc, null); - } + } } 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 028fa942d57..ce794b1f46c 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 @@ -1240,7 +1240,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw @Override public boolean isLegacyZone(long dcId) { boolean isLegacyZone = false; - LegacyZoneVO legacyZoneVo = _legacyZoneDao.findById(dcId); + LegacyZoneVO legacyZoneVo = _legacyZoneDao.findByZoneId(dcId); if (legacyZoneVo != null) { isLegacyZone = true; }