bug CS-14530: Whwnever creating an agent for the host put in enabled and disabled according to the hierarchy.

nitinmeh · nitinmeh · commit 0b18117db95e · 2012-04-19T19:00:53.000+05:30
Reviewed By: Kishan
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -43,6 +43,7 @@
 import com.cloud.agent.manager.allocator.PodAllocator;
 import com.cloud.agent.transport.Request;
 import com.cloud.api.ApiConstants;
+import com.cloud.api.ApiDBUtils;
 import com.cloud.api.commands.AddClusterCmd;
 import com.cloud.api.commands.AddHostCmd;
 import com.cloud.api.commands.AddSecondaryStorageCmd;
@@ -60,6 +61,7 @@
 import com.cloud.cluster.ClusterManager;
 import com.cloud.cluster.ManagementServerNode;
 import com.cloud.configuration.Config;
+import com.cloud.configuration.ConfigurationManager;
 import com.cloud.configuration.dao.ConfigurationDao;
 import com.cloud.dc.ClusterDetailsDao;
 import com.cloud.dc.ClusterVO;
@@ -95,6 +97,7 @@
 import com.cloud.org.Cluster;
 import com.cloud.org.Grouping;
 import com.cloud.org.Managed;
+import com.cloud.org.Grouping.AllocationState;
 import com.cloud.service.ServiceOfferingVO;
 import com.cloud.storage.GuestOSCategoryVO;
 import com.cloud.storage.StorageManager;
@@ -196,6 +199,8 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma
     @Inject
     protected ClusterManager                 _clusterMgr;
     @Inject
+    ConfigurationManager 					 _configMgr;   
+    @Inject
     protected StoragePoolHostDao             _storagePoolHostDao;
     @Inject(adapter = PodAllocator.class)
     protected Adapters<PodAllocator> _podAllocators = null;
@@ -1064,7 +1069,11 @@ public boolean resourceStateTransitTo(Host host, ResourceState.Event event, long
         }
         
         // TO DO - Make it more granular and have better conversion into capacity type
-        _capacityDao.updateCapacityState(null, null, null, host.getId(), nextState.toString());
+       AllocationState capacityState =  _configMgr.findClusterAllocationState(ApiDBUtils.findClusterById(host.getClusterId()));
+       if (capacityState == AllocationState.Enabled && nextState != ResourceState.Enabled){
+    	   capacityState = AllocationState.Disabled;
+       }
+        _capacityDao.updateCapacityState(null, null, null, host.getId(), capacityState.toString());
         return _hostDao.updateResourceState(currentState, event, nextState, host);
     }
     
