etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve component lifecycle management with system run-level concept

This commit is contained in:
Kelven Yang 2013-01-30 15:20:32 -08:00
parent da2e6461a6
commit 176523254e
160 changed files with 1389 additions and 1752 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
View File

@ -127,4 +127,34 @@ public class PropertiesStorage implements StorageComponent {
return true;
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

30
agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java
View File

@ -139,4 +139,34 @@ public class FakeDhcpSnooper implements DhcpSnooper {
return null;
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

30
agent/src/com/cloud/agent/resource/DummyResource.java
View File

@ -224,4 +224,34 @@ public class DummyResource implements ServerResource {
public void setAgentControl(IAgentControl agentControl) {
_agentControl = agentControl;
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

2
agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
View File

@ -77,7 +77,7 @@ import com.google.gson.Gson;
* server.
*
*/
public class ConsoleProxyResource extends ServerResourceBase implements
public abstract class ConsoleProxyResource extends ServerResourceBase implements
ServerResource {
static final Logger s_logger = Logger.getLogger(ConsoleProxyResource.class);

1
awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
View File

@ -21,7 +21,6 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.util.UUID;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletConfig;

33
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
View File

@ -76,6 +76,7 @@ import com.cloud.exception.InternalErrorException;
import com.cloud.network.HAProxyConfigurator;
import com.cloud.network.LoadBalancerConfigurator;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.ComponentLifecycle;
import com.cloud.utils.component.Manager;
import com.cloud.utils.net.NetUtils;
import com.cloud.utils.script.OutputInterpreter;
@ -1152,7 +1153,11 @@ public class VirtualRoutingResource implements Manager {
public String getName() {
return _name;
}
@Override
public void setName(String name) {
_name = name;
}
@Override
@ -1160,14 +1165,36 @@ public class VirtualRoutingResource implements Manager {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public int getRunLevel() {
return ComponentLifecycle.RUN_LEVEL_COMPONENT;
}
public void setRunLevel() {
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

32
core/src/com/cloud/hypervisor/hyperv/resource/HypervDummyResourceBase.java
View File

@ -16,6 +16,8 @@
// under the License.
package com.cloud.hypervisor.hyperv.resource;
import java.util.Map;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.PingCommand;
@ -61,4 +63,34 @@ public class HypervDummyResourceBase extends ServerResourceBase implements
return null;
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

30
core/src/com/cloud/hypervisor/hyperv/resource/HypervResource.java
View File

@ -945,4 +945,34 @@ public class HypervResource extends ServerResourceBase implements ServerResource
// TODO Auto-generated method stub
return null;
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

30
core/src/com/cloud/network/resource/TrafficSentinelResource.java
View File

@ -313,4 +313,34 @@ public class TrafficSentinelResource implements ServerResource {
DateFormat dfDate = new SimpleDateFormat("yyyyMMdd HH:mm:ss");
return dfDate.format(date);
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

30
core/src/com/cloud/storage/JavaStorageLayer.java
View File

@ -250,6 +250,36 @@ public class JavaStorageLayer implements StorageLayer {
File file = new File(path);
return file.getTotalSpace() - file.getFreeSpace();
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}

30
core/src/com/cloud/storage/resource/CifsSecondaryStorageResource.java
View File

@ -722,4 +722,34 @@ public class CifsSecondaryStorageResource extends ServerResourceBase implements
protected String getDefaultScriptsDir() {
return "./scripts/storage/secondary";
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

35
core/src/com/cloud/storage/resource/LocalSecondaryStorageResource.java
View File

@ -208,4 +208,39 @@ public class LocalSecondaryStorageResource extends ServerResourceBase implements
protected String getDefaultScriptsDir() {
return "scripts/storage/secondary";
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

30
core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
View File

@ -1808,4 +1808,34 @@ SecondaryStorageResource {
protected String getDefaultScriptsDir() {
return "./scripts/storage/secondary";
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

3
core/src/com/cloud/storage/template/DownloadManagerImpl.java
View File

@ -59,12 +59,13 @@ import com.cloud.storage.template.Processor.FormatInfo;
import com.cloud.storage.template.TemplateDownloader.DownloadCompleteCallback;
import com.cloud.storage.template.TemplateDownloader.Status;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.OutputInterpreter;
import com.cloud.utils.script.Script;
@Local(value = DownloadManager.class)
public class DownloadManagerImpl implements DownloadManager {
public class DownloadManagerImpl extends ManagerBase implements DownloadManager {
private String _name;
StorageLayer _storage;
Map<String, Processor> _processors;

20
core/src/com/cloud/storage/template/IsoProcessor.java
View File

@ -26,12 +26,12 @@ import org.apache.log4j.Logger;
import com.cloud.storage.StorageLayer;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.utils.component.AdapterBase;
@Local(value=Processor.class)
public class IsoProcessor implements Processor {
public class IsoProcessor extends AdapterBase implements Processor {
private static final Logger s_logger = Logger.getLogger(IsoProcessor.class);
String _name;
StorageLayer _storage;
@Override
@ -59,26 +59,10 @@ public class IsoProcessor implements Processor {
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
_storage = (StorageLayer)params.get(StorageLayer.InstanceConfigKey);
if (_storage == null) {
throw new ConfigurationException("Unable to get storage implementation");
}
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
}

23
core/src/com/cloud/storage/template/QCOW2Processor.java
View File

@ -29,11 +29,11 @@ import org.apache.log4j.Logger;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.StorageLayer;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.AdapterBase;
@Local(value=Processor.class)
public class QCOW2Processor implements Processor {
public class QCOW2Processor extends AdapterBase implements Processor {
private static final Logger s_logger = Logger.getLogger(QCOW2Processor.class);
String _name;
StorageLayer _storage;
@Override
@ -85,7 +85,6 @@ public class QCOW2Processor implements Processor {
@Override
public boolean configure(String name, Map<String, Object> params)
throws ConfigurationException {
_name = name;
_storage = (StorageLayer)params.get(StorageLayer.InstanceConfigKey);
if (_storage == null) {
throw new ConfigurationException("Unable to get storage implementation");
@ -93,22 +92,4 @@ public class QCOW2Processor implements Processor {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
// TODO Auto-generated method stub
return true;
}
@Override
public boolean stop() {
// TODO Auto-generated method stub
return true;
}
}

20
core/src/com/cloud/storage/template/RawImageProcessor.java
View File

@ -28,17 +28,16 @@ import com.cloud.exception.InternalErrorException;
import com.cloud.storage.StorageLayer;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.template.Processor.FormatInfo;
import com.cloud.utils.component.AdapterBase;
@Local(value=Processor.class)
public class RawImageProcessor implements Processor {
public class RawImageProcessor extends AdapterBase implements Processor {
private static final Logger s_logger = Logger.getLogger(RawImageProcessor.class);
String _name;
StorageLayer _storage;
@Override
public boolean configure(String name, Map<String, Object> params)
throws ConfigurationException {
_name = name;
_storage = (StorageLayer)params.get(StorageLayer.InstanceConfigKey);
if (_storage == null) {
throw new ConfigurationException("Unable to get storage implementation");
@ -47,21 +46,6 @@ public class RawImageProcessor implements Processor {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public FormatInfo process(String templatePath, ImageFormat format,
String templateName) throws InternalErrorException {

20
core/src/com/cloud/storage/template/UploadManagerImpl.java
View File

@ -47,10 +47,11 @@ import com.cloud.storage.resource.SecondaryStorageResource;
import com.cloud.storage.template.TemplateUploader.Status;
import com.cloud.storage.template.TemplateUploader.UploadCompleteCallback;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
public class UploadManagerImpl implements UploadManager {
public class UploadManagerImpl extends ManagerBase implements UploadManager {
public class Completion implements UploadCompleteCallback {
@ -176,7 +177,6 @@ public class UploadManagerImpl implements UploadManager {
private StorageLayer _storage;
private int installTimeoutPerGig;
private boolean _sslCopy;
private String _name;
private boolean hvm;
@ -442,7 +442,6 @@ public class UploadManagerImpl implements UploadManager {
@Override
public boolean configure(String name, Map<String, Object> params)
throws ConfigurationException {
_name = name;
String value = null;
@ -525,21 +524,6 @@ public class UploadManagerImpl implements UploadManager {
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
/**
* Get notified of change of job status. Executed in context of uploader thread
*

19
core/src/com/cloud/storage/template/VhdProcessor.java
View File

@ -31,6 +31,7 @@ import com.cloud.exception.InternalErrorException;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.StorageLayer;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.AdapterBase;
/**
* VhdProcessor processes the downloaded template for VHD. It
@ -39,10 +40,9 @@ import com.cloud.utils.NumbersUtil;
*
*/
@Local(value=Processor.class)
public class VhdProcessor implements Processor {
public class VhdProcessor extends AdapterBase implements Processor {
private static final Logger s_logger = Logger.getLogger(VhdProcessor.class);
String _name;
StorageLayer _storage;
private int vhd_footer_size = 512;
private int vhd_footer_creator_app_offset = 28;
@ -110,21 +110,6 @@ public class VhdProcessor implements Processor {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
private void imageSignatureCheck(byte[] creatorApp) throws InternalErrorException {
boolean findKnownCreator = false;

20
core/src/com/cloud/storage/template/VmdkProcessor.java
View File

@ -32,13 +32,13 @@ import org.apache.log4j.Logger;
import com.cloud.exception.InternalErrorException;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.StorageLayer;
import com.cloud.utils.component.AdapterBase;
import com.cloud.utils.script.Script;
@Local(value=Processor.class)
public class VmdkProcessor implements Processor {
public class VmdkProcessor extends AdapterBase implements Processor {
private static final Logger s_logger = Logger.getLogger(VmdkProcessor.class);
String _name;
StorageLayer _storage;
@Override
@ -137,7 +137,6 @@ public class VmdkProcessor implements Processor {
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
_storage = (StorageLayer)params.get(StorageLayer.InstanceConfigKey);
if (_storage == null) {
throw new ConfigurationException("Unable to get storage implementation");
@ -145,19 +144,4 @@ public class VmdkProcessor implements Processor {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
}

3
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
View File

@ -45,8 +45,9 @@ import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.hypervisor.xen.resource.XcpOssResource;
import com.cloud.resource.ServerResource;
import com.cloud.utils.component.ManagerBase;
public class DirectAgentManagerSimpleImpl implements AgentManager {
public class DirectAgentManagerSimpleImpl extends ManagerBase implements AgentManager {
private static final Logger logger = Logger.getLogger(DirectAgentManagerSimpleImpl.class);
private Map<Long, ServerResource> hostResourcesMap = new HashMap<Long, ServerResource>();
@Inject

19
engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java
View File

@ -30,8 +30,10 @@ import org.apache.cloudstack.storage.datastore.db.DataStoreProviderDao;
import org.apache.cloudstack.storage.datastore.db.DataStoreProviderVO;
import org.springframework.stereotype.Component;
import com.cloud.utils.component.ManagerBase;
@Component
public class DataStoreProviderManagerImpl implements DataStoreProviderManager {
public class DataStoreProviderManagerImpl extends ManagerBase implements DataStoreProviderManager {
@Inject
List<DataStoreProvider> providers;
@Inject
@ -90,21 +92,6 @@ public class DataStoreProviderManagerImpl implements DataStoreProviderManager {
return true;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return "Data store provider manager";
}
@Override
public DataStoreProvider getDataStoreProviderById(long id) {
DataStoreProviderVO provider = providerDao.findById(id);

22
plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java
View File

@ -46,18 +46,17 @@ import com.cloud.exception.ResourceInUseException;
import com.cloud.netapp.dao.LunDao;
import com.cloud.netapp.dao.PoolDao;
import com.cloud.netapp.dao.VolumeDao;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value = { NetappManager.class })
public class NetappManagerImpl implements NetappManager
public class NetappManagerImpl extends ManagerBase implements NetappManager
{
public enum Algorithm { roundrobin,leastfull }
protected String _name;
public static final Logger s_logger = Logger.getLogger(NetappManagerImpl.class.getName());
@Inject public VolumeDao _volumeDao;
@Inject public PoolDao _poolDao;
@ -1017,26 +1016,9 @@ public class NetappManagerImpl implements NetappManager
public boolean configure(String name, Map<String, Object> params)
throws ConfigurationException {
_name = name;
_netappAllocator = new NetappDefaultAllocatorImpl( this );
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
}

26
plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
View File

@ -36,14 +36,14 @@ import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
import com.cloud.offering.ServiceOffering;
import com.cloud.resource.ResourceManager;
import com.cloud.utils.component.AdapterBase;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
@Component
@Local(value=HostAllocator.class)
public class RandomAllocator implements HostAllocator {
public class RandomAllocator extends AdapterBase implements HostAllocator {
private static final Logger s_logger = Logger.getLogger(RandomAllocator.class);
private String _name;
@Inject private HostDao _hostDao;
@Inject private ResourceManager _resourceMgr;
@ -116,26 +116,4 @@ public class RandomAllocator implements HostAllocator {
// return true
return true;
}
@Override
public boolean configure(String name, Map<String, Object> params) {
_name=name;
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
}

30
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View File

@ -4624,4 +4624,34 @@ ServerResource {
return new Answer(cmd, success, "");
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

30
plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java
View File

@ -1382,4 +1382,34 @@ public class OvmResourceBase implements ServerResource, HypervisorResource {
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

3
plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
View File

@ -56,6 +56,7 @@ import com.cloud.simulator.MockVMVO;
import com.cloud.simulator.dao.MockHostDao;
import com.cloud.simulator.dao.MockVMDao;
import com.cloud.utils.Pair;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction;
@ -63,7 +64,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
@Local(value = { MockAgentManager.class })
public class MockAgentManagerImpl implements MockAgentManager {
public class MockAgentManagerImpl extends ManagerBase implements MockAgentManager {
private static final Logger s_logger = Logger.getLogger(MockAgentManagerImpl.class);
@Inject
HostPodDao _podDao = null;

3
plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
View File

@ -92,13 +92,14 @@ import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.VMTemplateStorageResourceAssoc;
import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
import com.cloud.storage.template.TemplateInfo;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.DiskProfile;
import com.cloud.vm.VirtualMachine.State;
@Local(value = { MockStorageManager.class })
public class MockStorageManagerImpl implements MockStorageManager {
public class MockStorageManagerImpl extends ManagerBase implements MockStorageManager {
private static final Logger s_logger = Logger.getLogger(MockStorageManagerImpl.class);
@Inject
MockStoragePoolDao _mockStoragePoolDao = null;

3
plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
View File

@ -82,12 +82,13 @@ import com.cloud.simulator.dao.MockSecurityRulesDao;
import com.cloud.simulator.dao.MockVMDao;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VirtualMachine.State;
@Local(value = { MockVmManager.class })
public class MockVmManagerImpl implements MockVmManager {
public class MockVmManagerImpl extends ManagerBase implements MockVmManager {
private static final Logger s_logger = Logger.getLogger(MockVmManagerImpl.class);
@Inject MockVMDao _mockVmDao = null;

3
plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
View File

@ -89,6 +89,7 @@ import com.cloud.simulator.MockVMVO;
import com.cloud.simulator.dao.MockConfigurationDao;
import com.cloud.simulator.dao.MockHostDao;
import com.cloud.utils.Pair;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.ConnectionConcierge;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction;
@ -96,7 +97,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VirtualMachine.State;
@Local(value = { SimulatorManager.class })
public class SimulatorManagerImpl implements SimulatorManager {
public class SimulatorManagerImpl extends ManagerBase implements SimulatorManager {
private static final Logger s_logger = Logger.getLogger(SimulatorManagerImpl.class);
@Inject
MockVmManager _mockVmMgr = null;

24
plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java
View File

@ -282,4 +282,28 @@ public class AgentResourceBase implements ServerResource {
public boolean isStopped() {
return this.stopped;
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

28
plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java
View File

@ -22,11 +22,11 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import com.cloud.host.HostVO;
import com.cloud.utils.component.AdapterBase;
import com.cloud.vm.VMInstanceVO;
@Local(value=FenceBuilder.class)
public class VmwareFencer implements FenceBuilder {
String _name;
public class VmwareFencer extends AdapterBase implements FenceBuilder {
@Override
public Boolean fenceOff(VMInstanceVO vm, HostVO host) {
@ -36,28 +36,4 @@ public class VmwareFencer implements FenceBuilder {
public VmwareFencer() {
super();
}
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
return true;
}
@Override
public String getName() {
return _name;
}
public void setName(String name) {
_name = name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
}

11
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
View File

@ -81,6 +81,7 @@ import com.cloud.utils.FileUtil;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GlobalLock;
@ -94,7 +95,7 @@ import com.vmware.vim25.HostConnectSpec;
import com.vmware.vim25.ManagedObjectReference;
@Local(value = {VmwareManager.class})
public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Listener, Manager {
public class VmwareManagerImpl extends ManagerBase implements VmwareManager, VmwareStorageMount, Listener {
private static final Logger s_logger = Logger.getLogger(VmwareManagerImpl.class);
private static final int STARTUP_DELAY = 60000; // 60 seconds
@ -103,7 +104,6 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis
private long _hostScanInterval = DEFAULT_HOST_SCAN_INTERVAL;
int _timeout;
private String _name;
private String _instance;
@Inject AgentManager _agentMgr;
@ -164,8 +164,6 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
s_logger.info("Configure VmwareManagerImpl, manager name: " + name);
_name = name;
if(!_configDao.isPremium()) {
s_logger.error("Vmware component can only run under premium distribution");
throw new ConfigurationException("Vmware component can only run under premium distribution");
@ -321,11 +319,6 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean getNexusVSwitchGlobalParameter() {
return _nexusVSwitchActive;

30
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View File

@ -4880,4 +4880,34 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
// TODO: Fix this? cmd.setContextParam("checkpoint", String.valueOf(checkPointId));
return vmName;
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

21
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -7719,4 +7719,25 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
}
@Override
public void setName(String name) {
}
@Override
public void setConfigParams(Map<String, Object> params) {
}
@Override
public Map<String, Object> getConfigParams() {
return null;
}
@Override
public int getRunLevel() {
return 0;
}
@Override
public void setRunLevel(int level) {
}
}

2
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
View File

@ -20,6 +20,7 @@ package com.cloud.hypervisor.xen.resource;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.ejb.Local;
@ -166,5 +167,4 @@ public class XcpOssResource extends CitrixResourceBase {
}
return answer;
}
}

25
plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java
View File

@ -35,6 +35,7 @@ import com.cloud.network.Network.Service;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.network.element.NetworkElement;
import com.cloud.offering.NetworkOffering;
import com.cloud.utils.component.AdapterBase;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
@ -45,34 +46,12 @@ import com.cloud.vm.VirtualMachineProfile;
*
*/
@Local(NetworkElement.class)
public class DnsNotifier implements NetworkElement {
String _name = null;
public class DnsNotifier extends AdapterBase implements NetworkElement {
public DnsNotifier() {
}
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public Map<Service, Map<Capability, String>> getCapabilities() {
Map<Service, Map<Capability, String>> caps = new HashMap<Service, Map<Capability, String>>();

22
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
View File

@ -118,6 +118,7 @@ import com.cloud.user.dao.AccountDao;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.SearchBuilder;
@ -140,8 +141,8 @@ import com.cloud.vm.dao.NicDao;
@Component
@Local(value = { ElasticLoadBalancerManager.class })
public class ElasticLoadBalancerManagerImpl implements
ElasticLoadBalancerManager, Manager, VirtualMachineGuru<DomainRouterVO> {
public class ElasticLoadBalancerManagerImpl extends ManagerBase implements
ElasticLoadBalancerManager, VirtualMachineGuru<DomainRouterVO> {
private static final Logger s_logger = Logger
.getLogger(ElasticLoadBalancerManagerImpl.class);
@ -200,7 +201,6 @@ ElasticLoadBalancerManager, Manager, VirtualMachineGuru<DomainRouterVO> {
@Inject
NicDao _nicDao;
String _name;
String _instance;
static final private String _elbVmNamePrefix = "l";
static final private String _systemVmType = "elbvm";
@ -390,7 +390,6 @@ ElasticLoadBalancerManager, Manager, VirtualMachineGuru<DomainRouterVO> {
@Override
public boolean configure(String name, Map<String, Object> params)
throws ConfigurationException {
_name = name;
final Map<String, String> configs = _configDao.getConfiguration("AgentManager", params);
_systemAcct = _accountService.getSystemAccount();
_instance = configs.get("instance.name");
@ -435,21 +434,6 @@ ElasticLoadBalancerManager, Manager, VirtualMachineGuru<DomainRouterVO> {
return true;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return _name;
}
private DomainRouterVO findELBVmWithCapacity(Network guestNetwork, IPAddressVO ipAddr) {
List<DomainRouterVO> unusedElbVms = _elbVmMapDao.listUnusedElbVms();
if (unusedElbVms.size() > 0) {

30
plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java
View File

@ -1066,6 +1066,36 @@ public class F5BigIpResource implements ServerResource {
private static String[] genStringArray(String s) {
return new String[]{s};
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

32
plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
View File

@ -3420,6 +3420,36 @@ public class JuniperSrxResource implements ServerResource {
} else {
return doc;
}
}
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

30
plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
View File

@ -2342,4 +2342,34 @@ public class NetscalerResource implements ServerResource {
public void disconnected() {
return;
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

30
plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java
View File

@ -794,5 +794,35 @@ public class NiciraNvpResource implements ServerResource {
return rulepair;
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

20
plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
View File

@ -51,6 +51,7 @@ import com.cloud.network.ovs.dao.OvsTunnelInterfaceDao;
import com.cloud.network.ovs.dao.OvsTunnelInterfaceVO;
import com.cloud.network.ovs.dao.OvsTunnelNetworkDao;
import com.cloud.network.ovs.dao.OvsTunnelNetworkVO;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.exception.CloudRuntimeException;
@ -66,11 +67,10 @@ import com.cloud.vm.dao.UserVmDao;
@Component
@Local(value={OvsTunnelManager.class})
public class OvsTunnelManagerImpl implements OvsTunnelManager {
public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManager {
public static final Logger s_logger =
Logger.getLogger(OvsTunnelManagerImpl.class.getName());
String _name;
boolean _isEnabled;
ScheduledExecutorService _executorPool;
ScheduledExecutorService _cleanupExecutor;
@ -88,7 +88,6 @@ public class OvsTunnelManagerImpl implements OvsTunnelManager {
@Override
public boolean configure(String name, Map<String, Object> params)
throws ConfigurationException {
_name = name;
_isEnabled = Boolean.parseBoolean(_configDao.getValue(Config.OvsTunnelNetwork.key()));
if (_isEnabled) {
@ -377,21 +376,6 @@ public class OvsTunnelManagerImpl implements OvsTunnelManager {
}
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean isOvsTunnelEnabled() {
return _isEnabled;

12
server/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -110,6 +110,7 @@ import com.cloud.utils.ActionDelegate;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction;
@ -141,7 +142,7 @@ import edu.emory.mathcs.backport.java.util.Collections;
* report router statistics | seconds | 300s || * }
**/
@Local(value = { AgentManager.class })
public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
public class AgentManagerImpl extends ManagerBase implements AgentManager, HandlerFactory {
private static final Logger s_logger = Logger.getLogger(AgentManagerImpl.class);
private static final Logger status_logger = Logger.getLogger(Status.class);
@ -206,7 +207,6 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
protected int _retry = 2;
protected String _name;
protected String _instance;
protected int _wait;
@ -230,8 +230,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
@Override
public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
_name = name;
final Map<String, String> configs = _configDao.getConfiguration("AgentManager", params);
_port = NumbersUtil.parseInt(configs.get("port"), 8250);
final int workers = NumbersUtil.parseInt(configs.get("workers"), 5);
@ -840,11 +839,6 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
return true;
}
@Override
public String getName() {
return _name;
}
protected boolean handleDisconnectWithoutInvestigation(AgentAttache attache, Status.Event event, boolean transitState) {
long hostId = attache.getId();

22
server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java
View File

@ -32,17 +32,17 @@ import com.cloud.host.Host;
import com.cloud.host.Host.Type;
import com.cloud.host.dao.HostDao;
import com.cloud.offering.ServiceOffering;
import com.cloud.utils.component.AdapterBase;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
@Component
@Local(value={HostAllocator.class})
public class TestingAllocator implements HostAllocator {
public class TestingAllocator extends AdapterBase implements HostAllocator {
@Inject HostDao _hostDao;
Long _computingHost;
Long _storageHost;
Long _routingHost;
String _name;
@Override
public List<Host> allocateTo(VirtualMachineProfile<? extends VirtualMachine> vmProfile, DeploymentPlan plan, Type type,
@ -81,24 +81,6 @@ public class TestingAllocator implements HostAllocator {
value = (String)params.get(Host.Type.Storage.toString());
_storageHost = (value != null) ? Long.parseLong(value) : null;
_name = name;
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
}

19
server/src/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.java
View File

@ -33,10 +33,11 @@ import com.cloud.agent.manager.authn.AgentAuthorizer;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.exception.ConnectionException;
import com.cloud.host.dao.HostDao;
import com.cloud.utils.component.AdapterBase;
@Component
@Local(value={AgentAuthorizer.class, StartupCommandProcessor.class})
public class BasicAgentAuthManager implements AgentAuthorizer, StartupCommandProcessor {
public class BasicAgentAuthManager extends AdapterBase implements AgentAuthorizer, StartupCommandProcessor {
private static final Logger s_logger = Logger.getLogger(BasicAgentAuthManager.class);
@Inject HostDao _hostDao = null;
@Inject ConfigurationDao _configDao = null;
@ -65,20 +66,4 @@ public class BasicAgentAuthManager implements AgentAuthorizer, StartupCommandPro
_agentManager.registerForInitialConnects(this, true);
return true;
}
@Override
public String getName() {
return getClass().getName();
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
}

11
server/src/com/cloud/alert/AlertManagerImpl.java
View File

@ -72,6 +72,7 @@ import com.cloud.storage.StoragePoolVO;
import com.cloud.storage.dao.StoragePoolDao;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.SearchCriteria;
import com.sun.mail.smtp.SMTPMessage;
@ -80,7 +81,7 @@ import com.sun.mail.smtp.SMTPTransport;
@Component
@Local(value={AlertManager.class})
public class AlertManagerImpl implements AlertManager {
public class AlertManagerImpl extends ManagerBase implements AlertManager {
private static final Logger s_logger = Logger.getLogger(AlertManagerImpl.class.getName());
private static final long INITIAL_CAPACITY_CHECK_DELAY = 30L * 1000L; // thirty seconds expressed in milliseconds
@ -88,7 +89,6 @@ public class AlertManagerImpl implements AlertManager {
private static final DecimalFormat _dfPct = new DecimalFormat("###.##");
private static final DecimalFormat _dfWhole = new DecimalFormat("########");
private String _name = null;
private EmailAlert _emailAlert;
@Inject private AlertDao _alertDao;
@Inject private HostDao _hostDao;
@ -122,8 +122,6 @@ public class AlertManagerImpl implements AlertManager {
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
Map<String, String> configs = _configDao.getConfiguration("management-server", params);
// set up the email system for alerts
@ -223,11 +221,6 @@ public class AlertManagerImpl implements AlertManager {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
_timer.schedule(new CapacityChecker(), INITIAL_CAPACITY_CHECK_DELAY, _capacityCheckPeriod);

19
server/src/com/cloud/alert/ClusterAlertAdapter.java
View File

@ -30,16 +30,16 @@ import com.cloud.cluster.ClusterNodeJoinEventArgs;
import com.cloud.cluster.ClusterNodeLeftEventArgs;
import com.cloud.cluster.ManagementServerHostVO;
import com.cloud.cluster.dao.ManagementServerHostDao;
import com.cloud.utils.component.AdapterBase;
import com.cloud.utils.events.EventArgs;
import com.cloud.utils.events.SubscriptionMgr;
@Component
@Local(value = AlertAdapter.class)
public class ClusterAlertAdapter implements AlertAdapter {
public class ClusterAlertAdapter extends AdapterBase implements AlertAdapter {
private static final Logger s_logger = Logger.getLogger(ClusterAlertAdapter.class);
private String _name;
@Inject private AlertManager _alertMgr;
@Inject private ManagementServerHostDao _mshostDao;
@ -117,19 +117,4 @@ public class ClusterAlertAdapter implements AlertAdapter {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
}

20
server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
View File

@ -29,19 +29,18 @@ import com.cloud.consoleproxy.ConsoleProxyAlertEventArgs;
import com.cloud.consoleproxy.ConsoleProxyManager;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.utils.component.AdapterBase;
import com.cloud.utils.events.SubscriptionMgr;
import com.cloud.vm.ConsoleProxyVO;
import com.cloud.vm.dao.ConsoleProxyDao;
@Component
@Local(value=AlertAdapter.class)
public class ConsoleProxyAlertAdapter implements AlertAdapter {
public class ConsoleProxyAlertAdapter extends AdapterBase implements AlertAdapter {
private static final Logger s_logger = Logger.getLogger(ConsoleProxyAlertAdapter.class);
@Inject private AlertManager _alertMgr;
private String _name;
@Inject private DataCenterDao _dcDao;
@Inject private ConsoleProxyDao _consoleProxyDao;
@ -195,19 +194,4 @@ public class ConsoleProxyAlertAdapter implements AlertAdapter {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
}

19
server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
View File

@ -32,16 +32,16 @@ import com.cloud.dc.DataCenterVO;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.storage.secondary.SecStorageVmAlertEventArgs;
import com.cloud.storage.secondary.SecondaryStorageVmManager;
import com.cloud.utils.component.AdapterBase;
import com.cloud.utils.events.SubscriptionMgr;
import com.cloud.vm.SecondaryStorageVmVO;
import com.cloud.vm.dao.SecondaryStorageVmDao;
@Component
@Local(value=AlertAdapter.class)
public class SecondaryStorageVmAlertAdapter implements AlertAdapter {
public class SecondaryStorageVmAlertAdapter extends AdapterBase implements AlertAdapter {
private static final Logger s_logger = Logger.getLogger(SecondaryStorageVmAlertAdapter.class);
private String _name;
@Inject private AlertManager _alertMgr;
@Inject private DataCenterDao _dcDao;
@ -197,19 +197,4 @@ public class SecondaryStorageVmAlertAdapter implements AlertAdapter {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
}

16
server/src/com/cloud/api/ApiServlet.java
View File

@ -24,6 +24,8 @@ import java.util.HashMap;
import java.util.Map;
import javax.inject.Inject;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@ -34,14 +36,13 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
import com.cloud.exception.CloudAuthenticationException;
import com.cloud.user.Account;
import com.cloud.user.AccountService;
import com.cloud.user.UserContext;
import com.cloud.utils.StringUtils;
import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.exception.CloudRuntimeException;
@Component("apiServlet")
@SuppressWarnings("serial")
@ -53,14 +54,13 @@ public class ApiServlet extends HttpServlet {
@Inject AccountService _accountMgr;
public ApiServlet() {
super();
_apiServer = ApiServer.getInstance();
_accountMgr = ComponentContext.getComponent(AccountService.class);
if (_apiServer == null) {
throw new CloudRuntimeException("ApiServer not initialized");
}
}
@Override
public void init(ServletConfig config) throws ServletException {
SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(this, config.getServletContext());
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
processRequest(req, resp);

26
server/src/com/cloud/api/query/QueryManagerImpl.java
View File

@ -136,6 +136,7 @@ import com.cloud.utils.DateUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@ -149,12 +150,10 @@ import com.cloud.vm.dao.UserVmDao;
@Component
@Local(value = {QueryService.class })
public class QueryManagerImpl implements QueryService, Manager {
public class QueryManagerImpl extends ManagerBase implements QueryService {
public static final Logger s_logger = Logger.getLogger(QueryManagerImpl.class);
private String _name;
// public static ViewResponseHelper _responseGenerator;
@Inject
@ -247,27 +246,6 @@ public class QueryManagerImpl implements QueryService, Manager {
@Inject
private HighAvailabilityManager _haMgr;
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
return true;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return _name;
}
/* (non-Javadoc)
* @see com.cloud.api.query.QueryService#searchForUsers(org.apache.cloudstack.api.command.admin.user.ListUsersCmd)
*/

28
server/src/com/cloud/async/AsyncJobExecutorContextImpl.java
View File

@ -16,11 +16,8 @@
// under the License.
package com.cloud.async;
import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.springframework.stereotype.Component;
@ -36,6 +33,7 @@ import com.cloud.storage.snapshot.SnapshotManager;
import com.cloud.user.AccountManager;
import com.cloud.user.dao.AccountDao;
import com.cloud.user.dao.UserDao;
import com.cloud.utils.component.ManagerBase;
import com.cloud.vm.UserVmManager;
import com.cloud.vm.VirtualMachineManager;
import com.cloud.vm.dao.DomainRouterDao;
@ -43,8 +41,7 @@ import com.cloud.vm.dao.UserVmDao;
@Component
@Local(value={AsyncJobExecutorContext.class})
public class AsyncJobExecutorContextImpl implements AsyncJobExecutorContext {
private String _name;
public class AsyncJobExecutorContextImpl extends ManagerBase implements AsyncJobExecutorContext {
@Inject private AgentManager _agentMgr;
@Inject private NetworkModel _networkMgr;
@ -146,25 +143,4 @@ public class AsyncJobExecutorContextImpl implements AsyncJobExecutorContext {
public VirtualMachineManager getItMgr() {
return _itMgr;
}
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
return true;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return _name;
}
}

12
server/src/com/cloud/async/AsyncJobManagerImpl.java
View File

@ -64,6 +64,7 @@ import com.cloud.utils.DateUtil;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.PropertiesUtil;
import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GlobalLock;
@ -77,7 +78,7 @@ import com.google.gson.reflect.TypeToken;
@Component
@Local(value={AsyncJobManager.class})
public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListener {
public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, ClusterManagerListener {
public static final Logger s_logger = Logger.getLogger(AsyncJobManagerImpl.class.getName());
private static final int ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION = 3; // 3 seconds
@ -85,8 +86,6 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
private static final int HEARTBEAT_INTERVAL = 2000;
private static final int GC_INTERVAL = 10000; // 10 seconds
private String _name;
@Inject private AsyncJobExecutorContext _context;
@Inject private SyncQueueManager _queueMgr;
@Inject private ClusterManager _clusterMgr;
@ -693,8 +692,6 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
int expireMinutes = NumbersUtil.parseInt(
_configDao.getValue(Config.JobExpireMinutes.key()), 24*60);
_jobExpireSeconds = (long)expireMinutes*60;
@ -783,9 +780,4 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe
_executor.shutdown();
return true;
}
@Override
public String getName() {
return _name;
}
}

26
server/src/com/cloud/async/SyncQueueManagerImpl.java
View File

@ -31,17 +31,16 @@ import org.springframework.stereotype.Component;
import com.cloud.async.dao.SyncQueueDao;
import com.cloud.async.dao.SyncQueueItemDao;
import com.cloud.utils.DateUtil;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value={SyncQueueManager.class})
public class SyncQueueManagerImpl implements SyncQueueManager {
public class SyncQueueManagerImpl extends ManagerBase implements SyncQueueManager {
public static final Logger s_logger = Logger.getLogger(SyncQueueManagerImpl.class.getName());
private String _name;
@Inject private SyncQueueDao _syncQueueDao;
@Inject private SyncQueueItemDao _syncQueueItemDao;
@ -240,27 +239,6 @@ public class SyncQueueManagerImpl implements SyncQueueManager {
return _syncQueueItemDao.getBlockedQueueItems(thresholdMs, exclusive);
}
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
return true;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return _name;
}
private boolean queueReadyToProcess(SyncQueueVO queueVO) {
return queueVO.getQueueSize() < queueVO.getQueueSizeLimit();
}

26
server/src/com/cloud/baremetal/BareMetalPxeServiceBase.java
View File

@ -27,14 +27,14 @@ import com.cloud.dc.dao.HostPodDao;
import com.cloud.deploy.DeployDestination;
import com.cloud.host.Host;
import com.cloud.host.dao.HostDao;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.UserVmVO;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.NicDao;
public abstract class BareMetalPxeServiceBase implements PxeServerService {
protected String _name;
public abstract class BareMetalPxeServiceBase extends ManagerBase implements PxeServerService {
@Inject DataCenterDao _dcDao;
@Inject HostDao _hostDao;
@Inject AgentManager _agentMgr;
@ -42,28 +42,6 @@ public abstract class BareMetalPxeServiceBase implements PxeServerService {
@Inject HostPodDao _podDao;
@Inject NicDao _nicDao;
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public boolean prepare(VirtualMachineProfile<UserVmVO> profile, DeployDestination dest, ReservationContext context, Long pxeServerId) {
throw new CloudRuntimeException("Dervied class should implement this method");

30
server/src/com/cloud/baremetal/BareMetalResourceBase.java
View File

@ -597,4 +597,34 @@ public class BareMetalResourceBase implements ServerResource {
_agentControl = agentControl;
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

2
server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
View File

@ -106,7 +106,7 @@ import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.VirtualMachineProfile.Param;
@Local(value={BareMetalVmManager.class, BareMetalVmService.class})
public class BareMetalVmManagerImpl extends UserVmManagerImpl implements BareMetalVmManager, BareMetalVmService, Manager,
public class BareMetalVmManagerImpl extends UserVmManagerImpl implements BareMetalVmManager, BareMetalVmService,
StateListener<State, VirtualMachine.Event, VirtualMachine> {
private static final Logger s_logger = Logger.getLogger(BareMetalVmManagerImpl.class);
@Inject ConfigurationDao _configDao;

9
server/src/com/cloud/baremetal/ExternalDhcpManagerImpl.java
View File

@ -50,6 +50,7 @@ import com.cloud.resource.ResourceManager;
import com.cloud.resource.ResourceStateAdapter;
import com.cloud.resource.ServerResource;
import com.cloud.resource.UnableDeleteHostException;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
@ -63,9 +64,8 @@ import com.cloud.vm.dao.UserVmDao;
@Component
@Local(value = {ExternalDhcpManager.class})
public class ExternalDhcpManagerImpl implements ExternalDhcpManager, ResourceStateAdapter {
public class ExternalDhcpManagerImpl extends ManagerBase implements ExternalDhcpManager, ResourceStateAdapter {
private static final org.apache.log4j.Logger s_logger = Logger.getLogger(ExternalDhcpManagerImpl.class);
protected String _name;
@Inject DataCenterDao _dcDao;
@Inject HostDao _hostDao;
@Inject AgentManager _agentMgr;
@ -91,11 +91,6 @@ public class ExternalDhcpManagerImpl implements ExternalDhcpManager, ResourceSta
return true;
}
@Override
public String getName() {
return _name;
}
protected String getDhcpServerGuid(String zoneId, String name, String ip) {
return zoneId + "-" + name + "-" + ip;
}

30
server/src/com/cloud/baremetal/ExternalDhcpResourceBase.java
View File

@ -165,4 +165,34 @@ public class ExternalDhcpResourceBase implements ServerResource {
public void setAgentControl(IAgentControl agentControl) {
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

10
server/src/com/cloud/baremetal/PxeServerManagerImpl.java
View File

@ -42,6 +42,7 @@ import com.cloud.resource.ServerResource;
import com.cloud.resource.UnableDeleteHostException;
import com.cloud.uservm.UserVm;
import com.cloud.utils.component.AdapterBase;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.UserVmVO;
@ -50,9 +51,8 @@ import com.cloud.vm.VirtualMachineProfile.Param;
@Component
@Local(value = {PxeServerManager.class})
public class PxeServerManagerImpl implements PxeServerManager, ResourceStateAdapter {
public class PxeServerManagerImpl extends ManagerBase implements PxeServerManager, ResourceStateAdapter {
private static final org.apache.log4j.Logger s_logger = Logger.getLogger(PxeServerManagerImpl.class);
protected String _name;
@Inject DataCenterDao _dcDao;
@Inject HostDao _hostDao;
@Inject AgentManager _agentMgr;
@ -64,7 +64,6 @@ public class PxeServerManagerImpl implements PxeServerManager, ResourceStateAdap
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
_resourceMgr.registerResourceStateAdapter(this.getClass().getSimpleName(), this);
return true;
}
@ -80,11 +79,6 @@ public class PxeServerManagerImpl implements PxeServerManager, ResourceStateAdap
return true;
}
@Override
public String getName() {
return _name;
}
protected PxeServerService getServiceByType(String type) {
PxeServerService _service;
_service = AdapterBase.getAdapterByName(_services, type);

30
server/src/com/cloud/baremetal/PxeServerResourceBase.java
View File

@ -152,4 +152,34 @@ public class PxeServerResourceBase implements ServerResource {
}
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

10
server/src/com/cloud/capacity/CapacityManagerImpl.java
View File

@ -68,6 +68,7 @@ import com.cloud.storage.swift.SwiftManager;
import com.cloud.utils.DateUtil;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.SearchCriteria;
@ -81,9 +82,8 @@ import com.cloud.vm.dao.VMInstanceDao;
@Component
@Local(value = CapacityManager.class)
public class CapacityManagerImpl implements CapacityManager, StateListener<State, VirtualMachine.Event, VirtualMachine>, Listener, ResourceListener {
public class CapacityManagerImpl extends ManagerBase implements CapacityManager, StateListener<State, VirtualMachine.Event, VirtualMachine>, Listener, ResourceListener {
private static final Logger s_logger = Logger.getLogger(CapacityManagerImpl.class);
String _name;
@Inject
CapacityDao _capacityDao;
@Inject
@ -120,7 +120,6 @@ public class CapacityManagerImpl implements CapacityManager, StateListener<State
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
_vmCapacityReleaseInterval = NumbersUtil.parseInt(_configDao.getValue(Config.CapacitySkipcountingHours.key()), 3600);
_storageOverProvisioningFactor = NumbersUtil.parseFloat(_configDao.getValue(Config.StorageOverprovisioningFactor.key()), 1.0f);
_cpuOverProvisioningFactor = NumbersUtil.parseFloat(_configDao.getValue(Config.CPUOverprovisioningFactor.key()), 1.0f);
@ -150,11 +149,6 @@ public class CapacityManagerImpl implements CapacityManager, StateListener<State
return true;
}
@Override
public String getName() {
return _name;
}
@DB
@Override
public boolean releaseVmCapacity(VirtualMachine vm, boolean moveFromReserved, boolean moveToReservered, Long hostId) {

22
server/src/com/cloud/cluster/ClusterFenceManagerImpl.java
View File

@ -26,38 +26,22 @@ import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import com.cloud.utils.component.ManagerBase;
@Component
@Local(value={ClusterFenceManager.class})
public class ClusterFenceManagerImpl implements ClusterFenceManager, ClusterManagerListener {
public class ClusterFenceManagerImpl extends ManagerBase implements ClusterFenceManager, ClusterManagerListener {
private static final Logger s_logger = Logger.getLogger(ClusterFenceManagerImpl.class);
@Inject ClusterManager _clusterMgr;
private String _name;
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
_clusterMgr.registerListener(this);
return true;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public void onManagementNodeJoined(List<ManagementServerHostVO> nodeList, long selfNodeId) {
}

14
server/src/com/cloud/cluster/ClusterManagerImpl.java
View File

@ -44,8 +44,6 @@ import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component;
import com.cloud.agent.AgentManager;
import com.cloud.agent.AgentManager.OnError;
@ -74,6 +72,8 @@ import com.cloud.utils.DateUtil;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Profiler;
import com.cloud.utils.PropertiesUtil;
import com.cloud.utils.component.ComponentLifecycle;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.ConnectionConcierge;
import com.cloud.utils.db.DB;
@ -89,7 +89,7 @@ import com.cloud.utils.net.NetUtils;
import com.google.gson.Gson;
@Local(value = { ClusterManager.class })
public class ClusterManagerImpl implements ClusterManager {
public class ClusterManagerImpl extends ManagerBase implements ClusterManager {
private static final Logger s_logger = Logger.getLogger(ClusterManagerImpl.class);
private static final int EXECUTOR_SHUTDOWN_TIMEOUT = 1000; // 1 second
@ -139,7 +139,6 @@ public class ClusterManagerImpl implements ClusterManager {
private boolean _peerScanInited = false;
private String _name;
private String _clusterNodeIP = "127.0.0.1";
private boolean _agentLBEnabled = false;
private double _connectedAgentsThreshold = 0.7;
@ -158,6 +157,7 @@ public class ClusterManagerImpl implements ClusterManager {
// recursive remote calls between nodes
//
_executor = Executors.newCachedThreadPool(new NamedThreadFactory("Cluster-Worker"));
setRunLevel(ComponentLifecycle.RUN_LEVEL_FRAMEWORK);
}
private void registerRequestPdu(ClusterServiceRequestPdu pdu) {
@ -1155,11 +1155,6 @@ public class ClusterManagerImpl implements ClusterManager {
return null;
}
@Override
public String getName() {
return _name;
}
@Override @DB
public boolean start() {
if(s_logger.isInfoEnabled()) {
@ -1255,7 +1250,6 @@ public class ClusterManagerImpl implements ClusterManager {
if(s_logger.isInfoEnabled()) {
s_logger.info("Start configuring cluster manager : " + name);
}
_name = name;
Map<String, String> configs = _configDao.getConfiguration("management-server", params);

11
server/src/com/cloud/cluster/ClusterServiceServletAdapter.java
View File

@ -36,10 +36,11 @@ import com.cloud.configuration.Config;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.PropertiesUtil;
import com.cloud.utils.component.AdapterBase;
@Component
@Local(value={ClusterServiceAdapter.class})
public class ClusterServiceServletAdapter implements ClusterServiceAdapter {
public class ClusterServiceServletAdapter extends AdapterBase implements ClusterServiceAdapter {
private static final Logger s_logger = Logger.getLogger(ClusterServiceServletAdapter.class);
private static final int DEFAULT_SERVICE_PORT = 9090;
@ -53,7 +54,6 @@ public class ClusterServiceServletAdapter implements ClusterServiceAdapter {
private ClusterServiceServletContainer _servletContainer;
private String _name;
private int _clusterServicePort = DEFAULT_SERVICE_PORT;
private int _clusterRequestTimeoutSeconds = DEFAULT_REQUEST_TIMEOUT;
@ -105,17 +105,10 @@ public class ClusterServiceServletAdapter implements ClusterServiceAdapter {
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
init();
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
_servletContainer = new ClusterServiceServletContainer();

9
server/src/com/cloud/cluster/DummyClusterManagerImpl.java
View File

@ -29,17 +29,17 @@ import com.cloud.agent.api.Command;
import com.cloud.exception.AgentUnavailableException;
import com.cloud.exception.OperationTimedoutException;
import com.cloud.host.Status.Event;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.MacAddress;
@Local(value={ClusterManager.class})
public class DummyClusterManagerImpl implements ClusterManager {
public class DummyClusterManagerImpl extends ManagerBase implements ClusterManager {
private static final Logger s_logger = Logger.getLogger(DummyClusterManagerImpl.class);
protected long _id = MacAddress.getMacAddress().toLong();
protected long _runId = System.currentTimeMillis();
private String _name;
private final String _clusterNodeIP = "127.0.0.1";
@Override
@ -142,11 +142,6 @@ public class DummyClusterManagerImpl implements ClusterManager {
public void broadcast(long hostId, Command[] cmds) {
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
if(s_logger.isInfoEnabled())

24
server/src/com/cloud/cluster/ManagementServerNode.java
View File

@ -18,19 +18,28 @@ package com.cloud.cluster;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import com.cloud.utils.component.AdapterBase;
import com.cloud.utils.component.ComponentLifecycle;
import com.cloud.utils.component.SystemIntegrityChecker;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.MacAddress;
@Component
@Local(value = {SystemIntegrityChecker.class})
public class ManagementServerNode implements SystemIntegrityChecker {
private static final long s_nodeId = MacAddress.getMacAddress().toLong();
public class ManagementServerNode extends AdapterBase implements SystemIntegrityChecker {
private final Logger s_logger = Logger.getLogger(ManagementServerNode.class);
private static final long s_nodeId = MacAddress.getMacAddress().toLong();
public static enum State { Up, Down };
public ManagementServerNode() {
setRunLevel(ComponentLifecycle.RUN_LEVEL_FRAMEWORK_BOOTSTRAP);
}
@Override
public void check() {
if (s_nodeId <= 0) {
@ -41,4 +50,15 @@ public class ManagementServerNode implements SystemIntegrityChecker {
public static long getManagementServerId() {
return s_nodeId;
}
@Override
public boolean start() {
try {
check();
} catch (Exception e) {
s_logger.error("System integrity check exception", e);
System.exit(1);
}
return true;
}
}

25
server/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java
View File

@ -35,39 +35,18 @@ import com.cloud.host.Host;
import com.cloud.host.HostVO;
import com.cloud.host.Status;
import com.cloud.host.dao.HostDao;
import com.cloud.utils.component.AdapterBase;
import com.cloud.utils.db.SearchCriteria2;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.SearchCriteriaService;
@Component
@Local(value=AgentLoadBalancerPlanner.class)
public class ClusterBasedAgentLoadBalancerPlanner implements AgentLoadBalancerPlanner{
public class ClusterBasedAgentLoadBalancerPlanner extends AdapterBase implements AgentLoadBalancerPlanner{
private static final Logger s_logger = Logger.getLogger(AgentLoadBalancerPlanner.class);
private String _name;
@Inject HostDao _hostDao = null;
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public List<HostVO> getHostsToRebalance(long msId, int avLoad) {
SearchCriteriaService<HostVO, HostVO> sc = SearchCriteria2.create(HostVO.class);

11
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -157,6 +157,7 @@ import com.cloud.user.UserContext;
import com.cloud.user.dao.AccountDao;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.StringUtils;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.crypt.DBEncryptionUtil;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
@ -171,10 +172,9 @@ import edu.emory.mathcs.backport.java.util.Arrays;
@Component
@Local(value = { ConfigurationManager.class, ConfigurationService.class })
public class ConfigurationManagerImpl implements ConfigurationManager, ConfigurationService {
public class ConfigurationManagerImpl extends ManagerBase implements ConfigurationManager, ConfigurationService {
public static final Logger s_logger = Logger.getLogger(ConfigurationManagerImpl.class.getName());
String _name;
@Inject
ConfigurationDao _configDao;
@Inject
@ -257,8 +257,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
@Override
public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
_name = name;
String maxVolumeSizeInGbString = _configDao.getValue("storage.max.volume.size");
_maxVolumeSizeInGb = NumbersUtil.parseInt(maxVolumeSizeInGbString, 2000);
@ -291,11 +289,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
configValuesForValidation.add("incorrect.login.attempts.allowed");
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {

2
server/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java
View File

@ -30,6 +30,7 @@ import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import com.cloud.configuration.ConfigurationVO;
import com.cloud.utils.component.ComponentLifecycle;
import com.cloud.utils.crypt.DBEncryptionUtil;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@ -56,6 +57,7 @@ public class ConfigurationDaoImpl extends GenericDaoBase<ConfigurationVO, String
NameSearch = createSearchBuilder();
NameSearch.and("name", NameSearch.entity().getName(), SearchCriteria.Op.EQ);
setRunLevel(ComponentLifecycle.RUN_LEVEL_SYSTEM_BOOTSTRAP);
}
@Override

16
server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
View File

@ -49,6 +49,7 @@ import com.cloud.host.dao.HostDao;
import com.cloud.info.ConsoleProxyInfo;
import com.cloud.network.Network;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.ManagerBase;
import com.cloud.vm.ConsoleProxyVO;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.UserVmVO;
@ -63,10 +64,9 @@ import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.VMInstanceDao;
@Local(value = { ConsoleProxyManager.class })
public class AgentBasedConsoleProxyManager implements ConsoleProxyManager, VirtualMachineGuru<ConsoleProxyVO>, AgentHook {
public class AgentBasedConsoleProxyManager extends ManagerBase implements ConsoleProxyManager, VirtualMachineGuru<ConsoleProxyVO>, AgentHook {
private static final Logger s_logger = Logger.getLogger(AgentBasedConsoleProxyManager.class);
private String _name;
@Inject
protected HostDao _hostDao;
@Inject
@ -103,8 +103,6 @@ public class AgentBasedConsoleProxyManager implements ConsoleProxyManager, Virtu
s_logger.info("Start configuring AgentBasedConsoleProxyManager");
}
_name = name;
Map<String, String> configs = _configDao.getConfiguration("management-server", params);
String value = configs.get("consoleproxy.url.port");
if (value != null) {
@ -136,16 +134,6 @@ public class AgentBasedConsoleProxyManager implements ConsoleProxyManager, Virtu
return true;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
HostVO findHost(VMInstanceVO vm) {
return _hostDao.findById(vm.getHostId());
}

11
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
View File

@ -130,6 +130,7 @@ import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GlobalLock;
import com.cloud.utils.db.SearchCriteria.Op;
@ -171,7 +172,7 @@ import com.google.gson.GsonBuilder;
// because sooner or later, it will be driven into Running state
//
@Local(value = { ConsoleProxyManager.class, ConsoleProxyService.class })
public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProxyService, Manager, AgentHook, VirtualMachineGuru<ConsoleProxyVO>, SystemVmLoadScanHandler<Long>, ResourceStateAdapter {
public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxyManager, ConsoleProxyService, AgentHook, VirtualMachineGuru<ConsoleProxyVO>, SystemVmLoadScanHandler<Long>, ResourceStateAdapter {
private static final Logger s_logger = Logger.getLogger(ConsoleProxyManagerImpl.class);
private static final int DEFAULT_CAPACITY_SCAN_INTERVAL = 30000; // 30 seconds
@ -184,7 +185,6 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
private String _mgmt_host;
private int _mgmt_port = 8250;
private String _name;
@Inject
private List<ConsoleProxyAllocator> _consoleProxyAllocators;
@ -1230,11 +1230,6 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
return aggregator.getZoneHostInfoMap();
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
if (s_logger.isInfoEnabled()) {
@ -1446,8 +1441,6 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx
s_logger.info("Start configuring console proxy manager : " + name);
}
_name = name;
Map<String, String> configs = _configDao.getConfiguration("management-server", params);
String value = configs.get(Config.ConsoleProxyCmdPort.key());

3
server/src/com/cloud/dao/EntityManagerImpl.java
View File

@ -28,6 +28,7 @@ import org.springframework.stereotype.Component;
import net.sf.ehcache.Cache;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
@ -37,7 +38,7 @@ import com.cloud.utils.db.SearchCriteria;
@Component
@Local(value=EntityManager.class)
@SuppressWarnings("unchecked")
public class EntityManagerImpl implements EntityManager, Manager {
public class EntityManagerImpl extends ManagerBase implements EntityManager {
String _name;
Cache _cache;

11
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
View File

@ -64,6 +64,7 @@ import com.cloud.storage.dao.GuestOSCategoryDao;
import com.cloud.storage.dao.GuestOSDao;
import com.cloud.user.AccountManager;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VMInstanceVO;
@ -96,9 +97,8 @@ import com.cloud.vm.dao.VMInstanceDao;
* before retrying the stop | seconds | 120 || * }
**/
@Local(value = { HighAvailabilityManager.class })
public class HighAvailabilityManagerImpl implements HighAvailabilityManager, ClusterManagerListener {
public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvailabilityManager, ClusterManagerListener {
protected static final Logger s_logger = Logger.getLogger(HighAvailabilityManagerImpl.class);
String _name;
WorkerThread[] _workers;
boolean _stopped;
long _timeToSleep;
@ -688,8 +688,6 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager, Clu
@Override
public boolean configure(final String name, final Map<String, Object> xmlParams) throws ConfigurationException {
_name = name;
_serverId = _msServer.getId();
Map<String, String> params = new HashMap<String, String>();
@ -745,11 +743,6 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager, Clu
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
_stopped = false;

21
server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java
View File

@ -50,6 +50,7 @@ import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.Storage;
import com.cloud.utils.component.AdapterBase;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.MacAddress;
import com.cloud.utils.net.NetUtils;
@ -60,7 +61,7 @@ import com.cloud.utils.net.NetUtils;
*/
@Component
@Local(value=StartupCommandProcessor.class)
public class CloudZonesStartupProcessor implements StartupCommandProcessor {
public class CloudZonesStartupProcessor extends AdapterBase implements StartupCommandProcessor {
private static final Logger s_logger = Logger.getLogger(CloudZonesStartupProcessor.class);
@Inject ClusterDao _clusterDao = null;
@Inject ConfigurationDao _configDao = null;
@ -87,24 +88,6 @@ public class CloudZonesStartupProcessor implements StartupCommandProcessor {
return true;
}
@Override
public String getName() {
return getClass().getName();
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public boolean processInitialConnect(StartupCommand[] cmd)
throws ConnectionException {

26
server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java
View File

@ -33,25 +33,18 @@ import com.cloud.host.Host;
import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.utils.component.ManagerBase;
@Component
@Local(value = { HypervisorGuruManager.class } )
public class HypervisorGuruManagerImpl implements HypervisorGuruManager {
public class HypervisorGuruManagerImpl extends ManagerBase implements HypervisorGuruManager {
public static final Logger s_logger = Logger.getLogger(HypervisorGuruManagerImpl.class.getName());
@Inject HostDao _hostDao;
String _name;
@Inject List<HypervisorGuru> _hvGuruList;
Map<HypervisorType, HypervisorGuru> _hvGurus = new HashMap<HypervisorType, HypervisorGuru>();
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
return true;
}
@PostConstruct
public void init() {
for(HypervisorGuru guru : _hvGuruList) {
@ -59,21 +52,6 @@ public class HypervisorGuruManagerImpl implements HypervisorGuruManager {
}
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public HypervisorGuru getGuru(HypervisorType hypervisorType) {
return _hvGurus.get(hypervisorType);

30
server/src/com/cloud/hypervisor/kvm/discoverer/KvmDummyResourceBase.java
View File

@ -85,4 +85,34 @@ public class KvmDummyResourceBase extends ServerResourceBase implements ServerRe
_agentIp = (String)params.get("agentIp");
return true;
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

26
server/src/com/cloud/keystore/KeystoreManagerImpl.java
View File

@ -37,39 +37,17 @@ import org.springframework.stereotype.Component;
import com.cloud.agent.api.SecStorageSetupCommand;
import com.cloud.utils.Ternary;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.security.CertificateHelper;
@Component
@Local(value=KeystoreManager.class)
public class KeystoreManagerImpl implements KeystoreManager {
public class KeystoreManagerImpl extends ManagerBase implements KeystoreManager {
private static final Logger s_logger = Logger.getLogger(KeystoreManagerImpl.class);
private String _name;
@Inject private KeystoreDao _ksDao;
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
return true;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean validateCertificate(String certificate, String key, String domainSuffix) {
if(certificate == null || certificate.isEmpty() ||

20
server/src/com/cloud/maint/UpgradeManagerImpl.java
View File

@ -44,6 +44,7 @@ import org.springframework.stereotype.Component;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.maint.dao.AgentUpgradeDao;
import com.cloud.utils.PropertiesUtil;
import com.cloud.utils.component.ManagerBase;
/**
*
@ -55,11 +56,10 @@ import com.cloud.utils.PropertiesUtil;
*/
@Component
@Local(UpgradeManager.class)
public class UpgradeManagerImpl implements UpgradeManager {
public class UpgradeManagerImpl extends ManagerBase implements UpgradeManager {
private final static Logger s_logger = Logger.getLogger(UpgradeManagerImpl.class);
private static final MultiThreadedHttpConnectionManager s_httpClientManager = new MultiThreadedHttpConnectionManager();
String _name;
String _minimalVersion;
String _recommendedVersion;
// String _upgradeUrl;
@ -150,7 +150,6 @@ public class UpgradeManagerImpl implements UpgradeManager {
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
final Map<String, String> configs = _configDao.getConfiguration("UpgradeManager", params);
@ -187,19 +186,4 @@ public class UpgradeManagerImpl implements UpgradeManager {
}
return false;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
}

9
server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java
View File

@ -71,6 +71,7 @@ import com.cloud.user.UserStatisticsVO;
import com.cloud.user.dao.AccountDao;
import com.cloud.user.dao.UserStatisticsDao;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.GlobalLock;
import com.cloud.utils.db.Transaction;
@ -83,9 +84,8 @@ import com.cloud.vm.dao.NicDao;
@Component
@Local(value = { ExternalLoadBalancerUsageManager.class })
public class ExternalLoadBalancerUsageManagerImpl implements ExternalLoadBalancerUsageManager {
public class ExternalLoadBalancerUsageManagerImpl extends ManagerBase implements ExternalLoadBalancerUsageManager {
String _name;
@Inject
NetworkExternalLoadBalancerDao _networkExternalLBDao;
@Inject
@ -170,11 +170,6 @@ public class ExternalLoadBalancerUsageManagerImpl implements ExternalLoadBalance
return true;
}
@Override
public String getName() {
return _name;
}
private ExternalLoadBalancerDeviceVO getExternalLoadBalancerForNetwork(Network network) {
NetworkExternalLoadBalancerVO lbDeviceForNetwork = _networkExternalLBDao.findByNetworkId(network.getId());
if (lbDeviceForNetwork != null) {

25
server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java
View File

@ -68,13 +68,14 @@ import com.cloud.server.api.response.PxePingResponse;
import com.cloud.user.AccountManager;
import com.cloud.user.dao.AccountDao;
import com.cloud.user.dao.UserStatisticsDao;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.NicDao;
@Component
@Local(value = {ExternalNetworkDeviceManager.class})
public class ExternalNetworkDeviceManagerImpl implements ExternalNetworkDeviceManager {
public class ExternalNetworkDeviceManagerImpl extends ManagerBase implements ExternalNetworkDeviceManager {
@Inject ExternalDhcpManager _dhcpMgr;
@Inject PxeServerManager _pxeMgr;
@ -110,28 +111,6 @@ public class ExternalNetworkDeviceManagerImpl implements ExternalNetworkDeviceMa
// private final static IdentityService _identityService = (IdentityService)ComponentLocator.getLocator(ManagementServer.Name).getManager(IdentityService.class);
private static final org.apache.log4j.Logger s_logger = Logger.getLogger(ExternalNetworkDeviceManagerImpl.class);
protected String _name;
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
return true;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public Host addNetworkDevice(AddNetworkDeviceCmd cmd) {

11
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -162,6 +162,7 @@ import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.component.AdapterBase;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
@ -193,10 +194,9 @@ import com.cloud.vm.dao.VMInstanceDao;
*/
@Component
@Local(value = { NetworkManager.class})
public class NetworkManagerImpl implements NetworkManager, Manager, Listener {
public class NetworkManagerImpl extends ManagerBase implements NetworkManager, Listener {
static final Logger s_logger = Logger.getLogger(NetworkManagerImpl.class);
String _name;
@Inject
DataCenterDao _dcDao = null;
@Inject
@ -861,8 +861,6 @@ public class NetworkManagerImpl implements NetworkManager, Manager, Listener {
@Override
@DB
public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
_name = name;
_configs = _configDao.getConfiguration("AgentManager", params);
_networkGcWait = NumbersUtil.parseInt(_configs.get(Config.NetworkGcWait.key()), 600);
_networkGcInterval = NumbersUtil.parseInt(_configs.get(Config.NetworkGcInterval.key()), 600);
@ -1060,11 +1058,6 @@ public class NetworkManagerImpl implements NetworkManager, Manager, Listener {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
_executor.scheduleWithFixedDelay(new NetworkGarbageCollector(), _networkGcInterval, _networkGcInterval, TimeUnit.SECONDS);

11
server/src/com/cloud/network/NetworkModelImpl.java
View File

@ -88,6 +88,7 @@ import com.cloud.user.DomainManager;
import com.cloud.user.dao.AccountDao;
import com.cloud.utils.component.AdapterBase;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.JoinBuilder;
import com.cloud.utils.db.JoinBuilder.JoinType;
@ -107,10 +108,9 @@ import com.cloud.vm.dao.VMInstanceDao;
@Component
@Local(value = { NetworkModel.class})
public class NetworkModelImpl implements NetworkModel, Manager{
public class NetworkModelImpl extends ManagerBase implements NetworkModel {
static final Logger s_logger = Logger.getLogger(NetworkModelImpl.class);
String _name;
@Inject
DataCenterDao _dcDao = null;
@Inject
@ -1725,7 +1725,6 @@ public class NetworkModelImpl implements NetworkModel, Manager{
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
_configs = _configDao.getConfiguration("Network", params);
_networkDomain = _configs.get(Config.GuestDomainSuffix.key());
_allowSubdomainNetworkAccess = Boolean.valueOf(_configs.get(Config.SubDomainNetworkAccess.key()));
@ -1811,12 +1810,6 @@ public class NetworkModelImpl implements NetworkModel, Manager{
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public PublicIpAddress getSourceNatIpAddressForGuestNetwork(Account owner, Network guestNetwork) {
List<? extends IpAddress> addrs = listPublicIpsAssignedToGuestNtwk(owner.getId(), guestNetwork.getId(), true);

10
server/src/com/cloud/network/NetworkServiceImpl.java
View File

@ -125,6 +125,7 @@ import com.cloud.utils.AnnotationHelper;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.JoinBuilder;
@ -150,10 +151,9 @@ import com.cloud.vm.dao.VMInstanceDao;
*/
@Component
@Local(value = { NetworkService.class })
public class NetworkServiceImpl implements NetworkService, Manager {
public class NetworkServiceImpl extends ManagerBase implements NetworkService {
private static final Logger s_logger = Logger.getLogger(NetworkServiceImpl.class);
String _name;
@Inject
DataCenterDao _dcDao = null;
@Inject
@ -441,7 +441,6 @@ public class NetworkServiceImpl implements NetworkService, Manager {
@Override
@DB
public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
_name = name;
_configs = _configDao.getConfiguration("Network", params);
_cidrLimit = NumbersUtil.parseInt(_configs.get(Config.NetworkGuestCidrLimit.key()), 22);
@ -453,11 +452,6 @@ public class NetworkServiceImpl implements NetworkService, Manager {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;

11
server/src/com/cloud/network/NetworkUsageManagerImpl.java
View File

@ -80,6 +80,7 @@ import com.cloud.user.UserContext;
import com.cloud.user.UserStatisticsVO;
import com.cloud.user.dao.UserStatisticsDao;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GlobalLock;
import com.cloud.utils.db.JoinBuilder;
@ -92,13 +93,12 @@ import com.cloud.utils.net.MacAddress;
@Component
@Local(value = {NetworkUsageManager.class})
public class NetworkUsageManagerImpl implements NetworkUsageManager, ResourceStateAdapter {
public class NetworkUsageManagerImpl extends ManagerBase implements NetworkUsageManager, ResourceStateAdapter {
public enum NetworkUsageResourceName {
TrafficSentinel;
}
private static final org.apache.log4j.Logger s_logger = Logger.getLogger(NetworkUsageManagerImpl.class);
protected String _name;
@Inject HostDao _hostDao;
@Inject AgentManager _agentMgr;
@Inject IPAddressDao _ipAddressDao;
@ -224,8 +224,6 @@ public class NetworkUsageManagerImpl implements NetworkUsageManager, ResourceSta
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
AllocatedIpSearch = _ipAddressDao.createSearchBuilder();
AllocatedIpSearch.and("allocated", AllocatedIpSearch.entity().getAllocatedTime(), Op.NNULL);
AllocatedIpSearch.and("dc", AllocatedIpSearch.entity().getDataCenterId(), Op.EQ);
@ -253,11 +251,6 @@ public class NetworkUsageManagerImpl implements NetworkUsageManager, ResourceSta
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public List<IPAddressVO> listAllocatedDirectIps(long zoneId) {
SearchCriteria<IPAddressVO> sc = AllocatedIpSearch.create();

28
server/src/com/cloud/network/StorageNetworkManagerImpl.java
View File

@ -44,6 +44,7 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.Networks.TrafficType;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkVO;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.SearchCriteria2;
@ -57,10 +58,9 @@ import com.cloud.vm.dao.SecondaryStorageVmDao;
@Component
@Local(value = { StorageNetworkManager.class, StorageNetworkService.class })
public class StorageNetworkManagerImpl implements StorageNetworkManager, StorageNetworkService {
public class StorageNetworkManagerImpl extends ManagerBase implements StorageNetworkManager, StorageNetworkService {
private static final Logger s_logger = Logger.getLogger(StorageNetworkManagerImpl.class);
String _name;
@Inject
StorageNetworkIpAddressDao _sNwIpDao;
@Inject
@ -72,30 +72,6 @@ public class StorageNetworkManagerImpl implements StorageNetworkManager, Storage
@Inject
SecondaryStorageVmDao _ssvmDao;
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
return true;
}
@Override
public boolean start() {
// TODO Auto-generated method stub
return true;
}
@Override
public boolean stop() {
// TODO Auto-generated method stub
return true;
}
@Override
public String getName() {
// TODO Auto-generated method stub
return null;
}
private void checkOverlapPrivateIpRange(long podId, String startIp, String endIp) {
HostPodVO pod = _podDao.findById(podId);
if (pod == null) {

25
server/src/com/cloud/network/as/AutoScaleManagerImpl.java
View File

@ -86,6 +86,7 @@ import com.cloud.user.dao.UserDao;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDao;
@ -100,10 +101,9 @@ import com.google.gson.reflect.TypeToken;
@Component
@Local(value = { AutoScaleService.class, AutoScaleManager.class })
public class AutoScaleManagerImpl<Type> implements AutoScaleManager, AutoScaleService, Manager {
public class AutoScaleManagerImpl<Type> extends ManagerBase implements AutoScaleManager, AutoScaleService {
private static final Logger s_logger = Logger.getLogger(AutoScaleManagerImpl.class);
String _name;
@Inject
AccountDao _accountDao;
@Inject
@ -143,27 +143,6 @@ public class AutoScaleManagerImpl<Type> implements AutoScaleManager, AutoScaleSe
@Inject
IPAddressDao _ipAddressDao;
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
return true;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return _name;
}
public List<AutoScaleCounter> getSupportedAutoScaleCounters(long networkid)
{
String capability = _lbRulesMgr.getLBCapability(networkid, Capability.AutoScaleCounters.getName());

19
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
View File

@ -79,6 +79,7 @@ import com.cloud.user.UserContext;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.JoinBuilder;
@ -93,9 +94,8 @@ import com.cloud.vm.dao.UserVmDao;
@Component
@Local(value = { FirewallService.class, FirewallManager.class})
public class FirewallManagerImpl implements FirewallService, FirewallManager, NetworkRuleApplier, Manager {
public class FirewallManagerImpl extends ManagerBase implements FirewallService, FirewallManager, NetworkRuleApplier {
private static final Logger s_logger = Logger.getLogger(FirewallManagerImpl.class);
String _name;
@Inject
FirewallRulesDao _firewallDao;
@ -137,21 +137,6 @@ public class FirewallManagerImpl implements FirewallService, FirewallManager, Ne
private boolean _elbEnabled = false;
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;

26
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
View File

@ -132,6 +132,7 @@ import com.cloud.uservm.UserVm;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.JoinBuilder;
@ -150,11 +151,9 @@ import com.google.gson.reflect.TypeToken;
@Component
@Local(value = { LoadBalancingRulesManager.class, LoadBalancingRulesService.class })
public class LoadBalancingRulesManagerImpl<Type> implements LoadBalancingRulesManager, LoadBalancingRulesService, NetworkRuleApplier, Manager {
public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements LoadBalancingRulesManager, LoadBalancingRulesService, NetworkRuleApplier {
private static final Logger s_logger = Logger.getLogger(LoadBalancingRulesManagerImpl.class);
String _name;
@Inject
NetworkManager _networkMgr;
@Inject
@ -1324,27 +1323,6 @@ public class LoadBalancingRulesManagerImpl<Type> implements LoadBalancingRulesMa
return dstList;
}
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
return true;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
@ActionEvent(eventType = EventTypes.EVENT_LOAD_BALANCER_UPDATE, eventDescription = "updating load balancer", async = true)
public LoadBalancer updateLoadBalancerRule(UpdateLoadBalancerRuleCmd cmd) {

10
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -209,6 +209,7 @@ import com.cloud.utils.Pair;
import com.cloud.utils.PasswordGenerator;
import com.cloud.utils.StringUtils;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
@ -246,11 +247,10 @@ import com.cloud.vm.dao.VMInstanceDao;
*/
@Component
@Local(value = { VirtualNetworkApplianceManager.class, VirtualNetworkApplianceService.class })
public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplianceManager, VirtualNetworkApplianceService,
public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements VirtualNetworkApplianceManager, VirtualNetworkApplianceService,
VirtualMachineGuru<DomainRouterVO>, Listener {
private static final Logger s_logger = Logger.getLogger(VirtualNetworkApplianceManagerImpl.class);
String _name;
@Inject
DataCenterDao _dcDao = null;
@Inject
@ -595,7 +595,6 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
@Override
public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
_name = name;
_executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("RouterMonitor"));
_checkExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("RouterStatusMonitor"));
@ -683,11 +682,6 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
if (_routerStatsInterval > 0){

25
server/src/com/cloud/network/rules/RulesManagerImpl.java
View File

@ -67,6 +67,7 @@ import com.cloud.uservm.UserVm;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.JoinBuilder;
@ -85,9 +86,8 @@ import com.cloud.vm.dao.UserVmDao;
@Component
@Local(value = { RulesManager.class, RulesService.class })
public class RulesManagerImpl implements RulesManager, RulesService, Manager {
public class RulesManagerImpl extends ManagerBase implements RulesManager, RulesService {
private static final Logger s_logger = Logger.getLogger(RulesManagerImpl.class);
String _name;
@Inject
PortForwardingRulesDao _portForwardingDao;
@ -1067,27 +1067,6 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager {
return success && rules.size() == 0;
}
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
return true;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public List<? extends FirewallRule> listFirewallRulesByIp(long ipId) {
return null;

3
server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
View File

@ -89,6 +89,7 @@ import com.cloud.uservm.UserVm;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
@ -112,7 +113,7 @@ import com.cloud.vm.dao.VMInstanceDao;
import edu.emory.mathcs.backport.java.util.Collections;
@Local(value = { SecurityGroupManager.class, SecurityGroupService.class })
public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityGroupService, Manager, StateListener<State, VirtualMachine.Event, VirtualMachine> {
public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGroupManager, SecurityGroupService, StateListener<State, VirtualMachine.Event, VirtualMachine> {
public static final Logger s_logger = Logger.getLogger(SecurityGroupManagerImpl.class);
@Inject

27
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
View File

@ -56,6 +56,7 @@ import com.cloud.user.UserContext;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.JoinBuilder;
@ -69,8 +70,7 @@ import com.cloud.utils.net.NetUtils;
@Component
@Local(value = { NetworkACLService.class, NetworkACLManager.class})
public class NetworkACLManagerImpl implements Manager,NetworkACLManager{
String _name;
public class NetworkACLManagerImpl extends ManagerBase implements NetworkACLManager{
private static final Logger s_logger = Logger.getLogger(NetworkACLManagerImpl.class);
@Inject
@ -86,29 +86,6 @@ public class NetworkACLManagerImpl implements Manager,NetworkACLManager{
@Inject
ResourceTagDao _resourceTagDao;
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
return true;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean applyNetworkACLs(long networkId, Account caller) throws ResourceUnavailableException {
List<FirewallRuleVO> rules = _firewallDao.listByNetworkAndPurpose(networkId, Purpose.NetworkACL);

11
server/src/com/cloud/network/vpc/VpcManagerImpl.java
View File

@ -103,6 +103,7 @@ import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
@ -122,7 +123,7 @@ import com.cloud.vm.dao.DomainRouterDao;
@Component
@Local(value = { VpcManager.class, VpcService.class })
public class VpcManagerImpl implements VpcManager, Manager{
public class VpcManagerImpl extends ManagerBase implements VpcManager{
private static final Logger s_logger = Logger.getLogger(VpcManagerImpl.class);
@Inject
VpcOfferingDao _vpcOffDao;
@ -178,7 +179,6 @@ public class VpcManagerImpl implements VpcManager, Manager{
private VpcProvider vpcElement = null;
private final List<Service> nonSupportedServices = Arrays.asList(Service.SecurityGroup, Service.Firewall);
String _name;
int _cleanupInterval;
int _maxNetworks;
SearchBuilder<IPAddressVO> IpAddressSearch;
@ -186,8 +186,6 @@ public class VpcManagerImpl implements VpcManager, Manager{
@Override
@DB
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
//configure default vpc offering
Transaction txn = Transaction.currentTxn();
txn.start();
@ -245,11 +243,6 @@ public class VpcManagerImpl implements VpcManager, Manager{
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public List<? extends Network> getVpcNetworks(long vpcId) {
return _ntwkDao.listByVpc(vpcId);

21
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
View File

@ -72,6 +72,7 @@ import com.cloud.utils.Pair;
import com.cloud.utils.PasswordGenerator;
import com.cloud.utils.Ternary;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.JoinBuilder;
@ -83,9 +84,8 @@ import com.cloud.utils.net.NetUtils;
@Component
@Local(value = RemoteAccessVpnService.class)
public class RemoteAccessVpnManagerImpl implements RemoteAccessVpnService, Manager {
public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAccessVpnService {
private final static Logger s_logger = Logger.getLogger(RemoteAccessVpnManagerImpl.class);
String _name;
@Inject AccountDao _accountDao;
@Inject VpnUserDao _vpnUsersDao;
@ -582,8 +582,6 @@ public class RemoteAccessVpnManagerImpl implements RemoteAccessVpnService, Manag
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
Map<String, String> configs = _configDao.getConfiguration(params);
_userLimit = NumbersUtil.parseInt(configs.get(Config.RemoteAccessVpnUserLimit.key()), 8);
@ -604,21 +602,6 @@ public class RemoteAccessVpnManagerImpl implements RemoteAccessVpnService, Manag
return true;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public List<? extends RemoteAccessVpn> listRemoteAccessVpns(long networkId) {
return _remoteAccessVpnDao.listByNetworkId(networkId);

20
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
View File

@ -70,6 +70,7 @@ import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.JoinBuilder;
@ -81,7 +82,7 @@ import com.cloud.vm.DomainRouterVO;
@Component
@Local(value = { Site2SiteVpnManager.class, Site2SiteVpnService.class } )
public class Site2SiteVpnManagerImpl implements Site2SiteVpnManager, Manager {
public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpnManager {
private static final Logger s_logger = Logger.getLogger(Site2SiteVpnManagerImpl.class);
@Inject List<Site2SiteVpnServiceProvider> _s2sProviders;
@ -101,8 +102,6 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnManager, Manager {
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;
Map<String, String> configs = _configDao.getConfiguration(params);
_connLimit = NumbersUtil.parseInt(configs.get(Config.Site2SiteVpnConnectionPerVpnGatewayLimit.key()), 4);
_subnetsLimit = NumbersUtil.parseInt(configs.get(Config.Site2SiteVpnSubnetsPerCustomerGatewayLimit.key()), 10);
@ -110,21 +109,6 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnManager, Manager {
return true;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
@ActionEvent(eventType = EventTypes.EVENT_S2S_VPN_GATEWAY_CREATE, eventDescription = "creating s2s vpn gateway", create=true)
public Site2SiteVpnGateway createVpnGateway(CreateVpnGatewayCmd cmd) {

12
server/src/com/cloud/projects/ProjectManagerImpl.java
View File

@ -74,6 +74,7 @@ import com.cloud.user.dao.AccountDao;
import com.cloud.utils.DateUtil;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction;
@ -84,9 +85,8 @@ import com.sun.mail.smtp.SMTPTransport;
@Component
@Local(value = { ProjectService.class, ProjectManager.class })
public class ProjectManagerImpl implements ProjectManager, Manager{
public class ProjectManagerImpl extends ManagerBase implements ProjectManager {
public static final Logger s_logger = Logger.getLogger(ProjectManagerImpl.class);
private String _name;
private EmailInvite _emailInvite;
@Inject
@ -127,8 +127,7 @@ public class ProjectManagerImpl implements ProjectManager, Manager{
@Override
public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
_name = name;
Map<String, String> configs = _configDao.getConfiguration(params);
_invitationRequired = Boolean.valueOf(configs.get(Config.ProjectInviteRequired.key()));
@ -169,11 +168,6 @@ public class ProjectManagerImpl implements ProjectManager, Manager{
return true;
}
@Override
public String getName() {
return _name;
}
@Override
@ActionEvent(eventType = EventTypes.EVENT_PROJECT_CREATE, eventDescription = "creating project", create=true)
@DB

25
server/src/com/cloud/resource/DummyHostDiscoverer.java
View File

@ -30,14 +30,13 @@ import org.springframework.stereotype.Component;
import com.cloud.host.HostVO;
import com.cloud.hypervisor.Hypervisor;
import com.cloud.utils.component.AdapterBase;
@Component
@Local(value=Discoverer.class)
public class DummyHostDiscoverer implements Discoverer {
public class DummyHostDiscoverer extends AdapterBase implements Discoverer {
private static final Logger s_logger = Logger.getLogger(DummyHostDiscoverer.class);
private String _name;
@Override
public Map<ServerResource, Map<String, String>> find(long dcId, Long podId, Long clusterId, URI url, String username, String password, List<String> hostTags) {
if (!url.getScheme().equals("dummy")) {
@ -70,26 +69,6 @@ public class DummyHostDiscoverer implements Discoverer {
return resources;
}
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
@Override
public boolean matchHypervisor(String hypervisor) {
return false;

30
server/src/com/cloud/resource/DummyHostServerResource.java
View File

@ -164,4 +164,34 @@ public class DummyHostServerResource extends ServerResourceBase {
String.valueOf((id >> 8) & 0xff) + "." +
String.valueOf((id) & 0xff);
}
@Override
public void setName(String name) {
// TODO Auto-generated method stub
}
@Override
public void setConfigParams(Map<String, Object> params) {
// TODO Auto-generated method stub
}
@Override
public Map<String, Object> getConfigParams() {
// TODO Auto-generated method stub
return null;
}
@Override
public int getRunLevel() {
// TODO Auto-generated method stub
return 0;
}
@Override
public void setRunLevel(int level) {
// TODO Auto-generated method stub
}
}

Some files were not shown because too many files have changed in this diff Show More