diff --git a/.gitignore b/.gitignore index df8c2ae5163..eae66a6dde7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ build/build.number +build.number bin cloudstack-proprietary .lock-wscript diff --git a/build/build.number b/build/build.number deleted file mode 100644 index 96105fe8c54..00000000000 --- a/build/build.number +++ /dev/null @@ -1,3 +0,0 @@ -#Build Number for ANT. Do not edit! -#Sat Aug 07 12:54:57 PDT 2010 -build.number=927 diff --git a/core/src/com/cloud/agent/AgentManager.java b/server/src/com/cloud/agent/manager/AgentManager.java similarity index 95% rename from core/src/com/cloud/agent/AgentManager.java rename to server/src/com/cloud/agent/manager/AgentManager.java index 08e9a30a4ee..b8d5cee6be8 100755 --- a/core/src/com/cloud/agent/AgentManager.java +++ b/server/src/com/cloud/agent/manager/AgentManager.java @@ -15,20 +15,23 @@ * along with this program. If not, see . * */ -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. diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java index a34cd13381f..92b355f7b7c 100755 --- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/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) { diff --git a/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java index 224b00e32f8..3df93a18816 100644 --- a/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java +++ b/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; diff --git a/server/src/com/cloud/api/BaseCmd.java b/server/src/com/cloud/api/BaseCmd.java index b1579f889ba..6587f01b450 100644 --- a/server/src/com/cloud/api/BaseCmd.java +++ b/server/src/com/cloud/api/BaseCmd.java @@ -46,9 +46,9 @@ public abstract class BaseCmd { public enum CommandType { BOOLEAN, DATE, FLOAT, INTEGER, LIST, LONG, OBJECT, MAP, STRING, TZDATE } - + public enum Manager { - ConfigManager, ManagementServer, NetworkGroupManager, NetworkManager, StorageManager, UserVmManager, AccountManager + ConfigManager, ManagementServer, NetworkGroupManager, NetworkManager, StorageManager, UserVmManager, AccountManager, AgentManager } // FIXME: Extract these out into a separate file diff --git a/server/src/com/cloud/api/commands/DeleteHostCmd.java b/server/src/com/cloud/api/commands/DeleteHostCmd.java index 97d14a6f402..28346754849 100644 --- a/server/src/com/cloud/api/commands/DeleteHostCmd.java +++ b/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> s_properties = new ArrayList>(); - - static { - s_properties.add(new Pair(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> getProperties() { - return s_properties; - } - @Override - public List> execute(Map params) { - Long hostId = (Long)params.get(BaseCmd.Properties.ID.getName()); - - //verify input parameters - HostVO host = getManagementServer().getHostBy(hostId); - if (host == null) { - throw new ServerApiException(BaseCmd.PARAM_ERROR, "Host with id " + hostId.toString() + " doesn't exist"); - } - - boolean success = false; - try { - success = getManagementServer().deleteHost(hostId); - } catch (Exception 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()); - } - - if (success == false) { - throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete the host with id " + hostId.toString()); - } - List> returnValues = new ArrayList>(); - returnValues.add(new Pair(BaseCmd.Properties.SUCCESS.getName(), Boolean.valueOf(success).toString())); - return returnValues; - } +// @Override +// public List> execute(Map params) { +// Long hostId = (Long)params.get(BaseCmd.Properties.ID.getName()); +// +// //verify input parameters +// HostVO host = getManagementServer().getHostBy(hostId); +// if (host == null) { +// throw new ServerApiException(BaseCmd.PARAM_ERROR, "Host with id " + hostId.toString() + " doesn't exist"); +// } +// +// boolean success = false; +// try { +// success = getManagementServer().deleteHost(hostId); +// } catch (Exception 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()); +// } +// +// if (success == false) { +// throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete the host with id " + hostId.toString()); +// } +// List> returnValues = new ArrayList>(); +// returnValues.add(new Pair(BaseCmd.Properties.SUCCESS.getName(), Boolean.valueOf(success).toString())); +// return returnValues; +// } } \ No newline at end of file diff --git a/server/src/com/cloud/async/AsyncJobExecutorContext.java b/server/src/com/cloud/async/AsyncJobExecutorContext.java index 0a565dacb2b..5ade0f9c30f 100644 --- a/server/src/com/cloud/async/AsyncJobExecutorContext.java +++ b/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; diff --git a/server/src/com/cloud/async/AsyncJobExecutorContextImpl.java b/server/src/com/cloud/async/AsyncJobExecutorContextImpl.java index cf000e8566a..6543eda1226 100644 --- a/server/src/com/cloud/async/AsyncJobExecutorContextImpl.java +++ b/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; diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index d46e8f28211..faa05cf60ca 100644 --- a/server/src/com/cloud/configuration/Config.java +++ b/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; diff --git a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java index db02ce8b4da..48687bef679 100644 --- a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java +++ b/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; diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index 3cfbc1dacaf..787a295aef1 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/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; diff --git a/server/src/com/cloud/ha/CheckOnAgentInvestigator.java b/server/src/com/cloud/ha/CheckOnAgentInvestigator.java index 117ad4d8c5b..fd67a9a8bbf 100644 --- a/server/src/com/cloud/ha/CheckOnAgentInvestigator.java +++ b/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; diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java index bd20eb9bdc1..73a473e40e9 100644 --- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java +++ b/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; diff --git a/server/src/com/cloud/ha/InvestigatorImpl.java b/server/src/com/cloud/ha/InvestigatorImpl.java index 729bee59bca..e72ddfd3dd3 100644 --- a/server/src/com/cloud/ha/InvestigatorImpl.java +++ b/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; diff --git a/server/src/com/cloud/ha/VmSyncListener.java b/server/src/com/cloud/ha/VmSyncListener.java index dd31f706770..35dd04ac717 100644 --- a/server/src/com/cloud/ha/VmSyncListener.java +++ b/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; diff --git a/server/src/com/cloud/ha/XenServerInvestigator.java b/server/src/com/cloud/ha/XenServerInvestigator.java index c0ad109c6e2..cf83552c7f5 100644 --- a/server/src/com/cloud/ha/XenServerInvestigator.java +++ b/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; diff --git a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java index ecdf216f5df..33f3fcafc05 100644 --- a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java +++ b/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; diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 330515f34a5..29a867e20d1 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -32,7 +32,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; @@ -55,6 +54,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.api.commands.CreateIPForwardingRuleCmd; diff --git a/server/src/com/cloud/network/security/NetworkGroupListener.java b/server/src/com/cloud/network/security/NetworkGroupListener.java index b3a63aed351..ce7bbc257ce 100644 --- a/server/src/com/cloud/network/security/NetworkGroupListener.java +++ b/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; diff --git a/server/src/com/cloud/network/security/NetworkGroupManagerImpl.java b/server/src/com/cloud/network/security/NetworkGroupManagerImpl.java index f8b279f9ff2..cb2c60dae97 100644 --- a/server/src/com/cloud/network/security/NetworkGroupManagerImpl.java +++ b/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.api.commands.CreateNetworkGroupCmd; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.domain.DomainVO; diff --git a/server/src/com/cloud/server/ManagementServer.java b/server/src/com/cloud/server/ManagementServer.java index 724665aeb5a..7b89eac9eb3 100644 --- a/server/src/com/cloud/server/ManagementServer.java +++ b/server/src/com/cloud/server/ManagementServer.java @@ -214,7 +214,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; @@ -227,17 +227,16 @@ public interface ManagementServer { boolean lockAccount(long accountId); /** - * Updates an account name by accountId - * @param accountId - * @param accountName + * Updates an account name + * @param cmd * @return true if update was successful, false otherwise */ boolean updateAccount(UpdateAccountCmd cmd) throws InvalidParameterValueException; /** - * Enables a user by userId - * @param userId + * Enables a user + * @param cmd * @return true if enable was successful, false otherwise */ boolean enableUser(EnableUserCmd cmd) throws InvalidParameterValueException; @@ -851,13 +850,13 @@ public interface ManagementServer { */ void updateHost(long hostId, long guestOSCategoryId) throws InvalidParameterValueException; - /** - * Deletes a host - * - * @param hostId - * @param true if deleted, false otherwise - */ - boolean deleteHost(long hostId); +// /** +// * Deletes a host +// * +// * @param hostId +// * @param true if deleted, false otherwise +// */ +// boolean deleteHost(long hostId); /** * Retrieves all Events between the start and end date specified @@ -1147,14 +1146,8 @@ public interface ManagementServer { VlanVO findVlanById(long vlanDbId); /** - * Creates a new template with the specified parameters - * @param id - * @param name - * @param displayText - * @param String format - * @param Long guestOsId - * @param Boolean passwordEnabled - * @param Boolean bootable + * Creates a new template + * @param cmd * @return success/failure */ boolean updateTemplate(UpdateTemplateCmd cmd) throws InvalidParameterValueException; @@ -1540,6 +1533,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 diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index fb04633da59..bc77e6f40b6 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/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; @@ -2901,9 +2901,9 @@ public class ManagementServerImpl implements ManagementServer { _agentMgr.updateHost(hostId, guestOSCategoryId); } - public boolean deleteHost(long hostId) { - return _agentMgr.deleteHost(hostId); - } +// public boolean deleteHost(long hostId) { +// return _agentMgr.deleteHost(hostId); +// } @Override public long getId() { diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java index c3b87f7eb00..861a686fd71 100644 --- a/server/src/com/cloud/server/StatsCollector.java +++ b/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; diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index ebb09ae7298..6520f72f00e 100644 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/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.api.commands.StopVMCmd; diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java index 31739bfec3e..0819e71ced5 100644 --- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java +++ b/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; diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index 815ead3bc0f..cc87a812a45 100644 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/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; diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java index a372e17b6e8..617f4db7aa1 100644 --- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/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; diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index 700aa85c42c..45420fbace8 100644 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/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; diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 3137ee419bc..9004e999422 100644 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/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;