You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/25 20:04:58 UTC
[02/20] git commit: updated refs/heads/4.3 to 67df5b9
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>
(cherry picked from commit 71f76edf71d155e14500f222d81c82ce03397dbf)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/96e14f30
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/96e14f30
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/96e14f30
Branch: refs/heads/4.3
Commit: 96e14f309ea71b212e4ad99b402c289c819d4dc9
Parents: 30dd76f
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Fri Jun 27 14:01:39 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 22:42:13 2014 +0530
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java | 2 +-
.../src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java | 6 +++---
.../com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/96e14f30/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/96e14f30/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 20d68b0..dc121a1 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<LegacyZoneVO> sc = zoneSearch.create();
sc.setParameters("zoneId", zoneId);
return findOneBy(sc);
}
@Override
- public List<LegacyZoneVO> listAllLegacyZones() {
+ public List<LegacyZoneVO> listAllLegacyZones() {
SearchCriteria<LegacyZoneVO> sc = fullTableSearch.create();
return search(sc, null);
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/96e14f30/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 028fa94..ce794b1 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;
}