From 4f75062648da8e56bd53aaddefd2798eca7293f3 Mon Sep 17 00:00:00 2001
From: Jayapal <jayapal@apache.org>
Date: Mon, 24 Jun 2013 12:56:27 +0530
Subject: [PATCH] CLOUDSTACK-3148 failed to create private gw with default acl
 id

---
 server/src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index fb9e9b737b8..93413b4af8e 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");
             }