You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2013/06/20 12:42:21 UTC
git commit: updated refs/heads/master to 2e0abcc
Updated Branches:
refs/heads/master 03d1346dc -> 2e0abccd3
CLOUDSTACK-2952 Fixed configuring private gateway with another vpc acl id
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2e0abccd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2e0abccd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2e0abccd
Branch: refs/heads/master
Commit: 2e0abccd3b0ee607d49d5ae9b063c6f4ecbb2430
Parents: 03d1346
Author: Jayapal <ja...@apache.org>
Authored: Thu Jun 20 16:11:20 2013 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Thu Jun 20 16:11:20 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/vpc/VpcManagerImpl.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e0abccd/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index b41003a..fb9e9b7 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;
}