You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/06/25 01:51:59 UTC
[23/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72
CLOUDSTACK-3148 failed to create private gw with default acl id
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bb50c0d2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bb50c0d2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bb50c0d2
Branch: refs/heads/vmsync
Commit: bb50c0d2d654e9a18c8bb04660ae407c54c6ac35
Parents: 0cd8f9e
Author: Jayapal <ja...@apache.org>
Authored: Mon Jun 24 12:56:27 2013 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Mon Jun 24 13:37:01 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb50c0d2/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 fb9e9b7..93413b4 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1389,7 +1389,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
if ( aclVO == null) {
throw new InvalidParameterValueException("Invalid network acl id passed ");
}
- if (aclVO.getVpcId() != vpcId ) {
+ if ((aclVO.getVpcId() != vpcId) && !(aclId == NetworkACL.DEFAULT_DENY || aclId == NetworkACL.DEFAULT_ALLOW)) {
throw new InvalidParameterValueException("Private gateway and network acl are not in the same vpc");
}