You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2014/06/27 11:07:34 UTC
git commit: updated refs/heads/4.4-forward to 75aa243
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward 48646ae18 -> 75aa243d1
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 <sa...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/75aa243d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/75aa243d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/75aa243d
Branch: refs/heads/4.4-forward
Commit: 75aa243d1ea64493b70e9d8466d96c4842dfdf1a
Parents: 48646ae
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Fri Jun 27 14:01:39 2014 +0530
Committer: Sateesh Chodapuneedi <sa...@apache.org>
Committed: Fri Jun 27 14:37:42 2014 +0530
----------------------------------------------------------------------
.../vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java | 2 +-
.../src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java | 2 +-
.../src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/75aa243d/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java
----------------------------------------------------------------------
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 290f1af..882084b 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<LegacyZoneVO, Long> {
* @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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/75aa243d/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
----------------------------------------------------------------------
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 11ae4a3..46e8105 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
@@ -52,7 +52,7 @@ public class LegacyZoneDaoImpl extends GenericDaoBase<LegacyZoneVO, Long> implem
}
@Override
- public LegacyZoneVO findByZoneId(String zoneId) {
+ public LegacyZoneVO findByZoneId(Long zoneId) {
SearchCriteria<LegacyZoneVO> sc = zoneSearch.create();
sc.setParameters("zoneId", zoneId);
return findOneBy(sc);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/75aa243d/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
----------------------------------------------------------------------
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 67d3963..36d2322 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
@@ -1186,7 +1186,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;
}