Updated Branches: refs/heads/master-6-17-stable 4f7506264 -> 1aed9602c
CLOUDSTACK-3149: Allow default ACLs when creating tier with ACL Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1aed9602 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1aed9602 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1aed9602 Branch: refs/heads/master-6-17-stable Commit: 1aed9602c380a46592a44047299ca7b496b590a6 Parents: 4f75062 Author: Kishan Kavala <kis...@cloud.com> Authored: Mon Jun 24 16:16:14 2013 +0530 Committer: Kishan Kavala <kis...@cloud.com> Committed: Mon Jun 24 16:16:14 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1aed9602/server/src/com/cloud/network/NetworkServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 25cd887..f88f600 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -1298,8 +1298,12 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { throw new InvalidParameterValueException("Unable to find specified NetworkACL"); } - if(!vpcId.equals(acl.getVpcId())){ - throw new InvalidParameterValueException("ACL: "+aclId+" do not belong to the VPC"); + if(aclId != NetworkACL.DEFAULT_DENY && aclId != NetworkACL.DEFAULT_ALLOW) { + //ACL is not default DENY/ALLOW + // ACL should be associated with a VPC + if(!vpcId.equals(acl.getVpcId())){ + throw new InvalidParameterValueException("ACL: "+aclId+" do not belong to the VPC"); + } } } network = _vpcMgr.createVpcGuestNetwork(networkOfferingId, name, displayText, gateway, cidr, vlanId,
