etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <sateesh@apache.org>

(cherry picked from commit 71f76edf71)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
This commit is contained in:
Sateesh Chodapuneedi 2014-06-27 14:01:39 +05:30 committed by Rohit Yadav
parent 30dd76fc65
commit 96e14f309e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java
View File

@ -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

6
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
View File

@ -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);
}
}
}

2
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
View File

@ -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;
}