API refactor

.gitignore

@@ -1,4 +1,5 @@
 build/build.number
+build.number
 bin
 cloudstack-proprietary
 .lock-wscript

build/build.number

@@ -1,3 +0,0 @@
-#Build Number for ANT. Do not edit!
-#Sat Aug 07 12:54:57 PDT 2010
-build.number=927

server/src/com/cloud/agent/manager/AgentManager.java

@@ -15,20 +15,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package com.cloud.agent;
+package com.cloud.agent.manager;
 
 import java.net.URI;
 import java.util.List;
 import java.util.Set;
 
+import com.cloud.agent.Listener;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.Command;
+import com.cloud.api.commands.DeleteHostCmd;
 import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.HostPodVO;
 import com.cloud.dc.PodCluster;
 import com.cloud.exception.AgentUnavailableException;
 import com.cloud.exception.DiscoveryException;
 import com.cloud.exception.InternalErrorException;
+import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.OperationTimedoutException;
 import com.cloud.host.Host;
 import com.cloud.host.HostStats;
@@ -168,6 +171,14 @@ public interface AgentManager extends Manager {
      * @param true if deleted, false otherwise
      */
     boolean deleteHost(long hostId);
+    
+	/**
+     * Deletes a host
+     * 
+     * @param cmd
+     * @param true if deleted, false otherwise
+     */
+    boolean deleteHost(DeleteHostCmd cmd) throws InvalidParameterValueException; 
 	
 	/**
 	 * Find a pod based on the user id, template, and data center.

server/src/com/cloud/agent/manager/AgentManagerImpl.java

@@ -40,7 +40,6 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.Listener;
 import com.cloud.agent.api.AgentControlAnswer;
 import com.cloud.agent.api.AgentControlCommand;
@@ -70,6 +69,9 @@ import com.cloud.agent.transport.Request;
 import com.cloud.agent.transport.Response;
 import com.cloud.agent.transport.UpgradeResponse;
 import com.cloud.alert.AlertManager;
+import com.cloud.api.BaseCmd;
+import com.cloud.api.ServerApiException;
+import com.cloud.api.commands.DeleteHostCmd;
 import com.cloud.capacity.CapacityVO;
 import com.cloud.capacity.dao.CapacityDao;
 import com.cloud.configuration.dao.ConfigurationDao;
@@ -87,6 +89,7 @@ import com.cloud.event.dao.EventDao;
 import com.cloud.exception.AgentUnavailableException;
 import com.cloud.exception.DiscoveryException;
 import com.cloud.exception.InternalErrorException;
+import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.OperationTimedoutException;
 import com.cloud.exception.UnsupportedVersionException;
 import com.cloud.ha.HighAvailabilityManager;
@@ -566,6 +569,24 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory {
             return false;
         }
     }
+    
+    public boolean deleteHost(DeleteHostCmd cmd) throws InvalidParameterValueException{
+    	Long id = cmd.getId();
+    	
+    	//Verify that host exists
+    	HostVO host = _hostDao.findById(id);
+    	if (host == null) {
+    		throw new InvalidParameterValueException("Host with id " + id.toString() + " doesn't exist");
+    	}
+    	
+    	if (deleteHost(id)) {
+    		return true;
+    	}
+    	else {
+    		return false;
+    	}
+    }
+    
 
     @DB
     protected boolean deleteSecondaryStorageHost(HostVO secStorageHost) {

server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java

@@ -25,7 +25,7 @@ import javax.ejb.Local;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.agent.manager.allocator.HostAllocator;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenterVO;

server/src/com/cloud/api/BaseCmd.java

@@ -48,7 +48,7 @@ public abstract class BaseCmd {
     }
 
     public enum Manager {
-    	ConfigManager, ManagementServer, NetworkManager, StorageManager, UserVmManager
+    	ConfigManager, ManagementServer, NetworkManager, StorageManager, UserVmManager, AgentManager
     }
 
     // FIXME:  Extract these out into a separate file

server/src/com/cloud/api/commands/DeleteHostCmd.java

@@ -18,27 +18,19 @@
 
 package com.cloud.api.commands;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.log4j.Logger;
 
 import com.cloud.api.BaseCmd;
+import com.cloud.api.BaseCmd.Manager;
+import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
-import com.cloud.api.ServerApiException;
+
-import com.cloud.host.HostVO;
+
-import com.cloud.utils.Pair;
+@Implementation(method="deleteHost", manager=Manager.AgentManager)
-
 public class DeleteHostCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteHostCmd.class.getName());
 
     private static final String s_name = "deletehostresponse";
-    private static final List<Pair<Enum, Boolean>> s_properties = new ArrayList<Pair<Enum, Boolean>>();
-
-    static {
-        s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ID, Boolean.TRUE));
-    }
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -65,35 +57,30 @@ public class DeleteHostCmd extends BaseCmd {
     public String getName() {
         return s_name;
     }
-    
-    @Override
-    public List<Pair<Enum, Boolean>> getProperties() {
-        return s_properties;
-    }
 
-    @Override
+//    @Override
-    public List<Pair<String, Object>> execute(Map<String, Object> params) {
+//    public List<Pair<String, Object>> execute(Map<String, Object> params) {
-    	Long hostId = (Long)params.get(BaseCmd.Properties.ID.getName());
+//    	Long hostId = (Long)params.get(BaseCmd.Properties.ID.getName());
-    	
+//    	
-    	//verify input parameters
+//    	//verify input parameters
-    	HostVO host = getManagementServer().getHostBy(hostId);
+//    	HostVO host = getManagementServer().getHostBy(hostId);
-    	if (host == null) {
+//    	if (host == null) {
-    		throw new ServerApiException(BaseCmd.PARAM_ERROR, "Host with id " + hostId.toString() + " doesn't exist");
+//    		throw new ServerApiException(BaseCmd.PARAM_ERROR, "Host with id " + hostId.toString() + " doesn't exist");
-    	}
+//    	}
- 
+// 
-    	boolean success = false;
+//    	boolean success = false;
-    	try {
+//    	try {
-    		success = getManagementServer().deleteHost(hostId);
+//    		success = getManagementServer().deleteHost(hostId);
-    	} catch (Exception ex) {
+//    	} catch (Exception ex) {
-    	    s_logger.warn("Unable to delete host " + hostId, ex);
+//    	    s_logger.warn("Unable to delete host " + hostId, ex);
-    		throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete the host " + hostId.toString() + ". Current host status is " + host.getStatus());
+//    		throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete the host " + hostId.toString() + ". Current host status is " + host.getStatus());
-    	}
+//    	}
-        
+//        
-        if (success == false) {
+//        if (success == false) {
-            throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete the host with id " + hostId.toString());
+//            throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete the host with id " + hostId.toString());
-        }
+//        }
-        List<Pair<String, Object>> returnValues = new ArrayList<Pair<String, Object>>();
+//        List<Pair<String, Object>> returnValues = new ArrayList<Pair<String, Object>>();
-        returnValues.add(new Pair<String, Object>(BaseCmd.Properties.SUCCESS.getName(), Boolean.valueOf(success).toString()));
+//        returnValues.add(new Pair<String, Object>(BaseCmd.Properties.SUCCESS.getName(), Boolean.valueOf(success).toString()));
-        return returnValues;
+//        return returnValues;
-    }
+//    }
 }

server/src/com/cloud/async/AsyncJobExecutorContext.java

@@ -18,7 +18,7 @@
 
 package com.cloud.async;
 
-import com.cloud.agent.AgentManager;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.async.dao.AsyncJobDao;
 import com.cloud.event.dao.EventDao;
 import com.cloud.network.NetworkManager;

server/src/com/cloud/async/AsyncJobExecutorContextImpl.java

@@ -23,7 +23,7 @@ import java.util.Map;
 import javax.ejb.Local;
 import javax.naming.ConfigurationException;
 
-import com.cloud.agent.AgentManager;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.async.dao.AsyncJobDao;
 import com.cloud.event.dao.EventDao;
 import com.cloud.network.NetworkManager;

server/src/com/cloud/configuration/Config.java

@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import com.cloud.agent.AgentManager;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.ha.HighAvailabilityManager;
 import com.cloud.network.NetworkManager;
 import com.cloud.server.ManagementServer;

server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java

@@ -25,7 +25,6 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.AgentControlAnswer;
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.ConsoleAccessAuthenticationAnswer;
@@ -35,6 +34,7 @@ import com.cloud.agent.api.GetVncPortAnswer;
 import com.cloud.agent.api.GetVncPortCommand;
 import com.cloud.agent.api.StartupCommand;
 import com.cloud.agent.api.StopCommand;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.configuration.dao.ConfigurationDao;
 import com.cloud.exception.AgentUnavailableException;
 import com.cloud.exception.ConcurrentOperationException;

server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java

@@ -39,7 +39,6 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.AgentControlAnswer;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.CheckVirtualMachineAnswer;
@@ -57,6 +56,7 @@ import com.cloud.agent.api.StartupCommand;
 import com.cloud.agent.api.StopAnswer;
 import com.cloud.agent.api.StopCommand;
 import com.cloud.agent.api.proxy.ConsoleProxyLoadAnswer;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.async.AsyncJobExecutor;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.async.AsyncJobVO;

server/src/com/cloud/ha/CheckOnAgentInvestigator.java

@@ -21,9 +21,9 @@ import javax.ejb.Local;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.CheckVirtualMachineAnswer;
 import com.cloud.agent.api.CheckVirtualMachineCommand;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.exception.AgentUnavailableException;
 import com.cloud.exception.OperationTimedoutException;
 import com.cloud.host.HostVO;

server/src/com/cloud/ha/HighAvailabilityManagerImpl.java

@@ -33,10 +33,10 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.MigrateCommand;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.alert.AlertManager;
 import com.cloud.configuration.dao.ConfigurationDao;
 import com.cloud.dc.DataCenterVO;

server/src/com/cloud/ha/InvestigatorImpl.java

@@ -26,9 +26,9 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.PingTestCommand;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.exception.AgentUnavailableException;
 import com.cloud.exception.OperationTimedoutException;
 import com.cloud.host.Host;

server/src/com/cloud/ha/VmSyncListener.java

@@ -21,7 +21,6 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.Listener;
 import com.cloud.agent.api.AgentControlAnswer;
 import com.cloud.agent.api.AgentControlCommand;
@@ -30,6 +29,7 @@ import com.cloud.agent.api.Command;
 import com.cloud.agent.api.PingRoutingCommand;
 import com.cloud.agent.api.StartupCommand;
 import com.cloud.agent.api.StartupRoutingCommand;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.exception.AgentUnavailableException;
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;

server/src/com/cloud/ha/XenServerInvestigator.java

@@ -23,10 +23,10 @@ import javax.ejb.Local;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.CheckOnHostAnswer;
 import com.cloud.agent.api.CheckOnHostCommand;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
 import com.cloud.host.dao.HostDao;

server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java

@@ -33,7 +33,6 @@ import javax.naming.ConfigurationException;
 import org.apache.log4j.Logger;
 import org.apache.xmlrpc.XmlRpcException;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.Listener;
 import com.cloud.agent.api.AgentControlAnswer;
 import com.cloud.agent.api.AgentControlCommand;
@@ -41,6 +40,7 @@ import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.StartupCommand;
 import com.cloud.agent.api.StartupStorageCommand;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.alert.AlertManager;
 import com.cloud.configuration.Config;
 import com.cloud.dc.ClusterVO;

server/src/com/cloud/network/NetworkManagerImpl.java

@@ -31,7 +31,6 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.CheckVirtualMachineAnswer;
 import com.cloud.agent.api.CheckVirtualMachineCommand;
@@ -54,6 +53,7 @@ import com.cloud.agent.api.routing.LoadBalancerCfgCommand;
 import com.cloud.agent.api.routing.SavePasswordCommand;
 import com.cloud.agent.api.routing.SetFirewallRuleCommand;
 import com.cloud.agent.api.routing.VmDataCommand;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.alert.AlertManager;
 import com.cloud.api.commands.AssignToLoadBalancerRuleCmd;
 import com.cloud.async.AsyncJobExecutor;

server/src/com/cloud/network/security/NetworkGroupListener.java

@@ -23,7 +23,6 @@ import java.util.Set;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.Listener;
 import com.cloud.agent.api.AgentControlAnswer;
 import com.cloud.agent.api.AgentControlCommand;
@@ -32,6 +31,7 @@ import com.cloud.agent.api.Command;
 import com.cloud.agent.api.NetworkIngressRuleAnswer;
 import com.cloud.agent.api.PingRoutingWithNwGroupsCommand;
 import com.cloud.agent.api.StartupCommand;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
 import com.cloud.network.security.NetworkGroupWorkVO.Step;

server/src/com/cloud/network/security/NetworkGroupManagerImpl.java

@@ -37,10 +37,10 @@ import javax.naming.ConfigurationException;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.NetworkIngressRulesCmd;
 import com.cloud.agent.api.NetworkIngressRulesCmd.IpPortAndProto;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.configuration.dao.ConfigurationDao;
 import com.cloud.domain.DomainVO;
 import com.cloud.domain.dao.DomainDao;

server/src/com/cloud/server/ManagementServer.java

@@ -211,7 +211,7 @@ public interface ManagementServer {
     
     /**
      * Enables an account by accountId
-     * @param accountId
+     * @param cmd
      * @return true if enable was successful, false otherwise
      */
     boolean enableAccount(EnableAccountCmd cmd) throws InvalidParameterValueException;
@@ -224,17 +224,16 @@ public interface ManagementServer {
     boolean lockAccount(long accountId);
 
     /**
-     * Updates an account name by accountId
+     * Updates an account name
-     * @param accountId
+     * @param cmd
-     * @param accountName
      * @return true if update was successful, false otherwise
      */
     
     boolean updateAccount(UpdateAccountCmd cmd) throws InvalidParameterValueException;
 
     /**
-     * Enables a user by userId
+     * Enables a user
-     * @param userId
+     * @param cmd
      * @return true if enable was successful, false otherwise
      */
     boolean enableUser(EnableUserCmd cmd) throws InvalidParameterValueException;
@@ -848,13 +847,13 @@ public interface ManagementServer {
      */
     void updateHost(long hostId, long guestOSCategoryId) throws InvalidParameterValueException;
     
-    /**
+//    /**
-     * Deletes a host
+//     * Deletes a host
-     * 
+//     * 
-     * @param hostId
+//     * @param hostId
-     * @param true if deleted, false otherwise
+//     * @param true if deleted, false otherwise
-     */
+//     */
-    boolean deleteHost(long hostId);
+//    boolean deleteHost(long hostId);
     
     /**
      * Retrieves all Events between the start and end date specified
@@ -1157,14 +1156,8 @@ public interface ManagementServer {
     VlanVO findVlanById(long vlanDbId);
     
     /**
-     * Creates a new template with the specified parameters
+     * Creates a new template
-     * @param id
+     * @param cmd
-     * @param name
-     * @param displayText
-     * @param String format
-     * @param Long guestOsId
-     * @param Boolean passwordEnabled
-     * @param Boolean bootable
      * @return success/failure
      */
     boolean updateTemplate(UpdateTemplateCmd cmd) throws InvalidParameterValueException;
@@ -1566,6 +1559,8 @@ public interface ManagementServer {
      * @return domainVO the domain with the matching path, or null if no domain with the given path exists
      */
     DomainVO findDomainByPath(String domainPath);
+    
+    
 
     /**
      * Finds accounts with account identifiers similar to the parameter

server/src/com/cloud/server/ManagementServerImpl.java

@@ -51,9 +51,9 @@ import javax.crypto.spec.SecretKeySpec;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.GetVncPortAnswer;
 import com.cloud.agent.api.GetVncPortCommand;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.alert.AlertManager;
 import com.cloud.alert.AlertVO;
 import com.cloud.alert.dao.AlertDao;
@@ -2860,9 +2860,9 @@ public class ManagementServerImpl implements ManagementServer {
     	_agentMgr.updateHost(hostId, guestOSCategoryId);
     }
     
-    public boolean deleteHost(long hostId) {
+//    public boolean deleteHost(long hostId) {
-        return _agentMgr.deleteHost(hostId);
+//        return _agentMgr.deleteHost(hostId);
-    }
+//    }
 
     @Override
     public long getId() {

server/src/com/cloud/server/StatsCollector.java

@@ -31,13 +31,13 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.GetFileStatsCommand;
 import com.cloud.agent.api.GetStorageStatsCommand;
 import com.cloud.agent.api.HostStatsEntry;
 import com.cloud.agent.api.VmStatsEntry;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.capacity.CapacityVO;
 import com.cloud.capacity.dao.CapacityDao;
 import com.cloud.exception.AgentUnavailableException;

server/src/com/cloud/storage/StorageManagerImpl.java

@@ -39,7 +39,6 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.BackupSnapshotCommand;
 import com.cloud.agent.api.Command;
@@ -57,6 +56,7 @@ import com.cloud.agent.api.storage.DeleteTemplateCommand;
 import com.cloud.agent.api.storage.DestroyCommand;
 import com.cloud.agent.api.to.DiskCharacteristicsTO;
 import com.cloud.agent.api.to.VolumeTO;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.alert.AlertManager;
 import com.cloud.api.BaseCmd;
 import com.cloud.async.AsyncInstanceCreateStatus;

server/src/com/cloud/storage/download/DownloadMonitorImpl.java

@@ -32,13 +32,13 @@ import javax.ejb.Local;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.Listener;
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.storage.DeleteTemplateCommand;
 import com.cloud.agent.api.storage.DownloadCommand;
 import com.cloud.agent.api.storage.DownloadProgressCommand;
 import com.cloud.agent.api.storage.DownloadProgressCommand.RequestType;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.async.AsyncInstanceCreateStatus;
 import com.cloud.configuration.dao.ConfigurationDao;
 import com.cloud.dc.DataCenterVO;

server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java

@@ -34,7 +34,6 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.CheckVirtualMachineAnswer;
 import com.cloud.agent.api.CheckVirtualMachineCommand;
@@ -49,6 +48,7 @@ import com.cloud.agent.api.StartSecStorageVmCommand;
 import com.cloud.agent.api.StartupCommand;
 import com.cloud.agent.api.StopAnswer;
 import com.cloud.agent.api.StopCommand;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.async.AsyncJobExecutor;
 import com.cloud.async.AsyncJobManager;
 import com.cloud.async.AsyncJobVO;

server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java

@@ -28,7 +28,6 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.BackupSnapshotAnswer;
 import com.cloud.agent.api.BackupSnapshotCommand;
@@ -38,6 +37,7 @@ import com.cloud.agent.api.ManageSnapshotAnswer;
 import com.cloud.agent.api.ManageSnapshotCommand;
 import com.cloud.agent.api.ValidateSnapshotAnswer;
 import com.cloud.agent.api.ValidateSnapshotCommand;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.api.BaseCmd;
 import com.cloud.api.commands.CreateSnapshotCmd;
 import com.cloud.api.commands.CreateVolumeCmd;

server/src/com/cloud/template/TemplateManagerImpl.java

@@ -27,11 +27,11 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.storage.DestroyCommand;
 import com.cloud.agent.api.storage.DownloadAnswer;
 import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.configuration.ResourceCount.ResourceType;
 import com.cloud.configuration.dao.ConfigurationDao;
 import com.cloud.dc.DataCenterVO;

server/src/com/cloud/vm/UserVmManagerImpl.java

@@ -41,7 +41,6 @@ import net.sf.ehcache.config.Configuration;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.AttachIsoCommand;
 import com.cloud.agent.api.AttachVolumeAnswer;
@@ -63,6 +62,7 @@ import com.cloud.agent.api.StopCommand;
 import com.cloud.agent.api.VmStatsEntry;
 import com.cloud.agent.api.storage.CreatePrivateTemplateAnswer;
 import com.cloud.agent.api.storage.CreatePrivateTemplateCommand;
+import com.cloud.agent.manager.AgentManager;
 import com.cloud.alert.AlertManager;
 import com.cloud.api.BaseCmd;
 import com.cloud.api.ServerApiException;