S2S VPN: Use coma instead of semicolon for separating cidr list
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a4431b57 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a4431b57 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a4431b57 Branch: refs/heads/vpc Commit: a4431b57403da038f5e7738fc878244933a0e744 Parents: abbfd74 Author: Sheng Yang <[email protected]> Authored: Wed Aug 8 11:08:32 2012 -0700 Committer: Sheng Yang <[email protected]> Committed: Fri Aug 10 16:20:52 2012 -0700 ---------------------------------------------------------------------- .../VpcVirtualNetworkApplianceManagerImpl.java | 2 +- utils/src/com/cloud/utils/net/NetUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a4431b57/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index b1176a5..41bd45c 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java @@ -1092,7 +1092,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian String localGuestCidr = vpc.getCidr(); String localPublicGateway = _vlanDao.findById(ip.getVlanId()).getVlanGateway(); String peerGatewayIp = gw.getGatewayIp(); - String peerGuestCidrList = gw.getGuestCidrList().replace(";", ","); + String peerGuestCidrList = gw.getGuestCidrList(); String ipsecPsk = gw.getIpsecPsk(); String ikePolicy = gw.getIkePolicy(); String espPolicy = gw.getEspPolicy(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a4431b57/utils/src/com/cloud/utils/net/NetUtils.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java index 65168ff..e429022 100755 --- a/utils/src/com/cloud/utils/net/NetUtils.java +++ b/utils/src/com/cloud/utils/net/NetUtils.java @@ -1097,7 +1097,7 @@ public class NetUtils { } public static boolean validateGuestCidrList(String guestCidrList) { - for (String guestCidr : guestCidrList.split(";")) { + for (String guestCidr : guestCidrList.split(",")) { if (!validateGuestCidr(guestCidr)) { return false; }
