You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/01/26 16:49:36 UTC
git commit: updated refs/heads/4.3-forward to 866a539
Updated Branches:
refs/heads/4.3-forward 23a3d99fc -> 866a539b0
findbugs: removed fields injected in parent
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/866a539b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/866a539b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/866a539b
Branch: refs/heads/4.3-forward
Commit: 866a539b067663b346bd8d087c578987a86fe834
Parents: 23a3d99
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Jan 26 16:49:18 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sun Jan 26 16:49:18 2014 +0100
----------------------------------------------------------------------
.../kvm/discoverer/LibvirtServerDiscoverer.java | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/866a539b/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
index d7b5ab8..abd75fc 100644
--- a/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
+++ b/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
@@ -28,8 +28,6 @@ import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-
import com.cloud.agent.AgentManager;
import com.cloud.agent.Listener;
import com.cloud.agent.api.AgentControlAnswer;
@@ -41,7 +39,6 @@ import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.StartupRoutingCommand;
import com.cloud.configuration.Config;
import com.cloud.dc.ClusterVO;
-import com.cloud.dc.dao.ClusterDao;
import com.cloud.exception.AgentUnavailableException;
import com.cloud.exception.DiscoveredWithErrorException;
import com.cloud.exception.DiscoveryException;
@@ -49,10 +46,8 @@ import com.cloud.exception.OperationTimedoutException;
import com.cloud.host.Host;
import com.cloud.host.HostVO;
import com.cloud.host.Status;
-import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.network.NetworkModel;
import com.cloud.network.PhysicalNetworkSetupInfo;
import com.cloud.resource.Discoverer;
import com.cloud.resource.DiscovererBase;
@@ -71,18 +66,11 @@ public abstract class LibvirtServerDiscoverer extends DiscovererBase implements
private String _kvmPublicNic;
private String _kvmGuestNic;
@Inject
- HostDao _hostDao = null;
- @Inject
- ClusterDao _clusterDao;
- @Inject
ResourceManager _resourceMgr;
@Inject
AgentManager _agentMgr;
- @Inject
- ConfigurationDao _configDao;
- @Inject
- NetworkModel _networkMgr;
+ @Override
public abstract Hypervisor.HypervisorType getHypervisorType();
@Override