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

Removed getPod, getCluster from ConfigurationManager

This commit is contained in:
Alex Huang 2013-08-26 15:06:36 -07:00
parent ff6b3fd11a
commit 2d05fe40c0
4 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -89,6 +89,7 @@ import com.cloud.dc.ClusterDetailsVO;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.HostPodVO;
import com.cloud.dc.Pod;
import com.cloud.dc.dao.ClusterDao;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.dc.dao.HostPodDao;
@ -1906,9 +1907,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
Host host = _hostDao.findById(vm.getHostId());
Cluster cluster = null;
if (host != null) {
cluster = _configMgr.getCluster(host.getClusterId());
cluster = _entityMgr.findById(Cluster.class, host.getClusterId());
}
HostPodVO pod = _configMgr.getPod(host.getPodId());
Pod pod = _entityMgr.findById(Pod.class, host.getPodId());
DeployDestination dest = new DeployDestination(dc, pod, cluster, host);
try {

4
server/src/com/cloud/configuration/ConfigurationManager.java
View File

@ -225,10 +225,6 @@ public interface ConfigurationManager extends ConfigurationService, Manager {
void createDefaultSystemNetworks(long zoneId) throws ConcurrentOperationException;
HostPodVO getPod(long id);
ClusterVO getCluster(long id);
boolean releaseAccountSpecificVirtualRanges(long accountId);
/**

10
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -4863,16 +4863,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
return result;
}
@Override
public HostPodVO getPod(long id) {
return _podDao.findById(id);
}
@Override
public ClusterVO getCluster(long id) {
return _clusterDao.findById(id);
}
@Override
public AllocationState findClusterAllocationState(ClusterVO cluster) {

18
server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
View File

@ -540,24 +540,6 @@ public class MockConfigurationManagerImpl extends ManagerBase implements Configu
}
/* (non-Javadoc)
* @see com.cloud.configuration.ConfigurationManager#getPod(long)
*/
@Override
public HostPodVO getPod(long id) {
// TODO Auto-generated method stub
return null;
}
/* (non-Javadoc)
* @see com.cloud.configuration.ConfigurationManager#getCluster(long)
*/
@Override
public ClusterVO getCluster(long id) {
// TODO Auto-generated method stub
return null;
}
/* (non-Javadoc)
* @see com.cloud.configuration.ConfigurationManager#deleteAccountSpecificVirtualRanges(long)
*/