cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaya...@apache.org
Subject [5/6] git commit: updated refs/heads/master-6-17-stable to 4f75062
Date Mon, 24 Jun 2013 09:22:19 GMT
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/4f750626
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f750626
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f750626

Branch: refs/heads/master-6-17-stable
Commit: 4f75062648da8e56bd53aaddefd2798eca7293f3
Parents: 95ee285
Author: Jayapal <jayapal@apache.org>
Authored: Mon Jun 24 12:56:27 2013 +0530
Committer: Jayapal <jayapal@apache.org>
Committed: Mon Jun 24 14:30:23 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/4f750626/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");
             }
 


Mime
View raw message