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

Author: Sateesh Chodapuneedi

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

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

@@ -52,7 +52,7 @@ public LegacyZoneDaoImpl() {
     }
 
     @Override
-    public LegacyZoneVO findByZoneId(String zoneId) {
+    public LegacyZoneVO findByZoneId(Long zoneId) {
         SearchCriteria<LegacyZoneVO> sc = zoneSearch.create();
         sc.setParameters("zoneId", zoneId);
         return findOneBy(sc);

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

@@ -1186,7 +1186,7 @@ private void validateZoneWithResources(Long zoneId, String errStr) throws Resour
     @Override
     public boolean isLegacyZone(long dcId) {
         boolean isLegacyZone = false;
-        LegacyZoneVO legacyZoneVo = _legacyZoneDao.findById(dcId);
+        LegacyZoneVO legacyZoneVo = _legacyZoneDao.findByZoneId(dcId);
         if (legacyZoneVo != null) {
             isLegacyZone = true;
         }