cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/4.4 to a1a23d2
Date Fri, 27 Jun 2014 11:04:49 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 8f9458e51 -> a1a23d2f0


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 75aa243d1ea64493b70e9d8466d96c4842dfdf1a)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a1a23d2f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a1a23d2f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a1a23d2f

Branch: refs/heads/4.4
Commit: a1a23d2f03148689b328a9ac232a7d5fca2146ab
Parents: 8f9458e
Author: Sateesh Chodapuneedi <sateesh@apache.org>
Authored: Fri Jun 27 14:01:39 2014 +0530
Committer: Daan Hoogland <daan@onecht.net>
Committed: Fri Jun 27 13:04:37 2014 +0200

----------------------------------------------------------------------
 .../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/a1a23d2f/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/a1a23d2f/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/a1a23d2f/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;
         }


Mime
View raw message