You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2014/07/26 00:22:12 UTC
[1/2] git commit: updated refs/heads/master to f4757a1
Repository: cloudstack
Updated Branches:
refs/heads/master 2ff7b846f -> f4757a198
Revert "CLOUDSTACK-7124: Fix unit test"
This reverts commit ef28fd36727bfffbbcb7f2fc120139b7c7d39eb2.
Fix of CLOUDSTACK-7124 caused CLOUDSTACK-7163.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/717e6972
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/717e6972
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/717e6972
Branch: refs/heads/master
Commit: 717e6972465d8da6bed92013f87bda3e3cd79831
Parents: 2ff7b84
Author: Sheng Yang <sh...@citrix.com>
Authored: Fri Jul 25 14:08:20 2014 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Fri Jul 25 14:08:20 2014 -0700
----------------------------------------------------------------------
.../VirtualRoutingResourceTest.java | 40 ++++++++++----------
1 file changed, 21 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/717e6972/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
----------------------------------------------------------------------
diff --git a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
index 3ddb269..fc1e3f5 100644
--- a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
+++ b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
@@ -19,6 +19,25 @@
package com.cloud.agent.resource.virtualnetwork;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
+
+import javax.naming.ConfigurationException;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.BumpUpPriorityCommand;
import com.cloud.agent.api.SetupGuestNetworkCommand;
@@ -61,23 +80,6 @@ import com.cloud.network.vpc.NetworkACLItem.TrafficType;
import com.cloud.network.vpc.VpcGateway;
import com.cloud.utils.ExecutionResult;
import com.cloud.utils.net.NetUtils;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
-
-import javax.naming.ConfigurationException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.UUID;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(loader = AnnotationConfigContextLoader.class)
@@ -573,10 +575,10 @@ public class VirtualRoutingResourceTest implements VirtualRouterDeployer {
assertEquals(script, VRScripts.S2SVPN_IPSEC);
switch (_count) {
case 1:
- assertEquals(args, "-A -l 64.10.1.10 -n 192.168.1.1/16 -g 64.10.1.1 -r 124.10.1.10 -N 192.168.100.1/24 -e \"3des-sha1,aes128-md5\" -i \"3des-sha1,aes128-sha1\\;modp1536\" -t 1800 -T 1800 -s \"psk\" -d 1");
+ assertEquals(args, "-A -l 64.10.1.10 -n 192.168.1.1/16 -g 64.10.1.1 -r 124.10.1.10 -N 192.168.100.1/24 -e \"3des-sha1,aes128-md5\" -i \"3des-sha1,aes128-sha1;modp1536\" -t 1800 -T 1800 -s \"psk\" -d 1");
break;
case 2:
- assertEquals(args, "-A -l 64.10.1.10 -n 192.168.1.1/16 -g 64.10.1.1 -r 124.10.1.10 -N 192.168.100.1/24 -e \"3des-sha1,aes128-md5\" -i \"3des-sha1,aes128-sha1\\;modp1536\" -t 1800 -T 1800 -s \"psk\" -d 0 -p ");
+ assertEquals(args, "-A -l 64.10.1.10 -n 192.168.1.1/16 -g 64.10.1.1 -r 124.10.1.10 -N 192.168.100.1/24 -e \"3des-sha1,aes128-md5\" -i \"3des-sha1,aes128-sha1;modp1536\" -t 1800 -T 1800 -s \"psk\" -d 0 -p ");
break;
case 3:
assertEquals(args, "-D -r 124.10.1.10 -n 192.168.1.1/16 -N 192.168.100.1/24");
[2/2] git commit: updated refs/heads/master to f4757a1
Posted by ya...@apache.org.
Revert "CLOUDSTACK-7124: Fix semicolon caused VPN programming issue"
This reverts commit 809b47e4eb2a99248ad122499e288610a5cd12ad.
Because the fix cause CLOUDSTACK-7163. Would fix it in another way.
Conflicts:
core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f4757a19
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f4757a19
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f4757a19
Branch: refs/heads/master
Commit: f4757a198a95e71dc3b5f8d42ac2c88e0b74d590
Parents: 717e697
Author: Sheng Yang <sh...@citrix.com>
Authored: Fri Jul 25 14:10:09 2014 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Fri Jul 25 14:10:35 2014 -0700
----------------------------------------------------------------------
.../com/cloud/agent/resource/virtualnetwork/ConfigHelper.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4757a19/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java b/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
index a065a02..92d8329 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
@@ -456,11 +456,10 @@ public class ConfigHelper {
args += cmd.getPeerGatewayIp();
args += " -N ";
args += cmd.getPeerGuestCidrList();
- // escape semicolon which may cause issue in bash
args += " -e ";
- args += "\"" + cmd.getEspPolicy().replaceAll(";", "\\\\;") + "\"";
+ args += "\"" + cmd.getEspPolicy() + "\"";
args += " -i ";
- args += "\"" + cmd.getIkePolicy().replaceAll(";", "\\\\;") + "\"";
+ args += "\"" + cmd.getIkePolicy() + "\"";
args += " -t ";
args += Long.toString(cmd.getIkeLifetime());
args += " -T ";