From 27ee78fe0a2dd9097060cdac7f6eb63b6f5e8ce8 Mon Sep 17 00:00:00 2001 From: Jayapal Date: Wed, 11 Dec 2013 11:02:06 +0530 Subject: [PATCH] CLOUDSTACK-5244 Fixed issue with applying acl items of acl to private gateway --- server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java | 5 ++++- server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java index c67bc5f1672..a0decf3e58a 100644 --- a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java +++ b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java @@ -81,6 +81,8 @@ public class NetworkACLManagerImpl extends ManagerBase implements NetworkACLMana ConfigurationManager _configMgr; @Inject EntityManager _entityMgr; + @Inject + VpcService _vpcSvc; @Override public NetworkACL createNetworkACL(String name, String description, long vpcId) { @@ -105,7 +107,8 @@ public class NetworkACLManagerImpl extends ManagerBase implements NetworkACLMana List vpcGateways = _vpcGatewayDao.listByAclIdAndType(aclId, VpcGateway.Type.Private); for (VpcGatewayVO vpcGateway : vpcGateways) { - PrivateGateway privateGateway = _entityMgr.findById(PrivateGateway.class, vpcGateway.getId()); + PrivateGateway privateGateway = _vpcSvc.getVpcPrivateGateway(vpcGateway.getId()); + if (!applyACLToPrivateGw(privateGateway)) { aclApplyStatus = false; s_logger.debug("failed to apply network acl item on private gateway " + privateGateway.getId() + "acl id " + aclId); diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java index 90a6394d98c..1c560c42177 100644 --- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java +++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java @@ -91,6 +91,8 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ EntityManager _entityMgr; @Inject VpcDao _vpcDao; + @Inject + VpcService _vpcSvc; @Override public NetworkACL createNetworkACL(String name, String description, long vpcId) { @@ -239,7 +241,7 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ } } - PrivateGateway privateGateway = _entityMgr.findById(PrivateGateway.class, privateGatewayId); + PrivateGateway privateGateway = _vpcSvc.getVpcPrivateGateway(gateway.getId()); _accountMgr.checkAccess(caller, null, true, privateGateway); return _networkAclMgr.replaceNetworkACLForPrivateGw(acl, privateGateway);