From e6cd47ddc0ad476a4bc70a7b045fdeb5ca41d35b Mon Sep 17 00:00:00 2001 From: Prachi Damle Date: Wed, 16 Jan 2013 14:56:12 -0800 Subject: [PATCH] More changes for deployVM flow. --- .../cloud/entity/api/VMEntityManagerImpl.java | 2 +- .../entity/api/ClusterEntityImpl.java | 4 +- .../entity/api/DataCenterResourceManager.java | 24 +-- .../api/DataCenterResourceManagerImpl.java | 48 ++--- .../datacenter/entity/api/HostEntityImpl.java | 4 +- .../datacenter/entity/api/PodEntityImpl.java | 4 +- .../datacenter/entity/api/ZoneEntityImpl.java | 4 +- .../{ClusterVO.java => EngineClusterVO.java} | 22 +- ...aCenterVO.java => EngineDataCenterVO.java} | 20 +- .../{HostPodVO.java => EngineHostPodVO.java} | 20 +- .../api/db/{HostVO.java => EngineHostVO.java} | 28 +-- ...{ClusterDao.java => EngineClusterDao.java} | 14 +- ...DaoImpl.java => EngineClusterDaoImpl.java} | 68 +++---- ...enterDao.java => EngineDataCenterDao.java} | 28 +-- ...Impl.java => EngineDataCenterDaoImpl.java} | 90 ++++---- .../dao/{HostDao.java => EngineHostDao.java} | 26 +-- ...ostDaoImpl.java => EngineHostDaoImpl.java} | 192 +++++++++--------- ...{HostPodDao.java => EngineHostPodDao.java} | 8 +- ...DaoImpl.java => EngineHostPodDaoImpl.java} | 38 ++-- .../test/ChildTestConfiguration.java | 24 +-- .../provisioning/test/ProvisioningTest.java | 48 ++--- .../baremetal/BareMetalVmManagerImpl.java | 2 +- .../com/cloud/vm/dao/UserVmDaoImplTest.java | 2 +- setup/db/4.1-new-db-schema.sql | 21 ++ 24 files changed, 381 insertions(+), 360 deletions(-) rename engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/{ClusterVO.java => EngineClusterVO.java} (91%) rename engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/{DataCenterVO.java => EngineDataCenterVO.java} (92%) rename engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/{HostPodVO.java => EngineHostPodVO.java} (90%) rename engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/{HostVO.java => EngineHostVO.java} (96%) rename engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/{ClusterDao.java => EngineClusterDao.java} (70%) rename engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/{ClusterDaoImpl.java => EngineClusterDaoImpl.java} (81%) rename engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/{DataCenterDao.java => EngineDataCenterDao.java} (58%) rename engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/{DataCenterDaoImpl.java => EngineDataCenterDaoImpl.java} (75%) rename engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/{HostDao.java => EngineHostDao.java} (65%) rename engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/{HostDaoImpl.java => EngineHostDaoImpl.java} (83%) rename engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/{HostPodDao.java => EngineHostPodDao.java} (74%) rename engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/{HostPodDaoImpl.java => EngineHostPodDaoImpl.java} (82%) diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java index b1db24289b2..7e8d2c28eda 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java @@ -154,7 +154,7 @@ public class VMEntityManagerImpl implements VMEntityManager { } - DeploymentPlanner planner = ComponentContext.getCompanent(plannerToUse); + DeploymentPlanner planner = ComponentContext.getComponent(plannerToUse); DeployDestination dest = null; if (planner.canHandle(vmProfile, plan, exclude)) { diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java index 4ce69b529c3..3471b7ae376 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; -import org.apache.cloudstack.engine.datacenter.entity.api.db.ClusterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.org.Cluster.ClusterType; import com.cloud.org.Grouping.AllocationState; @@ -36,7 +36,7 @@ public class ClusterEntityImpl implements ClusterEntity { private DataCenterResourceManager manager; - private ClusterVO clusterVO; + private EngineClusterVO clusterVO; public ClusterEntityImpl(String clusterId, DataCenterResourceManager manager) { diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java index 953dc9a2a1a..ab1cbe6b0b1 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java @@ -18,10 +18,10 @@ package org.apache.cloudstack.engine.datacenter.entity.api; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; -import org.apache.cloudstack.engine.datacenter.entity.api.db.ClusterVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.DataCenterVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.HostPodVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.HostVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; import com.cloud.utils.fsm.NoTransitionException; @@ -29,22 +29,22 @@ import com.cloud.utils.fsm.NoTransitionException; public interface DataCenterResourceManager { - DataCenterVO loadDataCenter(String dataCenterId); + EngineDataCenterVO loadDataCenter(String dataCenterId); - void saveDataCenter(DataCenterVO dc); + void saveDataCenter(EngineDataCenterVO dc); - void savePod(HostPodVO dc); + void savePod(EngineHostPodVO dc); - void saveCluster(ClusterVO cluster); + void saveCluster(EngineClusterVO cluster); boolean changeState(DataCenterResourceEntity entity, Event event) throws NoTransitionException; - HostPodVO loadPod(String uuid); + EngineHostPodVO loadPod(String uuid); - ClusterVO loadCluster(String uuid); + EngineClusterVO loadCluster(String uuid); - HostVO loadHost(String uuid); + EngineHostVO loadHost(String uuid); - void saveHost(HostVO hostVO); + void saveHost(EngineHostVO hostVO); } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java index a659c5d86ff..3cfca3b9369 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java @@ -20,14 +20,14 @@ import javax.inject.Inject; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; -import org.apache.cloudstack.engine.datacenter.entity.api.db.ClusterVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.DataCenterVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.HostPodVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.HostVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.ClusterDao; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.DataCenterDao; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.HostDao; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.HostPodDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao; import org.springframework.stereotype.Component; @@ -39,23 +39,23 @@ import com.cloud.utils.fsm.StateMachine2; public class DataCenterResourceManagerImpl implements DataCenterResourceManager { @Inject - DataCenterDao _dataCenterDao; + EngineDataCenterDao _dataCenterDao; @Inject - HostPodDao _podDao; + EngineHostPodDao _podDao; @Inject - ClusterDao _clusterDao; + EngineClusterDao _clusterDao; @Inject - HostDao _hostDao; + EngineHostDao _hostDao; protected StateMachine2 _stateMachine = DataCenterResourceEntity.State.s_fsm; @Override - public DataCenterVO loadDataCenter(String dataCenterId) { - DataCenterVO dataCenterVO = _dataCenterDao.findByUuid(dataCenterId); + public EngineDataCenterVO loadDataCenter(String dataCenterId) { + EngineDataCenterVO dataCenterVO = _dataCenterDao.findByUuid(dataCenterId); if(dataCenterVO == null){ throw new InvalidParameterValueException("Zone does not exist"); } @@ -63,7 +63,7 @@ public class DataCenterResourceManagerImpl implements DataCenterResourceManager } @Override - public void saveDataCenter(DataCenterVO dc) { + public void saveDataCenter(EngineDataCenterVO dc) { _dataCenterDao.persist(dc); } @@ -85,8 +85,8 @@ public class DataCenterResourceManagerImpl implements DataCenterResourceManager } @Override - public HostPodVO loadPod(String uuid) { - HostPodVO pod = _podDao.findByUuid(uuid); + public EngineHostPodVO loadPod(String uuid) { + EngineHostPodVO pod = _podDao.findByUuid(uuid); if(pod == null){ throw new InvalidParameterValueException("Pod does not exist"); } @@ -94,8 +94,8 @@ public class DataCenterResourceManagerImpl implements DataCenterResourceManager } @Override - public ClusterVO loadCluster(String uuid) { - ClusterVO cluster = _clusterDao.findByUuid(uuid); + public EngineClusterVO loadCluster(String uuid) { + EngineClusterVO cluster = _clusterDao.findByUuid(uuid); if(cluster == null){ throw new InvalidParameterValueException("Pod does not exist"); } @@ -103,18 +103,18 @@ public class DataCenterResourceManagerImpl implements DataCenterResourceManager } @Override - public void savePod(HostPodVO pod) { + public void savePod(EngineHostPodVO pod) { _podDao.persist(pod); } @Override - public void saveCluster(ClusterVO cluster) { + public void saveCluster(EngineClusterVO cluster) { _clusterDao.persist(cluster); } @Override - public HostVO loadHost(String uuid) { - HostVO host = _hostDao.findByUuid(uuid); + public EngineHostVO loadHost(String uuid) { + EngineHostVO host = _hostDao.findByUuid(uuid); if(host == null){ throw new InvalidParameterValueException("Host does not exist"); } @@ -122,7 +122,7 @@ public class DataCenterResourceManagerImpl implements DataCenterResourceManager } @Override - public void saveHost(HostVO hostVO) { + public void saveHost(EngineHostVO hostVO) { _hostDao.persist(hostVO); } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java index 1841889e9ed..b4a20801a79 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; -import org.apache.cloudstack.engine.datacenter.entity.api.db.HostVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.utils.fsm.NoTransitionException; @@ -31,7 +31,7 @@ public class HostEntityImpl implements HostEntity { private DataCenterResourceManager manager; - private HostVO hostVO; + private EngineHostVO hostVO; public HostEntityImpl(String uuid, DataCenterResourceManager manager) { this.manager = manager; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java index e17e3912508..5c66a21a73e 100755 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; -import org.apache.cloudstack.engine.datacenter.entity.api.db.HostPodVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; import com.cloud.org.Cluster; import com.cloud.org.Grouping.AllocationState; @@ -35,7 +35,7 @@ public class PodEntityImpl implements PodEntity { private DataCenterResourceManager manager; - private HostPodVO podVO; + private EngineHostPodVO podVO; public PodEntityImpl(String uuid, DataCenterResourceManager manager) { this.manager = manager; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java index e87cc4b9e9d..333a2207d66 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java @@ -26,7 +26,7 @@ import java.util.Map; import javax.ws.rs.GET; import javax.ws.rs.Path; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; -import org.apache.cloudstack.engine.datacenter.entity.api.db.DataCenterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; import com.cloud.utils.fsm.FiniteStateObject; import com.cloud.utils.fsm.NoTransitionException; @@ -37,7 +37,7 @@ public class ZoneEntityImpl implements ZoneEntity, FiniteStateObject, StateDao { - List listByPodId(long podId); - ClusterVO findBy(String name, long podId); - List listByHyTypeWithoutGuid(String hyType); - List listByZoneId(long zoneId); +public interface EngineClusterDao extends GenericDao, StateDao { + List listByPodId(long podId); + EngineClusterVO findBy(String name, long podId); + List listByHyTypeWithoutGuid(String hyType); + List listByZoneId(long zoneId); List getAvailableHypervisorInZone(Long zoneId); - List listByDcHyType(long dcId, String hyType); + List listByDcHyType(long dcId, String hyType); Map> getPodClusterIdMap(List clusterIds); List listDisabledClusters(long zoneId, Long podId); List listClustersWithDisabledPods(long zoneId); diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/ClusterDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java similarity index 81% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/ClusterDaoImpl.java rename to engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java index 3ab6cee2a77..1f0bd4d84af 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/ClusterDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java @@ -27,8 +27,8 @@ import javax.inject.Inject; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; -import org.apache.cloudstack.engine.datacenter.entity.api.db.ClusterVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.HostPodVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -46,24 +46,24 @@ import com.cloud.utils.db.UpdateBuilder; import com.cloud.utils.exception.CloudRuntimeException; @Component(value="EngineClusterDao") -@Local(value=ClusterDao.class) -public class ClusterDaoImpl extends GenericDaoBase implements ClusterDao { - private static final Logger s_logger = Logger.getLogger(ClusterDaoImpl.class); +@Local(value=EngineClusterDao.class) +public class EngineClusterDaoImpl extends GenericDaoBase implements EngineClusterDao { + private static final Logger s_logger = Logger.getLogger(EngineClusterDaoImpl.class); - protected final SearchBuilder PodSearch; - protected final SearchBuilder HyTypeWithoutGuidSearch; - protected final SearchBuilder AvailHyperSearch; - protected final SearchBuilder ZoneSearch; - protected final SearchBuilder ZoneHyTypeSearch; - protected SearchBuilder StateChangeSearch; - protected SearchBuilder UUIDSearch; + protected final SearchBuilder PodSearch; + protected final SearchBuilder HyTypeWithoutGuidSearch; + protected final SearchBuilder AvailHyperSearch; + protected final SearchBuilder ZoneSearch; + protected final SearchBuilder ZoneHyTypeSearch; + protected SearchBuilder StateChangeSearch; + protected SearchBuilder UUIDSearch; private static final String GET_POD_CLUSTER_MAP_PREFIX = "SELECT pod_id, id FROM cloud.cluster WHERE cluster.id IN( "; private static final String GET_POD_CLUSTER_MAP_SUFFIX = " )"; - @Inject protected HostPodDao _hostPodDao; + @Inject protected EngineHostPodDao _hostPodDao; - protected ClusterDaoImpl() { + protected EngineClusterDaoImpl() { super(); HyTypeWithoutGuidSearch = createSearchBuilder(); @@ -102,23 +102,23 @@ public class ClusterDaoImpl extends GenericDaoBase implements C } @Override - public List listByZoneId(long zoneId) { - SearchCriteria sc = ZoneSearch.create(); + public List listByZoneId(long zoneId) { + SearchCriteria sc = ZoneSearch.create(); sc.setParameters("dataCenterId", zoneId); return listBy(sc); } @Override - public List listByPodId(long podId) { - SearchCriteria sc = PodSearch.create(); + public List listByPodId(long podId) { + SearchCriteria sc = PodSearch.create(); sc.setParameters("pod", podId); return listBy(sc); } @Override - public ClusterVO findBy(String name, long podId) { - SearchCriteria sc = PodSearch.create(); + public EngineClusterVO findBy(String name, long podId) { + SearchCriteria sc = PodSearch.create(); sc.setParameters("pod", podId); sc.setParameters("name", name); @@ -126,16 +126,16 @@ public class ClusterDaoImpl extends GenericDaoBase implements C } @Override - public List listByHyTypeWithoutGuid(String hyType) { - SearchCriteria sc = HyTypeWithoutGuidSearch.create(); + public List listByHyTypeWithoutGuid(String hyType) { + SearchCriteria sc = HyTypeWithoutGuidSearch.create(); sc.setParameters("hypervisorType", hyType); return listBy(sc); } @Override - public List listByDcHyType(long dcId, String hyType) { - SearchCriteria sc = ZoneHyTypeSearch.create(); + public List listByDcHyType(long dcId, String hyType) { + SearchCriteria sc = ZoneHyTypeSearch.create(); sc.setParameters("dataCenterId", dcId); sc.setParameters("hypervisorType", hyType); return listBy(sc); @@ -143,13 +143,13 @@ public class ClusterDaoImpl extends GenericDaoBase implements C @Override public List getAvailableHypervisorInZone(Long zoneId) { - SearchCriteria sc = AvailHyperSearch.create(); + SearchCriteria sc = AvailHyperSearch.create(); if (zoneId != null) { sc.setParameters("zoneId", zoneId); } - List clusters = listBy(sc); + List clusters = listBy(sc); List hypers = new ArrayList(4); - for (ClusterVO cluster : clusters) { + for (EngineClusterVO cluster : clusters) { hypers.add(cluster.getHypervisorType()); } @@ -197,7 +197,7 @@ public class ClusterDaoImpl extends GenericDaoBase implements C @Override public List listDisabledClusters(long zoneId, Long podId) { - GenericSearchBuilder clusterIdSearch = createSearchBuilder(Long.class); + GenericSearchBuilder clusterIdSearch = createSearchBuilder(Long.class); clusterIdSearch.selectField(clusterIdSearch.entity().getId()); clusterIdSearch.and("dataCenterId", clusterIdSearch.entity().getDataCenterId(), Op.EQ); if(podId != null){ @@ -219,12 +219,12 @@ public class ClusterDaoImpl extends GenericDaoBase implements C @Override public List listClustersWithDisabledPods(long zoneId) { - GenericSearchBuilder disabledPodIdSearch = _hostPodDao.createSearchBuilder(Long.class); + GenericSearchBuilder disabledPodIdSearch = _hostPodDao.createSearchBuilder(Long.class); disabledPodIdSearch.selectField(disabledPodIdSearch.entity().getId()); disabledPodIdSearch.and("dataCenterId", disabledPodIdSearch.entity().getDataCenterId(), Op.EQ); disabledPodIdSearch.and("allocationState", disabledPodIdSearch.entity().getAllocationState(), Op.EQ); - GenericSearchBuilder clusterIdSearch = createSearchBuilder(Long.class); + GenericSearchBuilder clusterIdSearch = createSearchBuilder(Long.class); clusterIdSearch.selectField(clusterIdSearch.entity().getId()); clusterIdSearch.join("disabledPodIdSearch", disabledPodIdSearch, clusterIdSearch.entity().getPodId(), disabledPodIdSearch.entity().getId(), JoinBuilder.JoinType.INNER); clusterIdSearch.done(); @@ -241,7 +241,7 @@ public class ClusterDaoImpl extends GenericDaoBase implements C public boolean remove(Long id) { Transaction txn = Transaction.currentTxn(); txn.start(); - ClusterVO cluster = createForUpdate(); + EngineClusterVO cluster = createForUpdate(); cluster.setName(null); cluster.setGuid(null); @@ -255,11 +255,11 @@ public class ClusterDaoImpl extends GenericDaoBase implements C @Override public boolean updateState(State currentState, Event event, State nextState, DataCenterResourceEntity clusterEntity, Object data) { - ClusterVO vo = findById(clusterEntity.getId()); + EngineClusterVO vo = findById(clusterEntity.getId()); Date oldUpdatedTime = vo.getLastUpdated(); - SearchCriteria sc = StateChangeSearch.create(); + SearchCriteria sc = StateChangeSearch.create(); sc.setParameters("id", vo.getId()); sc.setParameters("state", currentState); @@ -270,7 +270,7 @@ public class ClusterDaoImpl extends GenericDaoBase implements C int rows = update(vo, sc); if (rows == 0 && s_logger.isDebugEnabled()) { - ClusterVO dbCluster = findByIdIncludingRemoved(vo.getId()); + EngineClusterVO dbCluster = findByIdIncludingRemoved(vo.getId()); if (dbCluster != null) { StringBuilder str = new StringBuilder("Unable to update ").append(vo.toString()); str.append(": DB Data={id=").append(dbCluster.getId()).append("; state=").append(dbCluster.getState()).append(";updatedTime=") diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DataCenterDao.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDao.java similarity index 58% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DataCenterDao.java rename to engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDao.java index ce4ccfc8fc7..7a59dfaf653 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DataCenterDao.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDao.java @@ -16,15 +16,15 @@ import java.util.List; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity; import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity; -import org.apache.cloudstack.engine.datacenter.entity.api.db.DataCenterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; import com.cloud.utils.Pair; import com.cloud.utils.db.GenericDao; import com.cloud.utils.fsm.StateDao; -public interface DataCenterDao extends GenericDao, StateDao { - DataCenterVO findByName(String name); +public interface EngineDataCenterDao extends GenericDao, StateDao { + EngineDataCenterVO findByName(String name); /** * @param id data center id @@ -32,24 +32,24 @@ public interface DataCenterDao extends GenericDao, StateDao< */ String[] getNextAvailableMacAddressPair(long id); String[] getNextAvailableMacAddressPair(long id, long mask); - List findZonesByDomainId(Long domainId); + List findZonesByDomainId(Long domainId); - List listPublicZones(String keyword); + List listPublicZones(String keyword); - List findChildZones(Object[] ids, String keyword); + List findChildZones(Object[] ids, String keyword); - void loadDetails(DataCenterVO zone); - void saveDetails(DataCenterVO zone); + void loadDetails(EngineDataCenterVO zone); + void saveDetails(EngineDataCenterVO zone); - List listDisabledZones(); - List listEnabledZones(); - DataCenterVO findByToken(String zoneToken); - DataCenterVO findByTokenOrIdOrName(String tokenIdOrName); + List listDisabledZones(); + List listEnabledZones(); + EngineDataCenterVO findByToken(String zoneToken); + EngineDataCenterVO findByTokenOrIdOrName(String tokenIdOrName); - List findZonesByDomainId(Long domainId, String keyword); + List findZonesByDomainId(Long domainId, String keyword); - List findByKeyword(String keyword); + List findByKeyword(String keyword); } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DataCenterDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java similarity index 75% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DataCenterDaoImpl.java rename to engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java index 832914332cf..f99bc6c0c09 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DataCenterDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java @@ -25,7 +25,7 @@ import javax.persistence.TableGenerator; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; -import org.apache.cloudstack.engine.datacenter.entity.api.db.DataCenterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -48,18 +48,18 @@ import com.cloud.utils.net.NetUtils; * } **/ @Component(value="EngineDataCenterDao") -@Local(value={DataCenterDao.class}) -public class DataCenterDaoImpl extends GenericDaoBase implements DataCenterDao { - private static final Logger s_logger = Logger.getLogger(DataCenterDaoImpl.class); +@Local(value={EngineDataCenterDao.class}) +public class EngineDataCenterDaoImpl extends GenericDaoBase implements EngineDataCenterDao { + private static final Logger s_logger = Logger.getLogger(EngineDataCenterDaoImpl.class); - protected SearchBuilder NameSearch; - protected SearchBuilder ListZonesByDomainIdSearch; - protected SearchBuilder PublicZonesSearch; - protected SearchBuilder ChildZonesSearch; - protected SearchBuilder DisabledZonesSearch; - protected SearchBuilder TokenSearch; - protected SearchBuilder StateChangeSearch; - protected SearchBuilder UUIDSearch; + protected SearchBuilder NameSearch; + protected SearchBuilder ListZonesByDomainIdSearch; + protected SearchBuilder PublicZonesSearch; + protected SearchBuilder ChildZonesSearch; + protected SearchBuilder DisabledZonesSearch; + protected SearchBuilder TokenSearch; + protected SearchBuilder StateChangeSearch; + protected SearchBuilder UUIDSearch; protected long _prefix; protected Random _rand = new Random(System.currentTimeMillis()); @@ -69,33 +69,33 @@ public class DataCenterDaoImpl extends GenericDaoBase implem @Override - public DataCenterVO findByName(String name) { - SearchCriteria sc = NameSearch.create(); + public EngineDataCenterVO findByName(String name) { + SearchCriteria sc = NameSearch.create(); sc.setParameters("name", name); return findOneBy(sc); } @Override - public DataCenterVO findByToken(String zoneToken){ - SearchCriteria sc = TokenSearch.create(); + public EngineDataCenterVO findByToken(String zoneToken){ + SearchCriteria sc = TokenSearch.create(); sc.setParameters("zoneToken", zoneToken); return findOneBy(sc); } @Override - public List findZonesByDomainId(Long domainId){ - SearchCriteria sc = ListZonesByDomainIdSearch.create(); + public List findZonesByDomainId(Long domainId){ + SearchCriteria sc = ListZonesByDomainIdSearch.create(); sc.setParameters("domainId", domainId); return listBy(sc); } @Override - public List findZonesByDomainId(Long domainId, String keyword){ - SearchCriteria sc = ListZonesByDomainIdSearch.create(); + public List findZonesByDomainId(Long domainId, String keyword){ + SearchCriteria sc = ListZonesByDomainIdSearch.create(); sc.setParameters("domainId", domainId); if (keyword != null) { - SearchCriteria ssc = createSearchCriteria(); + SearchCriteria ssc = createSearchCriteria(); ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%"); ssc.addOr("description", SearchCriteria.Op.LIKE, "%" + keyword + "%"); sc.addAnd("name", SearchCriteria.Op.SC, ssc); @@ -104,11 +104,11 @@ public class DataCenterDaoImpl extends GenericDaoBase implem } @Override - public List findChildZones(Object[] ids, String keyword){ - SearchCriteria sc = ChildZonesSearch.create(); + public List findChildZones(Object[] ids, String keyword){ + SearchCriteria sc = ChildZonesSearch.create(); sc.setParameters("domainid", ids); if (keyword != null) { - SearchCriteria ssc = createSearchCriteria(); + SearchCriteria ssc = createSearchCriteria(); ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%"); ssc.addOr("description", SearchCriteria.Op.LIKE, "%" + keyword + "%"); sc.addAnd("name", SearchCriteria.Op.SC, ssc); @@ -117,10 +117,10 @@ public class DataCenterDaoImpl extends GenericDaoBase implem } @Override - public List listPublicZones(String keyword){ - SearchCriteria sc = PublicZonesSearch.create(); + public List listPublicZones(String keyword){ + SearchCriteria sc = PublicZonesSearch.create(); if (keyword != null) { - SearchCriteria ssc = createSearchCriteria(); + SearchCriteria ssc = createSearchCriteria(); ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%"); ssc.addOr("description", SearchCriteria.Op.LIKE, "%" + keyword + "%"); sc.addAnd("name", SearchCriteria.Op.SC, ssc); @@ -130,8 +130,8 @@ public class DataCenterDaoImpl extends GenericDaoBase implem } @Override - public List findByKeyword(String keyword){ - SearchCriteria ssc = createSearchCriteria(); + public List findByKeyword(String keyword){ + SearchCriteria ssc = createSearchCriteria(); ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%"); ssc.addOr("description", SearchCriteria.Op.LIKE, "%" + keyword + "%"); return listBy(ssc); @@ -170,7 +170,7 @@ public class DataCenterDaoImpl extends GenericDaoBase implem return true; } - protected DataCenterDaoImpl() { + protected EngineDataCenterDaoImpl() { super(); NameSearch = createSearchBuilder(); NameSearch.and("name", NameSearch.entity().getName(), SearchCriteria.Op.EQ); @@ -211,7 +211,7 @@ public class DataCenterDaoImpl extends GenericDaoBase implem } @Override @DB - public boolean update(Long zoneId, DataCenterVO zone) { + public boolean update(Long zoneId, EngineDataCenterVO zone) { Transaction txn = Transaction.currentTxn(); txn.start(); boolean persisted = super.update(zoneId, zone); @@ -224,13 +224,13 @@ public class DataCenterDaoImpl extends GenericDaoBase implem } @Override - public void loadDetails(DataCenterVO zone) { + public void loadDetails(EngineDataCenterVO zone) { Map details =_detailsDao.findDetails(zone.getId()); zone.setDetails(details); } @Override - public void saveDetails(DataCenterVO zone) { + public void saveDetails(EngineDataCenterVO zone) { Map details = zone.getDetails(); if (details == null) { return; @@ -239,28 +239,28 @@ public class DataCenterDaoImpl extends GenericDaoBase implem } @Override - public List listDisabledZones(){ - SearchCriteria sc = DisabledZonesSearch.create(); + public List listDisabledZones(){ + SearchCriteria sc = DisabledZonesSearch.create(); sc.setParameters("allocationState", Grouping.AllocationState.Disabled); - List dcs = listBy(sc); + List dcs = listBy(sc); return dcs; } @Override - public List listEnabledZones(){ - SearchCriteria sc = DisabledZonesSearch.create(); + public List listEnabledZones(){ + SearchCriteria sc = DisabledZonesSearch.create(); sc.setParameters("allocationState", Grouping.AllocationState.Enabled); - List dcs = listBy(sc); + List dcs = listBy(sc); return dcs; } @Override - public DataCenterVO findByTokenOrIdOrName(String tokenOrIdOrName) { - DataCenterVO result = findByToken(tokenOrIdOrName); + public EngineDataCenterVO findByTokenOrIdOrName(String tokenOrIdOrName) { + EngineDataCenterVO result = findByToken(tokenOrIdOrName); if (result == null) { result = findByName(tokenOrIdOrName); if (result == null) { @@ -279,7 +279,7 @@ public class DataCenterDaoImpl extends GenericDaoBase implem public boolean remove(Long id) { Transaction txn = Transaction.currentTxn(); txn.start(); - DataCenterVO zone = createForUpdate(); + EngineDataCenterVO zone = createForUpdate(); zone.setName(null); update(id, zone); @@ -293,11 +293,11 @@ public class DataCenterDaoImpl extends GenericDaoBase implem @Override public boolean updateState(State currentState, Event event, State nextState, DataCenterResourceEntity zoneEntity, Object data) { - DataCenterVO vo = findById(zoneEntity.getId()); + EngineDataCenterVO vo = findById(zoneEntity.getId()); Date oldUpdatedTime = vo.getLastUpdated(); - SearchCriteria sc = StateChangeSearch.create(); + SearchCriteria sc = StateChangeSearch.create(); sc.setParameters("id", vo.getId()); sc.setParameters("state", currentState); @@ -308,7 +308,7 @@ public class DataCenterDaoImpl extends GenericDaoBase implem int rows = update(vo, sc); if (rows == 0 && s_logger.isDebugEnabled()) { - DataCenterVO dbDC = findByIdIncludingRemoved(vo.getId()); + EngineDataCenterVO dbDC = findByIdIncludingRemoved(vo.getId()); if (dbDC != null) { StringBuilder str = new StringBuilder("Unable to update ").append(vo.toString()); str.append(": DB Data={id=").append(dbDC.getId()).append("; state=").append(dbDC.getState()).append(";updatedTime=") diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDao.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java similarity index 65% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDao.java rename to engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java index fed7c6e8a2c..a27ed505289 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDao.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java @@ -20,7 +20,7 @@ import java.util.Date; import java.util.List; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity; -import org.apache.cloudstack.engine.datacenter.entity.api.db.HostVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; import com.cloud.host.Host; import com.cloud.host.Host.Type; @@ -34,7 +34,7 @@ import com.cloud.utils.fsm.StateDao; * Data Access Object for server * */ -public interface HostDao extends GenericDao, StateDao { +public interface EngineHostDao extends GenericDao, StateDao { long countBy(long clusterId, ResourceState... states); /** @@ -45,32 +45,32 @@ public interface HostDao extends GenericDao, StateDao findLostHosts(long timeout); + List findLostHosts(long timeout); - List findAndUpdateDirectAgentToLoad(long lastPingSecondsAfter, Long limit, long managementServerId); + List findAndUpdateDirectAgentToLoad(long lastPingSecondsAfter, Long limit, long managementServerId); List getRunningHostCounts(Date cutTime); long getNextSequence(long hostId); - void loadDetails(HostVO host); + void loadDetails(EngineHostVO host); - void saveDetails(HostVO host); + void saveDetails(EngineHostVO host); - void loadHostTags(HostVO host); + void loadHostTags(EngineHostVO host); - List listByHostTag(Host.Type type, Long clusterId, Long podId, long dcId, String hostTag); + List listByHostTag(Host.Type type, Long clusterId, Long podId, long dcId, String hostTag); long countRoutingHostsByDataCenter(long dcId); - List findAndUpdateApplianceToLoad(long lastPingSecondsAfter, long managementServerId); + List findAndUpdateApplianceToLoad(long lastPingSecondsAfter, long managementServerId); boolean updateResourceState(ResourceState oldState, ResourceState.Event event, ResourceState newState, Host vo); - HostVO findByGuid(String guid); + EngineHostVO findByGuid(String guid); - HostVO findByTypeNameAndZoneId(long zoneId, String name, Host.Type type); - List findHypervisorHostInCluster(long clusterId); + EngineHostVO findByTypeNameAndZoneId(long zoneId, String name, Host.Type type); + List findHypervisorHostInCluster(long clusterId); /** @@ -81,5 +81,5 @@ public interface HostDao extends GenericDao, StateDao listAllUpAndEnabledNonHAHosts(Type type, Long clusterId, Long podId, long dcId, String haTag); + List listAllUpAndEnabledNonHAHosts(Type type, Long clusterId, Long podId, long dcId, String haTag); } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java similarity index 83% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDaoImpl.java rename to engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java index dbbf342a26d..3c34023c01c 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java @@ -31,7 +31,7 @@ import javax.persistence.TableGenerator; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State; -import org.apache.cloudstack.engine.datacenter.entity.api.db.HostVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -58,52 +58,52 @@ import com.cloud.utils.db.UpdateBuilder; import com.cloud.utils.exception.CloudRuntimeException; @Component(value="EngineHostDao") -@Local(value = { HostDao.class }) +@Local(value = { EngineHostDao.class }) @DB(txn = false) @TableGenerator(name = "host_req_sq", table = "op_host", pkColumnName = "id", valueColumnName = "sequence", allocationSize = 1) -public class HostDaoImpl extends GenericDaoBase implements HostDao { - private static final Logger s_logger = Logger.getLogger(HostDaoImpl.class); +public class EngineHostDaoImpl extends GenericDaoBase implements EngineHostDao { + private static final Logger s_logger = Logger.getLogger(EngineHostDaoImpl.class); private static final Logger status_logger = Logger.getLogger(Status.class); private static final Logger state_logger = Logger.getLogger(ResourceState.class); - protected final SearchBuilder TypePodDcStatusSearch; + protected final SearchBuilder TypePodDcStatusSearch; - protected final SearchBuilder IdStatusSearch; - protected final SearchBuilder TypeDcSearch; - protected final SearchBuilder TypeDcStatusSearch; - protected final SearchBuilder TypeClusterStatusSearch; - protected final SearchBuilder MsStatusSearch; - protected final SearchBuilder DcPrivateIpAddressSearch; - protected final SearchBuilder DcStorageIpAddressSearch; + protected final SearchBuilder IdStatusSearch; + protected final SearchBuilder TypeDcSearch; + protected final SearchBuilder TypeDcStatusSearch; + protected final SearchBuilder TypeClusterStatusSearch; + protected final SearchBuilder MsStatusSearch; + protected final SearchBuilder DcPrivateIpAddressSearch; + protected final SearchBuilder DcStorageIpAddressSearch; - protected final SearchBuilder GuidSearch; - protected final SearchBuilder DcSearch; - protected final SearchBuilder PodSearch; - protected final SearchBuilder TypeSearch; - protected final SearchBuilder StatusSearch; - protected final SearchBuilder ResourceStateSearch; - protected final SearchBuilder NameLikeSearch; - protected final SearchBuilder NameSearch; - protected final SearchBuilder SequenceSearch; - protected final SearchBuilder DirectlyConnectedSearch; - protected final SearchBuilder UnmanagedDirectConnectSearch; - protected final SearchBuilder UnmanagedApplianceSearch; - protected final SearchBuilder MaintenanceCountSearch; - protected final SearchBuilder ClusterStatusSearch; - protected final SearchBuilder TypeNameZoneSearch; - protected final SearchBuilder AvailHypevisorInZone; + protected final SearchBuilder GuidSearch; + protected final SearchBuilder DcSearch; + protected final SearchBuilder PodSearch; + protected final SearchBuilder TypeSearch; + protected final SearchBuilder StatusSearch; + protected final SearchBuilder ResourceStateSearch; + protected final SearchBuilder NameLikeSearch; + protected final SearchBuilder NameSearch; + protected final SearchBuilder SequenceSearch; + protected final SearchBuilder DirectlyConnectedSearch; + protected final SearchBuilder UnmanagedDirectConnectSearch; + protected final SearchBuilder UnmanagedApplianceSearch; + protected final SearchBuilder MaintenanceCountSearch; + protected final SearchBuilder ClusterStatusSearch; + protected final SearchBuilder TypeNameZoneSearch; + protected final SearchBuilder AvailHypevisorInZone; - protected final SearchBuilder DirectConnectSearch; - protected final SearchBuilder ManagedDirectConnectSearch; - protected final SearchBuilder ManagedRoutingServersSearch; - protected final SearchBuilder SecondaryStorageVMSearch; - protected SearchBuilder StateChangeSearch; + protected final SearchBuilder DirectConnectSearch; + protected final SearchBuilder ManagedDirectConnectSearch; + protected final SearchBuilder ManagedRoutingServersSearch; + protected final SearchBuilder SecondaryStorageVMSearch; + protected SearchBuilder StateChangeSearch; - protected SearchBuilder UUIDSearch; + protected SearchBuilder UUIDSearch; - protected final GenericSearchBuilder HostsInStatusSearch; - protected final GenericSearchBuilder CountRoutingByDc; - protected final SearchBuilder RoutingSearch; + protected final GenericSearchBuilder HostsInStatusSearch; + protected final GenericSearchBuilder CountRoutingByDc; + protected final SearchBuilder RoutingSearch; protected final Attribute _statusAttr; protected final Attribute _resourceStateAttr; @@ -112,10 +112,10 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao @Inject protected HostDetailsDao _detailsDao; @Inject protected HostTagsDao _hostTagsDao; - @Inject protected ClusterDao _clusterDao; + @Inject protected EngineClusterDao _clusterDao; - public HostDaoImpl() { + public EngineHostDaoImpl() { MaintenanceCountSearch = createSearchBuilder(); MaintenanceCountSearch.and("cluster", MaintenanceCountSearch.entity().getClusterId(), SearchCriteria.Op.EQ); @@ -123,7 +123,7 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao MaintenanceCountSearch.done(); TypePodDcStatusSearch = createSearchBuilder(); - HostVO entity = TypePodDcStatusSearch.entity(); + EngineHostVO entity = TypePodDcStatusSearch.entity(); TypePodDcStatusSearch.and("type", entity.getType(), SearchCriteria.Op.EQ); TypePodDcStatusSearch.and("pod", entity.getPodId(), SearchCriteria.Op.EQ); TypePodDcStatusSearch.and("dc", entity.getDataCenterId(), SearchCriteria.Op.EQ); @@ -317,33 +317,33 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao @Override public long countBy(long clusterId, ResourceState... states) { - SearchCriteria sc = MaintenanceCountSearch.create(); + SearchCriteria sc = MaintenanceCountSearch.create(); sc.setParameters("resourceState", (Object[]) states); sc.setParameters("cluster", clusterId); - List hosts = listBy(sc); + List hosts = listBy(sc); return hosts.size(); } @Override - public HostVO findByGuid(String guid) { - SearchCriteria sc = GuidSearch.create("guid", guid); + public EngineHostVO findByGuid(String guid) { + SearchCriteria sc = GuidSearch.create("guid", guid); return findOneBy(sc); } @Override @DB - public List findAndUpdateDirectAgentToLoad(long lastPingSecondsAfter, Long limit, long managementServerId) { + public List findAndUpdateDirectAgentToLoad(long lastPingSecondsAfter, Long limit, long managementServerId) { Transaction txn = Transaction.currentTxn(); txn.start(); - SearchCriteria sc = UnmanagedDirectConnectSearch.create(); + SearchCriteria sc = UnmanagedDirectConnectSearch.create(); sc.setParameters("lastPinged", lastPingSecondsAfter); //sc.setParameters("resourceStates", ResourceState.ErrorInMaintenance, ResourceState.Maintenance, ResourceState.PrepareForMaintenance, ResourceState.Disabled); sc.setJoinParameters("ClusterManagedSearch", "managed", Managed.ManagedState.Managed); - List hosts = lockRows(sc, new Filter(HostVO.class, "clusterId", true, 0L, limit), true); + List hosts = lockRows(sc, new Filter(EngineHostVO.class, "clusterId", true, 0L, limit), true); - for (HostVO host : hosts) { + for (EngineHostVO host : hosts) { host.setManagementServerId(managementServerId); update(host.getId(), host); } @@ -354,16 +354,16 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao } @Override @DB - public List findAndUpdateApplianceToLoad(long lastPingSecondsAfter, long managementServerId) { + public List findAndUpdateApplianceToLoad(long lastPingSecondsAfter, long managementServerId) { Transaction txn = Transaction.currentTxn(); txn.start(); - SearchCriteria sc = UnmanagedApplianceSearch.create(); + SearchCriteria sc = UnmanagedApplianceSearch.create(); sc.setParameters("lastPinged", lastPingSecondsAfter); sc.setParameters("types", Type.ExternalDhcp, Type.ExternalFirewall, Type.ExternalLoadBalancer, Type.PxeServer, Type.TrafficMonitor, Type.L2Networking); - List hosts = lockRows(sc, null, true); + List hosts = lockRows(sc, null, true); - for (HostVO host : hosts) { + for (EngineHostVO host : hosts) { host.setManagementServerId(managementServerId); update(host.getId(), host); } @@ -375,10 +375,10 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao @Override public void markHostsAsDisconnected(long msId, long lastPing) { - SearchCriteria sc = MsStatusSearch.create(); + SearchCriteria sc = MsStatusSearch.create(); sc.setParameters("ms", msId); - HostVO host = createForUpdate(); + EngineHostVO host = createForUpdate(); host.setLastPinged(lastPing); host.setDisconnectedOn(new Date()); UpdateBuilder ub = getUpdateBuilder(host); @@ -398,14 +398,14 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao } @Override - public List listByHostTag(Host.Type type, Long clusterId, Long podId, long dcId, String hostTag) { + public List listByHostTag(Host.Type type, Long clusterId, Long podId, long dcId, String hostTag) { SearchBuilder hostTagSearch = _hostTagsDao.createSearchBuilder(); HostTagVO tagEntity = hostTagSearch.entity(); hostTagSearch.and("tag", tagEntity.getTag(), SearchCriteria.Op.EQ); - SearchBuilder hostSearch = createSearchBuilder(); - HostVO entity = hostSearch.entity(); + SearchBuilder hostSearch = createSearchBuilder(); + EngineHostVO entity = hostSearch.entity(); hostSearch.and("type", entity.getType(), SearchCriteria.Op.EQ); hostSearch.and("pod", entity.getPodId(), SearchCriteria.Op.EQ); hostSearch.and("dc", entity.getDataCenterId(), SearchCriteria.Op.EQ); @@ -414,7 +414,7 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao hostSearch.and("resourceState", entity.getResourceState(), SearchCriteria.Op.EQ); hostSearch.join("hostTagSearch", hostTagSearch, entity.getId(), tagEntity.getHostId(), JoinBuilder.JoinType.INNER); - SearchCriteria sc = hostSearch.create(); + SearchCriteria sc = hostSearch.create(); sc.setJoinParameters("hostTagSearch", "tag", hostTag); sc.setParameters("type", type.toString()); if (podId != null) { @@ -432,7 +432,7 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao @Override - public List listAllUpAndEnabledNonHAHosts(Type type, Long clusterId, Long podId, long dcId, String haTag) { + public List listAllUpAndEnabledNonHAHosts(Type type, Long clusterId, Long podId, long dcId, String haTag) { SearchBuilder hostTagSearch = null; if (haTag != null && !haTag.isEmpty()) { hostTagSearch = _hostTagsDao.createSearchBuilder(); @@ -441,7 +441,7 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao hostTagSearch.cp(); } - SearchBuilder hostSearch = createSearchBuilder(); + SearchBuilder hostSearch = createSearchBuilder(); hostSearch.and("type", hostSearch.entity().getType(), SearchCriteria.Op.EQ); hostSearch.and("clusterId", hostSearch.entity().getClusterId(), SearchCriteria.Op.EQ); @@ -454,7 +454,7 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao hostSearch.join("hostTagSearch", hostTagSearch, hostSearch.entity().getId(), hostTagSearch.entity().getHostId(), JoinBuilder.JoinType.LEFTOUTER); } - SearchCriteria sc = hostSearch.create(); + SearchCriteria sc = hostSearch.create(); if (haTag != null && !haTag.isEmpty()) { sc.setJoinParameters("hostTagSearch", "tag", haTag); @@ -480,23 +480,23 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao } @Override - public void loadDetails(HostVO host) { + public void loadDetails(EngineHostVO host) { Map details = _detailsDao.findDetails(host.getId()); host.setDetails(details); } @Override - public void loadHostTags(HostVO host) { + public void loadHostTags(EngineHostVO host) { List hostTags = _hostTagsDao.gethostTags(host.getId()); host.setHostTags(hostTags); } @DB @Override - public List findLostHosts(long timeout) { + public List findLostHosts(long timeout) { Transaction txn = Transaction.currentTxn(); PreparedStatement pstmt = null; - List result = new ArrayList(); + List result = new ArrayList(); ResultSet rs = null; try { String sql = "select h.id from host h left join cluster c on h.cluster_id=c.id where h.mgmt_server_id is not null and h.last_ping < ? and h.status in ('Up', 'Updating', 'Disconnected', 'Connecting') and h.type not in ('ExternalFirewall', 'ExternalLoadBalancer', 'TrafficMonitor', 'SecondaryStorage', 'LocalSecondaryStorage', 'L2Networking') and (h.cluster_id is null or c.managed_state = 'Managed') ;" ; @@ -524,7 +524,7 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao } @Override - public void saveDetails(HostVO host) { + public void saveDetails(EngineHostVO host) { Map details = host.getDetails(); if (details == null) { return; @@ -532,7 +532,7 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao _detailsDao.persist(host.getId(), details); } - protected void saveHostTags(HostVO host) { + protected void saveHostTags(EngineHostVO host) { List hostTags = host.getHostTags(); if (hostTags == null || (hostTags != null && hostTags.isEmpty())) { return; @@ -542,13 +542,13 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao @Override @DB - public HostVO persist(HostVO host) { + public EngineHostVO persist(EngineHostVO host) { final String InsertSequenceSql = "INSERT INTO op_host(id) VALUES(?)"; Transaction txn = Transaction.currentTxn(); txn.start(); - HostVO dbHost = super.persist(host); + EngineHostVO dbHost = super.persist(host); try { PreparedStatement pstmt = txn.prepareAutoCloseStatement(InsertSequenceSql); @@ -570,7 +570,7 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao @Override @DB - public boolean update(Long hostId, HostVO host) { + public boolean update(Long hostId, EngineHostVO host) { Transaction txn = Transaction.currentTxn(); txn.start(); @@ -646,10 +646,10 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao @Override public boolean updateState(State currentState, DataCenterResourceEntity.State.Event event, State nextState, DataCenterResourceEntity hostEntity, Object data) { - HostVO vo = findById(hostEntity.getId()); + EngineHostVO vo = findById(hostEntity.getId()); Date oldUpdatedTime = vo.getLastUpdated(); - SearchCriteria sc = StateChangeSearch.create(); + SearchCriteria sc = StateChangeSearch.create(); sc.setParameters("id", hostEntity.getId()); sc.setParameters("state", currentState); @@ -660,7 +660,7 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao int rows = update(vo, sc); if (rows == 0 && s_logger.isDebugEnabled()) { - HostVO dbHost = findByIdIncludingRemoved(vo.getId()); + EngineHostVO dbHost = findByIdIncludingRemoved(vo.getId()); if (dbHost != null) { StringBuilder str = new StringBuilder("Unable to update ").append(vo.toString()); str.append(": DB Data={id=").append(dbHost.getId()).append("; state=").append(dbHost.getState()).append(";updatedTime=") @@ -676,13 +676,13 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao @Override public boolean updateResourceState(ResourceState oldState, ResourceState.Event event, ResourceState newState, Host vo) { - HostVO host = (HostVO)vo; - SearchBuilder sb = createSearchBuilder(); + EngineHostVO host = (EngineHostVO)vo; + SearchBuilder sb = createSearchBuilder(); sb.and("resource_state", sb.entity().getResourceState(), SearchCriteria.Op.EQ); sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ); sb.done(); - SearchCriteria sc = sb.create(); + SearchCriteria sc = sb.create(); sc.setParameters("resource_state", oldState); sc.setParameters("id", host.getId()); @@ -693,7 +693,7 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao assert result <= 1 : "How can this update " + result + " rows? "; if (state_logger.isDebugEnabled() && result == 0) { - HostVO ho = findById(host.getId()); + EngineHostVO ho = findById(host.getId()); assert ho != null : "How how how? : " + host.getId(); StringBuilder str = new StringBuilder("Unable to update resource state: ["); @@ -717,8 +717,8 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao } @Override - public HostVO findByTypeNameAndZoneId(long zoneId, String name, Host.Type type) { - SearchCriteria sc = TypeNameZoneSearch.create(); + public EngineHostVO findByTypeNameAndZoneId(long zoneId, String name, Host.Type type) { + SearchCriteria sc = TypeNameZoneSearch.create(); sc.setParameters("type", type); sc.setParameters("name", name); sc.setParameters("zoneId", zoneId); @@ -726,8 +726,8 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao } @Override - public List findHypervisorHostInCluster(long clusterId) { - SearchCriteria sc = TypeClusterStatusSearch.create(); + public List findHypervisorHostInCluster(long clusterId) { + SearchCriteria sc = TypeClusterStatusSearch.create(); sc.setParameters("type", Host.Type.Routing); sc.setParameters("cluster", clusterId); sc.setParameters("status", Status.Up); @@ -737,16 +737,16 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao } @Override - public List lockRows( - SearchCriteria sc, + public List lockRows( + SearchCriteria sc, Filter filter, boolean exclusive) { // TODO Auto-generated method stub return null; } @Override - public org.apache.cloudstack.engine.datacenter.entity.api.db.HostVO lockOneRandomRow( - SearchCriteria sc, + public org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO lockOneRandomRow( + SearchCriteria sc, boolean exclusive) { // TODO Auto-generated method stub return null; @@ -754,32 +754,32 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao @Override - public List search( - SearchCriteria sc, + public List search( + SearchCriteria sc, Filter filter) { // TODO Auto-generated method stub return null; } @Override - public List search( - SearchCriteria sc, + public List search( + SearchCriteria sc, Filter filter, boolean enable_query_cache) { // TODO Auto-generated method stub return null; } @Override - public List searchIncludingRemoved( - SearchCriteria sc, + public List searchIncludingRemoved( + SearchCriteria sc, Filter filter, Boolean lock, boolean cache) { // TODO Auto-generated method stub return null; } @Override - public List searchIncludingRemoved( - SearchCriteria sc, + public List searchIncludingRemoved( + SearchCriteria sc, Filter filter, Boolean lock, boolean cache, boolean enable_query_cache) { // TODO Auto-generated method stub @@ -789,19 +789,19 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao @Override public int remove( - SearchCriteria sc) { + SearchCriteria sc) { // TODO Auto-generated method stub return 0; } @Override - public int expunge(SearchCriteria sc) { + public int expunge(SearchCriteria sc) { // TODO Auto-generated method stub return 0; } @Override - public HostVO findOneBy(SearchCriteria sc) { + public EngineHostVO findOneBy(SearchCriteria sc) { // TODO Auto-generated method stub return null; } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostPodDao.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java similarity index 74% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostPodDao.java rename to engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java index a5482cad7d8..48e77739085 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostPodDao.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java @@ -16,16 +16,16 @@ import java.util.HashMap; import java.util.List; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity; -import org.apache.cloudstack.engine.datacenter.entity.api.db.HostPodVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; import com.cloud.utils.db.GenericDao; import com.cloud.utils.fsm.StateDao; -public interface HostPodDao extends GenericDao, StateDao { - public List listByDataCenterId(long id); +public interface EngineHostPodDao extends GenericDao, StateDao { + public List listByDataCenterId(long id); - public HostPodVO findByName(String name, long dcId); + public EngineHostPodVO findByName(String name, long dcId); public HashMap> getCurrentPodCidrSubnets(long zoneId, long podIdToSkip); diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostPodDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java similarity index 82% rename from engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostPodDaoImpl.java rename to engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java index 0bb270ca7bc..c5b4bd28de4 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostPodDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java @@ -25,7 +25,7 @@ import javax.ejb.Local; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; -import org.apache.cloudstack.engine.datacenter.entity.api.db.HostPodVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -40,16 +40,16 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; @Component(value="EngineHostPodDao") -@Local(value={HostPodDao.class}) -public class HostPodDaoImpl extends GenericDaoBase implements HostPodDao { - private static final Logger s_logger = Logger.getLogger(HostPodDaoImpl.class); +@Local(value={EngineHostPodDao.class}) +public class EngineHostPodDaoImpl extends GenericDaoBase implements EngineHostPodDao { + private static final Logger s_logger = Logger.getLogger(EngineHostPodDaoImpl.class); - protected SearchBuilder DataCenterAndNameSearch; - protected SearchBuilder DataCenterIdSearch; - protected SearchBuilder UUIDSearch; - protected SearchBuilder StateChangeSearch; + protected SearchBuilder DataCenterAndNameSearch; + protected SearchBuilder DataCenterIdSearch; + protected SearchBuilder UUIDSearch; + protected SearchBuilder StateChangeSearch; - protected HostPodDaoImpl() { + protected EngineHostPodDaoImpl() { DataCenterAndNameSearch = createSearchBuilder(); DataCenterAndNameSearch.and("dc", DataCenterAndNameSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ); DataCenterAndNameSearch.and("name", DataCenterAndNameSearch.entity().getName(), SearchCriteria.Op.EQ); @@ -72,16 +72,16 @@ public class HostPodDaoImpl extends GenericDaoBase implements H } @Override - public List listByDataCenterId(long id) { - SearchCriteria sc = DataCenterIdSearch.create(); + public List listByDataCenterId(long id) { + SearchCriteria sc = DataCenterIdSearch.create(); sc.setParameters("dcId", id); return listBy(sc); } @Override - public HostPodVO findByName(String name, long dcId) { - SearchCriteria sc = DataCenterAndNameSearch.create(); + public EngineHostPodVO findByName(String name, long dcId) { + SearchCriteria sc = DataCenterAndNameSearch.create(); sc.setParameters("dc", dcId); sc.setParameters("name", name); @@ -121,7 +121,7 @@ public class HostPodDaoImpl extends GenericDaoBase implements H public boolean remove(Long id) { Transaction txn = Transaction.currentTxn(); txn.start(); - HostPodVO pod = createForUpdate(); + EngineHostPodVO pod = createForUpdate(); pod.setName(null); update(id, pod); @@ -133,7 +133,7 @@ public class HostPodDaoImpl extends GenericDaoBase implements H @Override public List listDisabledPods(long zoneId) { - GenericSearchBuilder podIdSearch = createSearchBuilder(Long.class); + GenericSearchBuilder podIdSearch = createSearchBuilder(Long.class); podIdSearch.selectField(podIdSearch.entity().getId()); podIdSearch.and("dataCenterId", podIdSearch.entity().getDataCenterId(), Op.EQ); podIdSearch.and("allocationState", podIdSearch.entity().getAllocationState(), Op.EQ); @@ -150,11 +150,11 @@ public class HostPodDaoImpl extends GenericDaoBase implements H @Override public boolean updateState(State currentState, Event event, State nextState, DataCenterResourceEntity podEntity, Object data) { - HostPodVO vo = findById(podEntity.getId()); + EngineHostPodVO vo = findById(podEntity.getId()); Date oldUpdatedTime = vo.getLastUpdated(); - SearchCriteria sc = StateChangeSearch.create(); + SearchCriteria sc = StateChangeSearch.create(); sc.setParameters("id", vo.getId()); sc.setParameters("state", currentState); @@ -162,10 +162,10 @@ public class HostPodDaoImpl extends GenericDaoBase implements H builder.set(vo, "state", nextState); builder.set(vo, "lastUpdated", new Date()); - int rows = update((HostPodVO) vo, sc); + int rows = update((EngineHostPodVO) vo, sc); if (rows == 0 && s_logger.isDebugEnabled()) { - HostPodVO dbDC = findByIdIncludingRemoved(vo.getId()); + EngineHostPodVO dbDC = findByIdIncludingRemoved(vo.getId()); if (dbDC != null) { StringBuilder str = new StringBuilder("Unable to update ").append(vo.toString()); str.append(": DB Data={id=").append(dbDC.getId()).append("; state=").append(dbDC.getState()).append(";updatedTime=") diff --git a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java index 86cd47830e6..3b1721f37fb 100644 --- a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java +++ b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ChildTestConfiguration.java @@ -17,10 +17,10 @@ package org.apache.cloudstack.engine.provisioning.test; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.ClusterDao; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.DataCenterDao; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.HostDao; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.HostPodDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; @@ -30,22 +30,22 @@ import org.springframework.context.annotation.Bean; public class ChildTestConfiguration { @Bean - public DataCenterDao dataCenterDao() { - return Mockito.mock(DataCenterDao.class); + public EngineDataCenterDao dataCenterDao() { + return Mockito.mock(EngineDataCenterDao.class); } @Bean - public HostPodDao hostPodDao() { - return Mockito.mock(HostPodDao.class); + public EngineHostPodDao hostPodDao() { + return Mockito.mock(EngineHostPodDao.class); } @Bean - public ClusterDao clusterDao() { - return Mockito.mock(ClusterDao.class); + public EngineClusterDao clusterDao() { + return Mockito.mock(EngineClusterDao.class); } @Bean - public HostDao hostDao() { - return Mockito.mock(HostDao.class); + public EngineHostDao hostDao() { + return Mockito.mock(EngineHostDao.class); } } diff --git a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java index eaff4269a0b..1f7cc1f0ca7 100644 --- a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java +++ b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java @@ -31,10 +31,10 @@ import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEnti import org.apache.cloudstack.engine.datacenter.entity.api.HostEntity; import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity; import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.ClusterDao; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.DataCenterDao; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.HostDao; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.HostPodDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao; import org.apache.cloudstack.engine.service.api.ProvisioningService; import org.junit.Before; import org.junit.Test; @@ -43,10 +43,10 @@ import org.mockito.Mockito; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.apache.cloudstack.engine.datacenter.entity.api.db.ClusterVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.DataCenterVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.HostPodVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.HostVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; import com.cloud.dc.DataCenter.NetworkType; @@ -60,35 +60,35 @@ public class ProvisioningTest extends TestCase { ProvisioningService service; @Inject - DataCenterDao dcDao; + EngineDataCenterDao dcDao; @Inject - HostPodDao _podDao; + EngineHostPodDao _podDao; @Inject - ClusterDao _clusterDao; + EngineClusterDao _clusterDao; @Inject - HostDao _hostDao; + EngineHostDao _hostDao; @Before public void setUp() { - DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", + EngineDataCenterVO dc = new EngineDataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, true); - Mockito.when(dcDao.findByUUID(Mockito.anyString())).thenReturn(dc); - Mockito.when(dcDao.persist((DataCenterVO) Mockito.anyObject())).thenReturn(dc); + Mockito.when(dcDao.findByUuid(Mockito.anyString())).thenReturn(dc); + Mockito.when(dcDao.persist((EngineDataCenterVO) Mockito.anyObject())).thenReturn(dc); - HostPodVO pod = new HostPodVO("lab", 123, "10.0.0.1", "10.0.0.1", 24, "test"); - Mockito.when(_podDao.findByUUID(Mockito.anyString())).thenReturn(pod); - Mockito.when(_podDao.persist((HostPodVO) Mockito.anyObject())).thenReturn(pod); + EngineHostPodVO pod = new EngineHostPodVO("lab", 123, "10.0.0.1", "10.0.0.1", 24, "test"); + Mockito.when(_podDao.findByUuid(Mockito.anyString())).thenReturn(pod); + Mockito.when(_podDao.persist((EngineHostPodVO) Mockito.anyObject())).thenReturn(pod); - ClusterVO cluster = new ClusterVO(); - Mockito.when(_clusterDao.findByUUID(Mockito.anyString())).thenReturn(cluster); - Mockito.when(_clusterDao.persist((ClusterVO) Mockito.anyObject())).thenReturn(cluster); + EngineClusterVO cluster = new EngineClusterVO(); + Mockito.when(_clusterDao.findByUuid(Mockito.anyString())).thenReturn(cluster); + Mockito.when(_clusterDao.persist((EngineClusterVO) Mockito.anyObject())).thenReturn(cluster); - HostVO host = new HostVO("68765876598"); - Mockito.when(_hostDao.findByUUID(Mockito.anyString())).thenReturn(host); - Mockito.when(_hostDao.persist((HostVO) Mockito.anyObject())).thenReturn(host); + EngineHostVO host = new EngineHostVO("68765876598"); + Mockito.when(_hostDao.findByUuid(Mockito.anyString())).thenReturn(host); + Mockito.when(_hostDao.persist((EngineHostVO) Mockito.anyObject())).thenReturn(host); } diff --git a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java index 407084c65f3..4c8210d0e62 100755 --- a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java +++ b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java @@ -354,7 +354,7 @@ public class BareMetalVmManagerImpl extends UserVmManagerImpl implements BareMet } UserVmVO vm = new UserVmVO(id, instanceName, cmd.getDisplayName(), template.getId(), HypervisorType.BareMetal, - template.getGuestOSId(), offering.getOfferHA(), false, domainId, owner.getId(), offering.getId(), userData, hostName); + template.getGuestOSId(), offering.getOfferHA(), false, domainId, owner.getId(), offering.getId(), userData, hostName, null); if (sshPublicKey != null) { vm.setDetail("SSH.PublicKey", sshPublicKey); diff --git a/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java b/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java index 1a5a9008d92..0936180383a 100644 --- a/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java +++ b/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java @@ -33,7 +33,7 @@ public class UserVmDaoImplTest extends TestCase { dao.expunge(1000l); - UserVmVO vo = new UserVmVO(1000l, "instancename", "displayname", 1, HypervisorType.XenServer, 1, true, true, 1, 1, 1, "userdata", "name"); + UserVmVO vo = new UserVmVO(1000l, "instancename", "displayname", 1, HypervisorType.XenServer, 1, true, true, 1, 1, 1, "userdata", "name", null); dao.persist(vo); vo = dao.findById(1000l); diff --git a/setup/db/4.1-new-db-schema.sql b/setup/db/4.1-new-db-schema.sql index f52354fd9c6..24ab81d5c11 100644 --- a/setup/db/4.1-new-db-schema.sql +++ b/setup/db/4.1-new-db-schema.sql @@ -23,6 +23,27 @@ alter table template_spool_ref add state varchar(255); alter table template_spool_ref add update_count bigint unsigned; alter table volumes add disk_type varchar(255); alter table volumes drop foreign key `fk_volumes__account_id`; +alter table vm_instance add column disk_offering_id bigint unsigned; +alter table data_center add column owner varchar(255); +alter table data_center add column created datetime COMMENT 'date created'; +alter table data_center add column lastUpdated datetime COMMENT 'last updated'; +alter table data_center add column engine_state varchar(32) NOT NULL COMMENT 'the engine state of the zone'; +alter table host_pod_ref add column owner varchar(255); +alter table host_pod_ref add column created datetime COMMENT 'date created'; +alter table host_pod_ref add column lastUpdated datetime COMMENT 'last updated'; +alter table host_pod_ref add column engine_state varchar(32) NOT NULL COMMENT 'the engine state of the zone'; +alter table host add column owner varchar(255); +alter table host add column lastUpdated datetime COMMENT 'last updated'; +alter table host add column engine_state varchar(32) NOT NULL COMMENT 'the engine state of the zone'; + + +alter table cluster add column owner varchar(255); +alter table cluster add column created datetime COMMENT 'date created'; +alter table cluster add column lastUpdated datetime COMMENT 'last updated'; +alter table cluster add column engine_state varchar(32) NOT NULL COMMENT 'the engine state of the zone'; + +alter table data_center add column removed datetime COMMENT 'date removed'; + CREATE TABLE `cloud`.`data_store_provider` ( `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', `name` varchar(255) NOT NULL COMMENT 'name of primary data store provider',