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

CLOUDSTACK-6047: Make sure every commands to VR resource is NetworkElementCommand

Browse Source
This commit is contained in:
Sheng Yang 2014-02-19 19:12:06 -08:00
parent c171e2c3e4
commit 5332f67ae8
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
View File

@ -22,7 +22,6 @@ import com.cloud.agent.api.CheckRouterAnswer;
import com.cloud.agent.api.CheckRouterCommand; import com.cloud.agent.api.CheckRouterCommand;
import com.cloud.agent.api.CheckS2SVpnConnectionsAnswer; import com.cloud.agent.api.CheckS2SVpnConnectionsAnswer;
import com.cloud.agent.api.CheckS2SVpnConnectionsCommand; import com.cloud.agent.api.CheckS2SVpnConnectionsCommand;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.GetDomRVersionAnswer; import com.cloud.agent.api.GetDomRVersionAnswer;
import com.cloud.agent.api.GetDomRVersionCmd; import com.cloud.agent.api.GetDomRVersionCmd;
import com.cloud.agent.api.SetupGuestNetworkCommand; import com.cloud.agent.api.SetupGuestNetworkCommand;
@ -130,9 +129,9 @@ public class VirtualRoutingResource {
this._vrDeployer = deployer; this._vrDeployer = deployer;
} }
public Answer executeRequest(final Command cmd) { public Answer executeRequest(final NetworkElementCommand cmd) {
try { try {
ExecutionResult rc = _vrDeployer.prepareCommand((NetworkElementCommand)cmd); ExecutionResult rc = _vrDeployer.prepareCommand(cmd);
if (!rc.isSuccess()) { if (!rc.isSuccess()) {
s_logger.error("Failed to prepare VR command due to " + rc.getDetails()); s_logger.error("Failed to prepare VR command due to " + rc.getDetails());
return new Answer(cmd, false, rc.getDetails()); return new Answer(cmd, false, rc.getDetails());
@ -194,7 +193,7 @@ public class VirtualRoutingResource {
} catch (final IllegalArgumentException e) { } catch (final IllegalArgumentException e) {
return new Answer(cmd, false, e.getMessage()); return new Answer(cmd, false, e.getMessage());
} finally { } finally {
ExecutionResult rc = _vrDeployer.cleanupCommand((NetworkElementCommand)cmd); ExecutionResult rc = _vrDeployer.cleanupCommand(cmd);
if (!rc.isSuccess()) { if (!rc.isSuccess()) {
s_logger.error("Failed to cleanup VR command due to " + rc.getDetails()); s_logger.error("Failed to cleanup VR command due to " + rc.getDetails());
} }

2
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View File

@ -1313,7 +1313,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
} else if (cmd instanceof UnPlugNicCommand) { } else if (cmd instanceof UnPlugNicCommand) {
return execute((UnPlugNicCommand)cmd); return execute((UnPlugNicCommand)cmd);
} else if (cmd instanceof NetworkElementCommand) { } else if (cmd instanceof NetworkElementCommand) {
return _virtRouterResource.executeRequest(cmd); return _virtRouterResource.executeRequest((NetworkElementCommand)cmd);
} else if (cmd instanceof CheckSshCommand) { } else if (cmd instanceof CheckSshCommand) {
return execute((CheckSshCommand)cmd); return execute((CheckSshCommand)cmd);
} else if (cmd instanceof NetworkUsageCommand) { } else if (cmd instanceof NetworkUsageCommand) {

2
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View File

@ -395,7 +395,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
if (clz == CreateCommand.class) { if (clz == CreateCommand.class) {
answer = execute((CreateCommand)cmd); answer = execute((CreateCommand)cmd);
} else if (cmd instanceof NetworkElementCommand) { } else if (cmd instanceof NetworkElementCommand) {
return _vrResource.executeRequest(cmd); return _vrResource.executeRequest((NetworkElementCommand)cmd);
} else if (clz == ReadyCommand.class) { } else if (clz == ReadyCommand.class) {
answer = execute((ReadyCommand)cmd); answer = execute((ReadyCommand)cmd);
} else if (clz == GetHostStatsCommand.class) { } else if (clz == GetHostStatsCommand.class) {

2
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -412,7 +412,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
if (clazz == CreateCommand.class) { if (clazz == CreateCommand.class) {
return execute((CreateCommand)cmd); return execute((CreateCommand)cmd);
} else if (cmd instanceof NetworkElementCommand) { } else if (cmd instanceof NetworkElementCommand) {
return _vrResource.executeRequest(cmd); return _vrResource.executeRequest((NetworkElementCommand)cmd);
} else if (clazz == CheckConsoleProxyLoadCommand.class) { } else if (clazz == CheckConsoleProxyLoadCommand.class) {
return execute((CheckConsoleProxyLoadCommand)cmd); return execute((CheckConsoleProxyLoadCommand)cmd);
} else if (clazz == WatchConsoleProxyLoadCommand.class) { } else if (clazz == WatchConsoleProxyLoadCommand.class) {