You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2014/03/20 11:42:33 UTC
git commit: updated refs/heads/4.4 to fc8cb75
Repository: cloudstack
Updated Branches:
refs/heads/4.4 f109e3879 -> fc8cb754f
simulator manager impl changes to handle SetMonitorServiceCommand This fixes some of the test cases in the integration test test_assign_vm.py when run against a simulator
Signed-off-by: Koushik Das <ko...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fc8cb754
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc8cb754
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc8cb754
Branch: refs/heads/4.4
Commit: fc8cb754f0c6645bac5f35d8ad3d16e5e17a2d50
Parents: f109e38
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Mon Mar 17 10:23:37 2014 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Thu Mar 20 16:11:33 2014 +0530
----------------------------------------------------------------------
.../src/com/cloud/agent/manager/SimulatorManagerImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc8cb754/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
index 6fe9b40..cf1429a 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
@@ -25,6 +25,7 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import com.cloud.agent.api.routing.SetMonitorServiceCommand;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -367,8 +368,8 @@ public class SimulatorManagerImpl extends ManagerBase implements SimulatorManage
} else if (cmd instanceof PvlanSetupCommand) {
return _mockNetworkMgr.setupPVLAN((PvlanSetupCommand)cmd);
} else if (cmd instanceof StorageSubSystemCommand) {
- return this.storageHandler.handleStorageCommands((StorageSubSystemCommand) cmd);
- } else if (cmd instanceof VpnUsersCfgCommand || cmd instanceof RemoteAccessVpnCfgCommand) {
+ return this.storageHandler.handleStorageCommands((StorageSubSystemCommand)cmd);
+ } else if (cmd instanceof VpnUsersCfgCommand || cmd instanceof RemoteAccessVpnCfgCommand || cmd instanceof SetMonitorServiceCommand) {
return new Answer(cmd);
} else {
s_logger.error("Simulator does not implement command of type " + cmd.toString());