From dfdc089668f95544c7e88e878f93838aec8400b0 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Mon, 13 May 2013 15:28:08 -0700 Subject: [PATCH] CLOUDSTACK-2465: fixed network creation in VPC - removed extra call to createGuestNetwork introduced by the NetworkACL feature merge --- server/src/com/cloud/network/NetworkServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 4a57321664b..eeea0f2b015 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -1236,8 +1236,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (!_configMgr.isOfferingForVpc(ntwkOff)){ throw new InvalidParameterValueException("Network offering can't be used for VPC networks"); } - network = _vpcMgr.createVpcGuestNetwork(networkOfferingId, name, displayText, gateway, cidr, vlanId, - networkDomain, owner, sharedDomainId, pNtwk, zoneId, aclType, subdomainAccess, vpcId, aclId, caller, displayNetwork); + if(aclId == null){ //Use default deny all ACL, when aclId is not specified aclId = NetworkACL.DEFAULT_DENY;