CLOUDSTACK-2465: fixed network creation in VPC - removed extra call to createGuestNetwork introduced by the NetworkACL feature merge
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dfdc0896 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dfdc0896 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dfdc0896 Branch: refs/heads/vmware-storage-motion Commit: dfdc089668f95544c7e88e878f93838aec8400b0 Parents: 70e78db Author: Alena Prokharchyk <[email protected]> Authored: Mon May 13 15:28:08 2013 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Mon May 13 15:28:08 2013 -0700 ---------------------------------------------------------------------- .../src/com/cloud/network/NetworkServiceImpl.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dfdc0896/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 4a57321..eeea0f2 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;
