Skip to content

Apply reordered ACL list to VR router #12525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shwstppr merged 1 commit into from
Jan 28, 2026
Merged

Apply reordered ACL list to VR router #12525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion server/src/main/java/com/cloud/network/element/VpcVirtualRouterElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,15 @@ public boolean applyNetworkACLs(final Network network, final List<? extends Netw

@Override
public boolean reorderAclRules(Vpc vpc, List<? extends Network> networks, List<? extends NetworkACLItem> networkACLItems) {
return true;
boolean result = true;
try {
for (Network network : networks) {
result = result && applyNetworkACLs(network, networkACLItems);
}
} catch (ResourceUnavailableException ex) {
result = false;
}
return result;
}

@Override
Expand Down
15 changes: 12 additions & 3 deletions server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
private NsxProviderDao nsxProviderDao;
@Inject
private NetrisProviderDao netrisProviderDao;
@Inject
private VpcManager vpcManager;

private String supportedProtocolsForAclRules = "tcp,udp,icmp,all";

Expand Down Expand Up @@ -1037,13 +1039,20 @@ public NetworkACLItem moveNetworkAclRuleToNewPosition(MoveNetworkAclItemCmd move
if (Objects.isNull(vpc)) {
return networkACLItem;
}
List<NetworkVO> networks = _networkDao.listByAclId(lockedAcl.getId());
if (networks.isEmpty()) {
return networkACLItem;
}

final DataCenter dc = _entityMgr.findById(DataCenter.class, vpc.getZoneId());
final NsxProviderVO nsxProvider = nsxProviderDao.findByZoneId(dc.getId());
final NetrisProviderVO netrisProvider = netrisProviderDao.findByZoneId(dc.getId());
List<NetworkVO> networks = _networkDao.listByAclId(lockedAcl.getId());
if (ObjectUtils.anyNotNull(nsxProvider, netrisProvider) && !networks.isEmpty()) {
boolean isVpcNetworkACLProvider = vpcManager.isProviderSupportServiceInVpc(vpc.getId(), Network.Service.NetworkACL, Network.Provider.VPCVirtualRouter);

if (ObjectUtils.anyNotNull(nsxProvider, netrisProvider) || isVpcNetworkACLProvider) {
allAclRules = getAllAclRulesSortedByNumber(lockedAcl.getId());
Network.Provider networkProvider = nsxProvider != null ? Network.Provider.Nsx : Network.Provider.Netris;
Network.Provider networkProvider = isVpcNetworkACLProvider ? Network.Provider.VPCVirtualRouter
: (nsxProvider != null ? Network.Provider.Nsx : Network.Provider.Netris);
_networkAclMgr.reorderAclRules(vpc, networks, allAclRules, networkProvider);
}
return networkACLItem;
Expand Down
Loading