apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the problems with simulator. Turned off the skip tests

Browse Source
This commit is contained in:
Alex Huang 2013-01-21 10:37:53 -08:00
parent f27692aa7a
commit f7e75d3aaf
3 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
plugins/hypervisors/simulator/src/com/cloud/configuration/SimulatorComponentLibrary.java
View File

@ -16,35 +16,25 @@
// under the License. // under the License.
package com.cloud.configuration; 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 { //TODO: Remove this class after the managers are figured out.
@Override public class SimulatorComponentLibrary {
protected void populateManagers() { // @Override
addManager("VM Manager", MockVmManagerImpl.class); // protected void populateManagers() {
addManager("agent manager", MockAgentManagerImpl.class); // addManager("VM Manager", MockVmManagerImpl.class);
addManager("storage manager", MockStorageManagerImpl.class); // addManager("agent manager", MockAgentManagerImpl.class);
addManager("SimulatorManager", SimulatorManagerImpl.class); // addManager("storage manager", MockStorageManagerImpl.class);
} // addManager("SimulatorManager", SimulatorManagerImpl.class);
// }
@Override //
protected void populateDaos() { // @Override
addDao("mock Host", MockHostDaoImpl.class); // protected void populateDaos() {
addDao("mock secondary storage", MockSecStorageDaoImpl.class); // addDao("mock Host", MockHostDaoImpl.class);
addDao("mock storage pool", MockStoragePoolDaoImpl.class); // addDao("mock secondary storage", MockSecStorageDaoImpl.class);
addDao("mock vm", MockVMDaoImpl.class); // addDao("mock storage pool", MockStoragePoolDaoImpl.class);
addDao("mock volume", MockVolumeDaoImpl.class); // addDao("mock vm", MockVMDaoImpl.class);
addDao("mock config", MockConfigurationDaoImpl.class); // addDao("mock volume", MockVolumeDaoImpl.class);
addDao("mock security rules", MockSecurityRulesDaoImpl.class); // addDao("mock config", MockConfigurationDaoImpl.class);
} // addDao("mock security rules", MockSecurityRulesDaoImpl.class);
// }
} }

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

@ -41,9 +41,11 @@ import com.cloud.agent.manager.MockStorageManager;
import com.cloud.agent.manager.MockVmManager; import com.cloud.agent.manager.MockVmManager;
import com.cloud.agent.manager.SimulatorManager; import com.cloud.agent.manager.SimulatorManager;
import com.cloud.agent.manager.SimulatorManager.AgentType; import com.cloud.agent.manager.SimulatorManager.AgentType;
import com.cloud.agent.manager.SimulatorManagerImpl;
import com.cloud.host.Host; import com.cloud.host.Host;
import com.cloud.host.Host.Type; import com.cloud.host.Host.Type;
import com.cloud.simulator.MockHost; import com.cloud.simulator.MockHost;
import com.cloud.utils.component.ComponentContext;
public class AgentResourceBase implements ServerResource { public class AgentResourceBase implements ServerResource {
@ -117,8 +119,8 @@ public class AgentResourceBase implements ServerResource {
public boolean configure(String name, Map<String, Object> params) public boolean configure(String name, Map<String, Object> params)
throws ConfigurationException { throws ConfigurationException {
hostGuid = (String)params.get("guid"); hostGuid = (String)params.get("guid");
_locator = ComponentLocator.getLocator("management-server");
_simMgr = _locator.getManager(SimulatorManager.class); _simMgr = ComponentContext.inject(SimulatorManagerImpl.class);
agentHost = getAgentMgr().getHost(hostGuid); agentHost = getAgentMgr().getHost(hostGuid);
return true; return true;

2
pom.xml
View File

@ -43,7 +43,7 @@
</issueManagement> </issueManagement>
<properties> <properties>
<skipTests>true</skipTests> <!--skipTests>true</skipTests-->
<cs.jdk.version>1.6</cs.jdk.version> <cs.jdk.version>1.6</cs.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>