CLOUDSTACK-4948: DeploymentPlanner: Logic to check if cluster can be avoided, needs to consider if VM is using local storage and/or shared storage

Changes:
	- Changes due to VirtualMachineProfile changes done in master
This commit is contained in:
Prachi Damle 2013-10-25 16:40:01 -07:00
parent 4be7947281
commit 863a84a15d
1 changed files with 2 additions and 2 deletions

View File

@ -916,7 +916,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
}
private boolean canAvoidCluster(Cluster clusterVO, ExcludeList avoids, ExcludeList plannerAvoidOutput,
VirtualMachineProfile<? extends VirtualMachine> vmProfile) {
VirtualMachineProfile vmProfile) {
ExcludeList allocatorAvoidOutput = new ExcludeList(avoids.getDataCentersToAvoid(), avoids.getPodsToAvoid(),
avoids.getClustersToAvoid(), avoids.getHostsToAvoid(), avoids.getPoolsToAvoid());
@ -990,7 +990,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
return false;
}
private Pair<Boolean, Boolean> findVMStorageRequirements(VirtualMachineProfile<? extends VirtualMachine> vmProfile) {
private Pair<Boolean, Boolean> findVMStorageRequirements(VirtualMachineProfile vmProfile) {
boolean requiresShared = false, requiresLocal = false;