cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: updated refs/heads/master to e37842c
Date Sat, 05 Dec 2015 18:12:02 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 74e33dc5a -> e37842cbd


Removed PlannerBase empty class

The PlannerBase is an empty class, and does not bring contribution to
ACS code.
We changed com.cloud.deploy.FirstFitPlanner to extend the AdapterBase
and implements the com.cloud.deploy.DeploymentPlanner.

We also removed the method
com.cloud.deploy.DeploymentPlanner.check(VirtualMachineProfile,
DeploymentPlan, DeployDestination, ExcludeList) that was not used
anywhere.

Additionally, we removed the “_” from FirstFitPlanner's attributes name,
in order to have them in a more standard way.


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

Branch: refs/heads/master
Commit: 7453727c7b34616754670e7744122cf763836bee
Parents: d7859ad
Author: weingartner <rafaelweingartner@gmail.com>
Authored: Sat Nov 28 09:47:42 2015 -0200
Committer: weingartner <rafaelweingartner@gmail.com>
Committed: Tue Dec 1 11:45:23 2015 -0200

----------------------------------------------------------------------
 api/src/com/cloud/deploy/DeploymentPlanner.java |  18 ---
 .../cloud/deploy/ImplicitDedicationPlanner.java |   8 +-
 .../deploy/UserConcentratedPodPlanner.java      |   4 +-
 .../com/cloud/deploy/UserDispersingPlanner.java |  10 +-
 .../baremetal/manager/BareMetalPlanner.java     |   8 +-
 .../src/com/cloud/deploy/FirstFitPlanner.java   | 109 +++++++++----------
 server/src/com/cloud/deploy/PlannerBase.java    |  23 ----
 7 files changed, 64 insertions(+), 116 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7453727c/api/src/com/cloud/deploy/DeploymentPlanner.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/deploy/DeploymentPlanner.java b/api/src/com/cloud/deploy/DeploymentPlanner.java
index dc7ea6d..e9f706a 100644
--- a/api/src/com/cloud/deploy/DeploymentPlanner.java
+++ b/api/src/com/cloud/deploy/DeploymentPlanner.java
@@ -51,23 +51,6 @@ public interface DeploymentPlanner extends Adapter {
     DeployDestination plan(VirtualMachineProfile vm, DeploymentPlan plan, ExcludeList avoid)
throws InsufficientServerCapacityException;
 
     /**
-     * check() is called right before the virtual machine starts to make sure
-     * the host has enough capacity.
-     *
-     * @param vm
-     *            virtual machine in question.
-     * @param plan
-     *            deployment plan used to determined the deploy destination.
-     * @param dest
-     *            destination returned by plan.
-     * @param avoid
-     *            what to avoid.
-     * @return true if it's okay to start; false if not. If false, the exclude list will
include what should be
-     *         excluded.
-     */
-    boolean check(VirtualMachineProfile vm, DeploymentPlan plan, DeployDestination dest,
ExcludeList exclude);
-
-    /**
      * canHandle is called before plan to determine if the plan can do the allocation. Planers
should be exclusive so
      * planner writer must
      * make sure only one planer->canHandle return true in the planner list
@@ -176,7 +159,6 @@ public interface DeploymentPlanner extends Adapter {
             _poolIds.add(poolId);
         }
 
-
         public void addDataCenter(long dataCenterId) {
             if (_dcIds == null) {
                 _dcIds = new HashSet<Long>();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7453727c/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java
----------------------------------------------------------------------
diff --git a/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java
b/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java
index 24d86b0..5bad922 100644
--- a/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java
+++ b/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java
@@ -56,7 +56,7 @@ public class ImplicitDedicationPlanner extends FirstFitPlanner implements
Deploy
     @Override
     public boolean configure(final String name, final Map<String, Object> params) throws
ConfigurationException {
         super.configure(name, params);
-        capacityReleaseInterval = NumbersUtil.parseInt(_configDao.getValue(Config.CapacitySkipcountingHours.key()),
3600);
+        capacityReleaseInterval = NumbersUtil.parseInt(configDao.getValue(Config.CapacitySkipcountingHours.key()),
3600);
         return true;
     }
 
@@ -135,8 +135,8 @@ public class ImplicitDedicationPlanner extends FirstFitPlanner implements
Deploy
     }
 
     private List<VMInstanceVO> getVmsOnHost(long hostId) {
-        List<VMInstanceVO> vms = _vmInstanceDao.listUpByHostId(hostId);
-        List<VMInstanceVO> vmsByLastHostId = _vmInstanceDao.listByLastHostId(hostId);
+        List<VMInstanceVO> vms = vmInstanceDao.listUpByHostId(hostId);
+        List<VMInstanceVO> vmsByLastHostId = vmInstanceDao.listByLastHostId(hostId);
         if (vmsByLastHostId.size() > 0) {
             // check if any VMs are within skip.counting.hours, if yes we have to consider
the host.
             for (VMInstanceVO stoppedVM : vmsByLastHostId) {
@@ -198,7 +198,7 @@ public class ImplicitDedicationPlanner extends FirstFitPlanner implements
Deploy
         } else {
             String plannerName = offering.getDeploymentPlanner();
             if (plannerName == null) {
-                plannerName = _globalDeploymentPlanner;
+                plannerName = globalDeploymentPlanner;
             }
 
             if (plannerName != null && this.getName().equals(plannerName)) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7453727c/plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java
----------------------------------------------------------------------
diff --git a/plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java
b/plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java
index 40216ae..d39e4db 100644
--- a/plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java
+++ b/plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java
@@ -66,7 +66,7 @@ public class UserConcentratedPodPlanner extends FirstFitPlanner implements
Deplo
             s_logger.debug("Reordering cluster list as per pods ordered by user concentration");
         }
 
-        Map<Long, List<Long>> podClusterMap = _clusterDao.getPodClusterIdMap(clusterIds);
+        Map<Long, List<Long>> podClusterMap = clusterDao.getPodClusterIdMap(clusterIds);
 
         if (s_logger.isTraceEnabled()) {
             s_logger.trace("Pod To cluster Map is: " + podClusterMap);
@@ -100,7 +100,7 @@ public class UserConcentratedPodPlanner extends FirstFitPlanner implements
Deplo
             s_logger.debug("Applying UserConcentratedPod heuristic for account: " + accountId);
         }
 
-        List<Long> prioritizedPods = _vmDao.listPodIdsHavingVmsforAccount(zoneId, accountId);
+        List<Long> prioritizedPods = vmDao.listPodIdsHavingVmsforAccount(zoneId, accountId);
 
         if (s_logger.isTraceEnabled()) {
             s_logger.trace("List of pods to be considered, after applying UserConcentratedPod
heuristic: " + prioritizedPods);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7453727c/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java
----------------------------------------------------------------------
diff --git a/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java
b/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java
index fb1cceb..ce66294 100644
--- a/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java
+++ b/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java
@@ -102,9 +102,9 @@ public class UserDispersingPlanner extends FirstFitPlanner implements
Deployment
         }
         Pair<List<Long>, Map<Long, Double>> clusterIdsVmCountInfo;
         if (isZone) {
-            clusterIdsVmCountInfo = _vmInstanceDao.listClusterIdsInZoneByVmCount(id, accountId);
+            clusterIdsVmCountInfo = vmInstanceDao.listClusterIdsInZoneByVmCount(id, accountId);
         } else {
-            clusterIdsVmCountInfo = _vmInstanceDao.listClusterIdsInPodByVmCount(id, accountId);
+            clusterIdsVmCountInfo = vmInstanceDao.listClusterIdsInPodByVmCount(id, accountId);
         }
         if (s_logger.isTraceEnabled()) {
             s_logger.trace("List of clusters in ascending order of number of VMs: " + clusterIdsVmCountInfo.first());
@@ -116,7 +116,7 @@ public class UserDispersingPlanner extends FirstFitPlanner implements
Deployment
         if (s_logger.isDebugEnabled()) {
             s_logger.debug("Applying Userdispersion heuristic to pods for account: " + accountId);
         }
-        Pair<List<Long>, Map<Long, Double>> podIdsVmCountInfo = _vmInstanceDao.listPodIdsInZoneByVmCount(dataCenterId,
accountId);
+        Pair<List<Long>, Map<Long, Double>> podIdsVmCountInfo = vmInstanceDao.listPodIdsInZoneByVmCount(dataCenterId,
accountId);
         if (s_logger.isTraceEnabled()) {
             s_logger.trace("List of pods in ascending order of number of VMs: " + podIdsVmCountInfo.first());
         }
@@ -146,7 +146,7 @@ public class UserDispersingPlanner extends FirstFitPlanner implements
Deployment
         //normalize the vmCountMap
         LinkedHashMap<Long, Double> normalisedVmCountIdMap = new LinkedHashMap<Long,
Double>();
 
-        Long totalVmsOfAccount = _vmInstanceDao.countRunningByAccount(accountId);
+        Long totalVmsOfAccount = vmInstanceDao.countRunningByAccount(accountId);
         if (s_logger.isDebugEnabled()) {
             s_logger.debug("Total VMs for account: " + totalVmsOfAccount);
         }
@@ -190,7 +190,7 @@ public class UserDispersingPlanner extends FirstFitPlanner implements
Deployment
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException
{
         super.configure(name, params);
 
-        String weight = _configDao.getValue(Config.VmUserDispersionWeight.key());
+        String weight = configDao.getValue(Config.VmUserDispersionWeight.key());
         _userDispersionWeight = NumbersUtil.parseFloat(weight, 1.0f);
 
         return true;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7453727c/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java
index b33f3f2..5d6472b 100644
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java
@@ -22,9 +22,8 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.log4j.Logger;
 
 import com.cloud.capacity.CapacityManager;
 import com.cloud.dc.ClusterDetailsDao;
@@ -170,9 +169,4 @@ public class BareMetalPlanner extends AdapterBase implements DeploymentPlanner
{
         return true;
     }
 
-    @Override
-    public boolean check(VirtualMachineProfile vm, DeploymentPlan plan, DeployDestination
dest, ExcludeList exclude) {
-        // TODO Auto-generated method stub
-        return false;
-    }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7453727c/server/src/com/cloud/deploy/FirstFitPlanner.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java
index cffff27..640834b 100644
--- a/server/src/com/cloud/deploy/FirstFitPlanner.java
+++ b/server/src/com/cloud/deploy/FirstFitPlanner.java
@@ -62,66 +62,67 @@ import com.cloud.storage.dao.VolumeDao;
 import com.cloud.user.AccountManager;
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.Pair;
+import com.cloud.utils.component.AdapterBase;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.dao.UserVmDao;
 import com.cloud.vm.dao.VMInstanceDao;
 
-public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPlanner, Configurable
{
+public class FirstFitPlanner extends AdapterBase implements DeploymentClusterPlanner, Configurable,
DeploymentPlanner {
     private static final Logger s_logger = Logger.getLogger(FirstFitPlanner.class);
     @Inject
-    protected HostDao _hostDao;
+    protected HostDao hostDao;
     @Inject
-    protected DataCenterDao _dcDao;
+    protected DataCenterDao dcDao;
     @Inject
-    protected HostPodDao _podDao;
+    protected HostPodDao podDao;
     @Inject
-    protected ClusterDao _clusterDao;
+    protected ClusterDao clusterDao;
     @Inject
-    protected GuestOSDao _guestOSDao = null;
+    protected GuestOSDao guestOSDao;
     @Inject
-    protected GuestOSCategoryDao _guestOSCategoryDao = null;
+    protected GuestOSCategoryDao guestOSCategoryDao;
     @Inject
-    protected DiskOfferingDao _diskOfferingDao;
+    protected DiskOfferingDao diskOfferingDao;
     @Inject
-    protected StoragePoolHostDao _poolHostDao;
+    protected StoragePoolHostDao poolHostDao;
     @Inject
-    protected UserVmDao _vmDao;
+    protected UserVmDao vmDao;
     @Inject
-    protected VMInstanceDao _vmInstanceDao;
+    protected VMInstanceDao vmInstanceDao;
     @Inject
-    protected VolumeDao _volsDao;
+    protected VolumeDao volsDao;
     @Inject
-    protected CapacityManager _capacityMgr;
+    protected CapacityManager capacityMgr;
     @Inject
-    protected ConfigurationDao _configDao;
+    protected ConfigurationDao configDao;
     @Inject
-    protected PrimaryDataStoreDao _storagePoolDao;
+    protected PrimaryDataStoreDao storagePoolDao;
     @Inject
-    protected CapacityDao _capacityDao;
+    protected CapacityDao capacityDao;
     @Inject
-    protected AccountManager _accountMgr;
+    protected AccountManager accountMgr;
     @Inject
-    protected StorageManager _storageMgr;
+    protected StorageManager storageMgr;
     @Inject
     DataStoreManager dataStoreMgr;
     @Inject
-    protected ClusterDetailsDao _clusterDetailsDao;
+    protected ClusterDetailsDao clusterDetailsDao;
     @Inject
-    protected ServiceOfferingDetailsDao _serviceOfferingDetailsDao;
+    protected ServiceOfferingDetailsDao serviceOfferingDetailsDao;
     @Inject
-    protected HostGpuGroupsDao _hostGpuGroupsDao;
+    protected HostGpuGroupsDao hostGpuGroupsDao;
     @Inject
-    protected HostTagsDao _hostTagsDao;
+    protected HostTagsDao hostTagsDao;
 
-    protected String _allocationAlgorithm = "random";
-    protected String _globalDeploymentPlanner = "FirstFitPlanner";
-    protected String[] _implicitHostTags;
+    protected String allocationAlgorithm = "random";
+    protected String globalDeploymentPlanner = "FirstFitPlanner";
+    protected String[] implicitHostTags;
 
     @Override
     public List<Long> orderClusters(VirtualMachineProfile vmProfile, DeploymentPlan
plan, ExcludeList avoid) throws InsufficientServerCapacityException {
         VirtualMachine vm = vmProfile.getVirtualMachine();
-        DataCenter dc = _dcDao.findById(vm.getDataCenterId());
+        DataCenter dc = dcDao.findById(vm.getDataCenterId());
 
         //check if datacenter is in avoid set
         if (avoid.shouldAvoid(dc)) {
@@ -135,7 +136,7 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
         if (plan.getClusterId() != null) {
             Long clusterIdSpecified = plan.getClusterId();
             s_logger.debug("Searching resources only under specified Cluster: " + clusterIdSpecified);
-            ClusterVO cluster = _clusterDao.findById(plan.getClusterId());
+            ClusterVO cluster = clusterDao.findById(plan.getClusterId());
             if (cluster != null) {
                 if (avoid.shouldAvoid(cluster)) {
                     s_logger.debug("The specified cluster is in avoid set, returning.");
@@ -153,7 +154,7 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
             Long podIdSpecified = plan.getPodId();
             s_logger.debug("Searching resources only under specified Pod: " + podIdSpecified);
 
-            HostPodVO pod = _podDao.findById(podIdSpecified);
+            HostPodVO pod = podDao.findById(podIdSpecified);
             if (pod != null) {
                 if (avoid.shouldAvoid(pod)) {
                     s_logger.debug("The specified pod is in avoid set, returning.");
@@ -171,7 +172,7 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
         } else {
             s_logger.debug("Searching all possible resources under this Zone: " + plan.getDataCenterId());
 
-            boolean applyAllocationAtPods = Boolean.parseBoolean(_configDao.getValue(Config.ApplyAllocationAlgorithmToPods.key()));
+            boolean applyAllocationAtPods = Boolean.parseBoolean(configDao.getValue(Config.ApplyAllocationAlgorithmToPods.key()));
             if (applyAllocationAtPods) {
                 //start scan at all pods under this zone.
                 clusterList = scanPodsForDestination(vmProfile, plan, avoid);
@@ -184,7 +185,7 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
         if (clusterList != null && !clusterList.isEmpty()) {
             ServiceOffering offering = vmProfile.getServiceOffering();
             // In case of non-GPU VMs, protect GPU enabled Hosts and prefer VM deployment
on non-GPU Hosts.
-            if ((_serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.vgpuType.toString())
== null) && !(_hostGpuGroupsDao.listHostIds().isEmpty())) {
+            if ((serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.vgpuType.toString())
== null) && !(hostGpuGroupsDao.listHostIds().isEmpty())) {
                 int requiredCpu = offering.getCpu() * offering.getSpeed();
                 long requiredRam = offering.getRamSize() * 1024L * 1024L;
                 reorderClustersBasedOnImplicitTags(clusterList, requiredCpu, requiredRam);
@@ -198,9 +199,9 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
             Long uniqueTags;
             for (Long clusterId : clusterList) {
                 uniqueTags = (long) 0;
-                List<Long> hostList = _capacityDao.listHostsWithEnoughCapacity(requiredCpu,
requiredRam, clusterId, Host.Type.Routing.toString());
-                if (!hostList.isEmpty() && _implicitHostTags.length > 0) {
-                    uniqueTags = new Long(_hostTagsDao.getDistinctImplicitHostTags(hostList,
_implicitHostTags).size());
+            List<Long> hostList = capacityDao.listHostsWithEnoughCapacity(requiredCpu,
requiredRam, clusterId, Host.Type.Routing.toString());
+            if (!hostList.isEmpty() && implicitHostTags.length > 0) {
+                uniqueTags = new Long(hostTagsDao.getDistinctImplicitHostTags(hostList, implicitHostTags).size());
                 }
                 UniqueTagsInClusterMap.put(clusterId, uniqueTags);
             }
@@ -324,10 +325,10 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
             }
             if (capacity == Capacity.CAPACITY_TYPE_CPU) {
                 clustersCrossingThreshold =
-                    _capacityDao.listClustersCrossingThreshold(capacity, plan.getDataCenterId(),
ClusterCPUCapacityDisableThreshold.key(), cpu_requested);
+ capacityDao.listClustersCrossingThreshold(capacity, plan.getDataCenterId(), ClusterCPUCapacityDisableThreshold.key(),
cpu_requested);
             } else if (capacity == Capacity.CAPACITY_TYPE_MEMORY) {
                 clustersCrossingThreshold =
-                    _capacityDao.listClustersCrossingThreshold(capacity, plan.getDataCenterId(),
ClusterMemoryCapacityDisableThreshold.key(), ram_requested);
+ capacityDao.listClustersCrossingThreshold(capacity, plan.getDataCenterId(), ClusterMemoryCapacityDisableThreshold.key(),
ram_requested);
             }
 
             if (clustersCrossingThreshold != null && clustersCrossingThreshold.size()
!= 0) {
@@ -347,7 +348,7 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
 
         VirtualMachine vm = vmProfile.getVirtualMachine();
         ServiceOffering offering = vmProfile.getServiceOffering();
-        DataCenter dc = _dcDao.findById(vm.getDataCenterId());
+        DataCenter dc = dcDao.findById(vm.getDataCenterId());
         int requiredCpu = offering.getCpu() * offering.getSpeed();
         long requiredRam = offering.getRamSize() * 1024L * 1024L;
 
@@ -422,17 +423,17 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
     }
 
     private List<Long> listDisabledClusters(long zoneId, Long podId) {
-        List<Long> disabledClusters = _clusterDao.listDisabledClusters(zoneId, podId);
+        List<Long> disabledClusters = clusterDao.listDisabledClusters(zoneId, podId);
         if (podId == null) {
             //list all disabled clusters under this zone + clusters under any disabled pod
of this zone
-            List<Long> clustersWithDisabledPods = _clusterDao.listClustersWithDisabledPods(zoneId);
+            List<Long> clustersWithDisabledPods = clusterDao.listClustersWithDisabledPods(zoneId);
             disabledClusters.addAll(clustersWithDisabledPods);
         }
         return disabledClusters;
     }
 
     private List<Long> listDisabledPods(long zoneId) {
-        List<Long> disabledPods = _podDao.listDisabledPods(zoneId);
+        List<Long> disabledPods = podDao.listDisabledPods(zoneId);
         return disabledPods;
     }
 
@@ -445,17 +446,17 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
             s_logger.debug("Listing clusters in order of aggregate capacity, that have (atleast
one host with) enough CPU and RAM capacity under this " +
                 (isZone ? "Zone: " : "Pod: ") + id);
         }
-        String capacityTypeToOrder = _configDao.getValue(Config.HostCapacityTypeToOrderClusters.key());
+        String capacityTypeToOrder = configDao.getValue(Config.HostCapacityTypeToOrderClusters.key());
         short capacityType = Capacity.CAPACITY_TYPE_CPU;
         if ("RAM".equalsIgnoreCase(capacityTypeToOrder)) {
             capacityType = Capacity.CAPACITY_TYPE_MEMORY;
         }
 
-        List<Long> clusterIdswithEnoughCapacity = _capacityDao.listClustersInZoneOrPodByHostCapacities(id,
requiredCpu, requiredRam, capacityType, isZone);
+        List<Long> clusterIdswithEnoughCapacity = capacityDao.listClustersInZoneOrPodByHostCapacities(id,
requiredCpu, requiredRam, capacityType, isZone);
         if (s_logger.isTraceEnabled()) {
             s_logger.trace("ClusterId List having enough CPU and RAM capacity: " + clusterIdswithEnoughCapacity);
         }
-        Pair<List<Long>, Map<Long, Double>> result = _capacityDao.orderClustersByAggregateCapacity(id,
capacityType, isZone);
+        Pair<List<Long>, Map<Long, Double>> result = capacityDao.orderClustersByAggregateCapacity(id,
capacityType, isZone);
         List<Long> clusterIdsOrderedByAggregateCapacity = result.first();
         //only keep the clusters that have enough capacity to host this VM
         if (s_logger.isTraceEnabled()) {
@@ -479,17 +480,17 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
         if (s_logger.isDebugEnabled()) {
             s_logger.debug("Listing pods in order of aggregate capacity, that have (atleast
one host with) enough CPU and RAM capacity under this Zone: " + zoneId);
         }
-        String capacityTypeToOrder = _configDao.getValue(Config.HostCapacityTypeToOrderClusters.key());
+        String capacityTypeToOrder = configDao.getValue(Config.HostCapacityTypeToOrderClusters.key());
         short capacityType = Capacity.CAPACITY_TYPE_CPU;
         if ("RAM".equalsIgnoreCase(capacityTypeToOrder)) {
             capacityType = Capacity.CAPACITY_TYPE_MEMORY;
         }
 
-        List<Long> podIdswithEnoughCapacity = _capacityDao.listPodsByHostCapacities(zoneId,
requiredCpu, requiredRam, capacityType);
+        List<Long> podIdswithEnoughCapacity = capacityDao.listPodsByHostCapacities(zoneId,
requiredCpu, requiredRam, capacityType);
         if (s_logger.isTraceEnabled()) {
             s_logger.trace("PodId List having enough CPU and RAM capacity: " + podIdswithEnoughCapacity);
         }
-        Pair<List<Long>, Map<Long, Double>> result = _capacityDao.orderPodsByAggregateCapacity(zoneId,
capacityType);
+        Pair<List<Long>, Map<Long, Double>> result = capacityDao.orderPodsByAggregateCapacity(zoneId,
capacityType);
         List<Long> podIdsOrderedByAggregateCapacity = result.first();
         //only keep the clusters that have enough capacity to host this VM
         if (s_logger.isTraceEnabled()) {
@@ -508,7 +509,7 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
     private boolean isRootAdmin(VirtualMachineProfile vmProfile) {
         if (vmProfile != null) {
             if (vmProfile.getOwner() != null) {
-                return _accountMgr.isRootAdmin(vmProfile.getOwner().getId());
+                return accountMgr.isRootAdmin(vmProfile.getOwner().getId());
             } else {
                 return false;
             }
@@ -517,12 +518,6 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
     }
 
     @Override
-    public boolean check(VirtualMachineProfile vm, DeploymentPlan plan, DeployDestination
dest, ExcludeList exclude) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
     public boolean canHandle(VirtualMachineProfile vm, DeploymentPlan plan, ExcludeList avoid)
{
         // check what the ServiceOffering says. If null, check the global config
         ServiceOffering offering = vm.getServiceOffering();
@@ -532,7 +527,7 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
                     return true;
                 }
             } else {
-                if (_globalDeploymentPlanner != null && _globalDeploymentPlanner.equals(_name))
{
+                if (globalDeploymentPlanner != null && globalDeploymentPlanner.equals(_name))
{
                     return true;
                 }
             }
@@ -543,11 +538,11 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException
{
         super.configure(name, params);
-        _allocationAlgorithm = _configDao.getValue(Config.VmAllocationAlgorithm.key());
-        _globalDeploymentPlanner = _configDao.getValue(Config.VmDeploymentPlanner.key());
+        allocationAlgorithm = configDao.getValue(Config.VmAllocationAlgorithm.key());
+        globalDeploymentPlanner = configDao.getValue(Config.VmDeploymentPlanner.key());
         String configValue;
-        if ((configValue = _configDao.getValue(Config.ImplicitHostTags.key())) != null) {
-            _implicitHostTags = configValue.trim().split("\\s*,\\s*");
+        if ((configValue = configDao.getValue(Config.ImplicitHostTags.key())) != null) {
+            implicitHostTags = configValue.trim().split("\\s*,\\s*");
         }
         return true;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7453727c/server/src/com/cloud/deploy/PlannerBase.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/PlannerBase.java b/server/src/com/cloud/deploy/PlannerBase.java
deleted file mode 100644
index 842a10f..0000000
--- a/server/src/com/cloud/deploy/PlannerBase.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.deploy;
-
-import com.cloud.utils.component.AdapterBase;
-
-public abstract class PlannerBase extends AdapterBase implements DeploymentPlanner {
-
-}


Mime
View raw message