This is an automated email from the ASF dual-hosted git repository. pearl11594 pushed a commit to branch fr03-nsx-reorder-acl-rules in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit c839cd2645bbd6e1b05ce9db4fd18be857327e10 Author: Pearl Dsilva <[email protected]> AuthorDate: Tue Feb 6 12:40:17 2024 -0500 tweak reorder logic --- .../java/com/cloud/network/vpc/NetworkACLServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java index 0f7b99754c3..aa4e2cde563 100644 --- a/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java +++ b/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java @@ -993,14 +993,14 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ NetworkACLVO lockedAcl = _networkACLDao.acquireInLockTable(ruleBeingMoved.getAclId()); List<NetworkACLItemVO> allAclRules = getAllAclRulesSortedByNumber(lockedAcl.getId()); validateAclConsistency(moveNetworkAclItemCmd, lockedAcl, allAclRules); - + NetworkACLItem networkACLItem = null; if (previousRule == null) { - return moveRuleToTheTop(ruleBeingMoved, allAclRules); - } - if (nextRule == null) { - return moveRuleToTheBottom(ruleBeingMoved, allAclRules); + networkACLItem = moveRuleToTheTop(ruleBeingMoved, allAclRules); + } else if (nextRule == null) { + networkACLItem = moveRuleToTheBottom(ruleBeingMoved, allAclRules); + } else { + networkACLItem = moveRuleBetweenAclRules(ruleBeingMoved, allAclRules, previousRule, nextRule); } - NetworkACLItem networkACLItem = moveRuleBetweenAclRules(ruleBeingMoved, allAclRules, previousRule, nextRule); VpcVO vpc = _vpcDao.findById(lockedAcl.getVpcId()); if (Objects.isNull(vpc)) { return networkACLItem;
