Updated Branches: refs/heads/javelin f27692aa7 -> f7e75d3aa
Fixed the problems with simulator. Turned off the skip tests Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f7e75d3a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f7e75d3a Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f7e75d3a Branch: refs/heads/javelin Commit: f7e75d3aaf2c9f5c746f160fc5db2356066d3305 Parents: f27692a Author: Alex Huang <[email protected]> Authored: Mon Jan 21 10:37:53 2013 -0800 Committer: Alex Huang <[email protected]> Committed: Mon Jan 21 10:37:53 2013 -0800 ---------------------------------------------------------------------- .../configuration/SimulatorComponentLibrary.java | 50 ++++++--------- .../src/com/cloud/resource/AgentResourceBase.java | 6 +- pom.xml | 2 +- 3 files changed, 25 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f7e75d3a/plugins/hypervisors/simulator/src/com/cloud/configuration/SimulatorComponentLibrary.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/simulator/src/com/cloud/configuration/SimulatorComponentLibrary.java b/plugins/hypervisors/simulator/src/com/cloud/configuration/SimulatorComponentLibrary.java index 9fd5258..373cae1 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/configuration/SimulatorComponentLibrary.java +++ b/plugins/hypervisors/simulator/src/com/cloud/configuration/SimulatorComponentLibrary.java @@ -16,35 +16,25 @@ // under the License. package com.cloud.configuration; -import com.cloud.agent.manager.MockAgentManagerImpl; -import com.cloud.agent.manager.MockStorageManagerImpl; -import com.cloud.agent.manager.MockVmManagerImpl; -import com.cloud.agent.manager.SimulatorManagerImpl; -import com.cloud.simulator.dao.MockConfigurationDaoImpl; -import com.cloud.simulator.dao.MockHostDaoImpl; -import com.cloud.simulator.dao.MockSecStorageDaoImpl; -import com.cloud.simulator.dao.MockSecurityRulesDaoImpl; -import com.cloud.simulator.dao.MockStoragePoolDaoImpl; -import com.cloud.simulator.dao.MockVMDaoImpl; -import com.cloud.simulator.dao.MockVolumeDaoImpl; -public class SimulatorComponentLibrary extends PremiumComponentLibrary { - @Override - protected void populateManagers() { - addManager("VM Manager", MockVmManagerImpl.class); - addManager("agent manager", MockAgentManagerImpl.class); - addManager("storage manager", MockStorageManagerImpl.class); - addManager("SimulatorManager", SimulatorManagerImpl.class); - } - - @Override - protected void populateDaos() { - addDao("mock Host", MockHostDaoImpl.class); - addDao("mock secondary storage", MockSecStorageDaoImpl.class); - addDao("mock storage pool", MockStoragePoolDaoImpl.class); - addDao("mock vm", MockVMDaoImpl.class); - addDao("mock volume", MockVolumeDaoImpl.class); - addDao("mock config", MockConfigurationDaoImpl.class); - addDao("mock security rules", MockSecurityRulesDaoImpl.class); - } +//TODO: Remove this class after the managers are figured out. +public class SimulatorComponentLibrary { +// @Override +// protected void populateManagers() { +// addManager("VM Manager", MockVmManagerImpl.class); +// addManager("agent manager", MockAgentManagerImpl.class); +// addManager("storage manager", MockStorageManagerImpl.class); +// addManager("SimulatorManager", SimulatorManagerImpl.class); +// } +// +// @Override +// protected void populateDaos() { +// addDao("mock Host", MockHostDaoImpl.class); +// addDao("mock secondary storage", MockSecStorageDaoImpl.class); +// addDao("mock storage pool", MockStoragePoolDaoImpl.class); +// addDao("mock vm", MockVMDaoImpl.class); +// addDao("mock volume", MockVolumeDaoImpl.class); +// addDao("mock config", MockConfigurationDaoImpl.class); +// addDao("mock security rules", MockSecurityRulesDaoImpl.class); +// } } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f7e75d3a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java index de3bfd9..82989fd 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java +++ b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java @@ -41,9 +41,11 @@ import com.cloud.agent.manager.MockStorageManager; import com.cloud.agent.manager.MockVmManager; import com.cloud.agent.manager.SimulatorManager; import com.cloud.agent.manager.SimulatorManager.AgentType; +import com.cloud.agent.manager.SimulatorManagerImpl; import com.cloud.host.Host; import com.cloud.host.Host.Type; import com.cloud.simulator.MockHost; +import com.cloud.utils.component.ComponentContext; public class AgentResourceBase implements ServerResource { @@ -117,8 +119,8 @@ public class AgentResourceBase implements ServerResource { public boolean configure(String name, Map<String, Object> params) throws ConfigurationException { hostGuid = (String)params.get("guid"); - _locator = ComponentLocator.getLocator("management-server"); - _simMgr = _locator.getManager(SimulatorManager.class); + + _simMgr = ComponentContext.inject(SimulatorManagerImpl.class); agentHost = getAgentMgr().getHost(hostGuid); return true; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f7e75d3a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0227d72..e3ebc96 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ </issueManagement> <properties> - <skipTests>true</skipTests> + <!--skipTests>true</skipTests--> <cs.jdk.version>1.6</cs.jdk.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
