incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject git commit: S2S VPN: Fix CheckS2SVpnConnectionsCommand on VMware
Date Fri, 24 Aug 2012 01:37:53 GMT
Updated Branches:
  refs/heads/master a08ae8e42 -> 1289b947f


S2S VPN: Fix CheckS2SVpnConnectionsCommand on VMware


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1289b947
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1289b947
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1289b947

Branch: refs/heads/master
Commit: 1289b947f9b9507da37b9c733512bc4d23f19616
Parents: a08ae8e
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Thu Aug 23 18:30:31 2012 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Thu Aug 23 18:30:31 2012 -0700

----------------------------------------------------------------------
 .../hypervisor/vmware/resource/VmwareResource.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1289b947/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 838a132..93ce648 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
@@ -1602,8 +1602,12 @@ public class VmwareResource implements StoragePoolResource, ServerResource,
Vmwa
         try {
             VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
             String controlIp = getRouterSshControlIp(cmd);
-            result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(),
null,
-                    "/opt/cloud/bin/checkbatchs2svpn.sh ");
+            String cmdline = "/opt/cloud/bin/checkbatchs2svpn.sh ";
+            for (String ip : cmd.getVpnIps()) {
+                cmdline += " " + ip;
+            }
+
+            result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(),
null, cmdline);
 
             if (!result.first()) {
                 s_logger.error("check site-to-site vpn connections command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP)
+ " failed, message: " + result.second());


Mime
View raw message