Repository: cloudstack Updated Branches: refs/heads/master 228aa0715 -> af1eba270
CLOUDSTACK-6286: [Automation] VM deployment is failing in simulator Added AggregationContolCommand to simulator Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/af1eba27 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/af1eba27 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/af1eba27 Branch: refs/heads/master Commit: af1eba2708367196e5aecd8a3a1a5fbc6e66b2d9 Parents: 228aa07 Author: Koushik Das <[email protected]> Authored: Thu Apr 3 11:45:53 2014 +0530 Committer: Koushik Das <[email protected]> Committed: Thu Apr 3 11:45:53 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/af1eba27/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 cf1429a..23979c0 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java @@ -26,9 +26,9 @@ 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; - import org.apache.cloudstack.storage.command.DeleteCommand; import org.apache.cloudstack.storage.command.DownloadCommand; import org.apache.cloudstack.storage.command.DownloadProgressCommand; @@ -84,6 +84,7 @@ import com.cloud.agent.api.UnPlugNicCommand; import com.cloud.agent.api.check.CheckSshCommand; import com.cloud.agent.api.proxy.CheckConsoleProxyLoadCommand; import com.cloud.agent.api.proxy.WatchConsoleProxyLoadCommand; +import com.cloud.agent.api.routing.AggregationControlCommand; import com.cloud.agent.api.routing.DhcpEntryCommand; import com.cloud.agent.api.routing.IpAssocCommand; import com.cloud.agent.api.routing.IpAssocVpcCommand; @@ -369,7 +370,7 @@ public class SimulatorManagerImpl extends ManagerBase implements SimulatorManage return _mockNetworkMgr.setupPVLAN((PvlanSetupCommand)cmd); } else if (cmd instanceof StorageSubSystemCommand) { return this.storageHandler.handleStorageCommands((StorageSubSystemCommand)cmd); - } else if (cmd instanceof VpnUsersCfgCommand || cmd instanceof RemoteAccessVpnCfgCommand || cmd instanceof SetMonitorServiceCommand) { + } else if (cmd instanceof VpnUsersCfgCommand || cmd instanceof RemoteAccessVpnCfgCommand || cmd instanceof SetMonitorServiceCommand || cmd instanceof AggregationControlCommand) { return new Answer(cmd); } else { s_logger.error("Simulator does not implement command of type " + cmd.toString());
