You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2014/02/20 20:17:45 UTC
[39/50] [abbrv] git commit: updated refs/heads/ui-restyle to c64bfa5
CLOUDSTACK-6047: Make sure every commands to VR resource is NetworkElementCommand
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5332f67a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5332f67a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5332f67a
Branch: refs/heads/ui-restyle
Commit: 5332f67ae87b87af352db92355ca328de6df29dd
Parents: c171e2c
Author: Sheng Yang <sh...@citrix.com>
Authored: Wed Feb 19 19:12:06 2014 -0800
Committer: Sheng Yang <sh...@citrix.com>
Committed: Wed Feb 19 19:46:49 2014 -0800
----------------------------------------------------------------------
.../agent/resource/virtualnetwork/VirtualRoutingResource.java | 7 +++----
.../hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +-
.../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 2 +-
.../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5332f67a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index 9ecbe7f..2ac6f4f 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -22,7 +22,6 @@ import com.cloud.agent.api.CheckRouterAnswer;
import com.cloud.agent.api.CheckRouterCommand;
import com.cloud.agent.api.CheckS2SVpnConnectionsAnswer;
import com.cloud.agent.api.CheckS2SVpnConnectionsCommand;
-import com.cloud.agent.api.Command;
import com.cloud.agent.api.GetDomRVersionAnswer;
import com.cloud.agent.api.GetDomRVersionCmd;
import com.cloud.agent.api.SetupGuestNetworkCommand;
@@ -130,9 +129,9 @@ public class VirtualRoutingResource {
this._vrDeployer = deployer;
}
- public Answer executeRequest(final Command cmd) {
+ public Answer executeRequest(final NetworkElementCommand cmd) {
try {
- ExecutionResult rc = _vrDeployer.prepareCommand((NetworkElementCommand)cmd);
+ ExecutionResult rc = _vrDeployer.prepareCommand(cmd);
if (!rc.isSuccess()) {
s_logger.error("Failed to prepare VR command due to " + rc.getDetails());
return new Answer(cmd, false, rc.getDetails());
@@ -194,7 +193,7 @@ public class VirtualRoutingResource {
} catch (final IllegalArgumentException e) {
return new Answer(cmd, false, e.getMessage());
} finally {
- ExecutionResult rc = _vrDeployer.cleanupCommand((NetworkElementCommand)cmd);
+ ExecutionResult rc = _vrDeployer.cleanupCommand(cmd);
if (!rc.isSuccess()) {
s_logger.error("Failed to cleanup VR command due to " + rc.getDetails());
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5332f67a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index d63b643..f624379 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1313,7 +1313,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
} else if (cmd instanceof UnPlugNicCommand) {
return execute((UnPlugNicCommand)cmd);
} else if (cmd instanceof NetworkElementCommand) {
- return _virtRouterResource.executeRequest(cmd);
+ return _virtRouterResource.executeRequest((NetworkElementCommand)cmd);
} else if (cmd instanceof CheckSshCommand) {
return execute((CheckSshCommand)cmd);
} else if (cmd instanceof NetworkUsageCommand) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5332f67a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index c74a278..60c5909 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -395,7 +395,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
if (clz == CreateCommand.class) {
answer = execute((CreateCommand)cmd);
} else if (cmd instanceof NetworkElementCommand) {
- return _vrResource.executeRequest(cmd);
+ return _vrResource.executeRequest((NetworkElementCommand)cmd);
} else if (clz == ReadyCommand.class) {
answer = execute((ReadyCommand)cmd);
} else if (clz == GetHostStatsCommand.class) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5332f67a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index e463072..48ae3ea 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -412,7 +412,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
if (clazz == CreateCommand.class) {
return execute((CreateCommand)cmd);
} else if (cmd instanceof NetworkElementCommand) {
- return _vrResource.executeRequest(cmd);
+ return _vrResource.executeRequest((NetworkElementCommand)cmd);
} else if (clazz == CheckConsoleProxyLoadCommand.class) {
return execute((CheckConsoleProxyLoadCommand)cmd);
} else if (clazz == WatchConsoleProxyLoadCommand.class) {