From 2e0abccd3b0ee607d49d5ae9b063c6f4ecbb2430 Mon Sep 17 00:00:00 2001 From: Jayapal Date: Thu, 20 Jun 2013 16:11:20 +0530 Subject: [PATCH] CLOUDSTACK-2952 Fixed configuring private gateway with another vpc acl id --- server/src/com/cloud/network/vpc/VpcManagerImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index b41003a6105..fb9e9b737b8 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -1385,9 +1385,14 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis long networkAclId = NetworkACL.DEFAULT_DENY; if (aclId != null) { - if ( _networkAclDao.findById(aclId) == null) { + NetworkACLVO aclVO = _networkAclDao.findById(aclId); + if ( aclVO == null) { throw new InvalidParameterValueException("Invalid network acl id passed "); } + if (aclVO.getVpcId() != vpcId ) { + throw new InvalidParameterValueException("Private gateway and network acl are not in the same vpc"); + } + networkAclId = aclId; }