From 2641b5d6b83111a54f6ec2d28218267808b34125 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Tue, 7 Aug 2012 18:34:06 -0700
Subject: [PATCH] S2S VPN: Fix multiply remote side guest networks

---
 .../network/router/VpcVirtualNetworkApplianceManagerImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 23faa58a46a..761b1385507 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();
+        String peerGuestCidrList = gw.getGuestCidrList().replace(";", ",");
         String ipsecPsk = gw.getIpsecPsk();
         String ikePolicy = gw.getIkePolicy();
         String espPolicy = gw.getEspPolicy();