This is an automated email from the ASF dual-hosted git repository. pearl11594 pushed a commit to branch nsx-reorder-acl in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 92468890114c74cd54f2d7a6fd5ac77eec9b8c27 Author: Pearl Dsilva <[email protected]> AuthorDate: Tue Feb 6 10:41:36 2024 -0500 clean up and attempt test fix --- .../cloud/network/vpc/NetworkACLServiceImpl.java | 8 +++--- .../network/vpc/NetworkACLServiceImplTest.java | 30 ++++++++++++---------- 2 files changed, 19 insertions(+), 19 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 3bd4d0e368a..b5b8507cf42 100644 --- a/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java +++ b/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java @@ -988,6 +988,9 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ } NetworkACLItem networkACLItem = moveRuleBetweenAclRules(ruleBeingMoved, allAclRules, previousRule, nextRule); VpcVO vpc = _vpcDao.findById(lockedAcl.getVpcId()); + if (Objects.isNull(vpc)) { + return networkACLItem; + } final DataCenter dc = _entityMgr.findById(DataCenter.class, vpc.getZoneId()); final NsxProviderVO nsxProvider = nsxProviderDao.findByZoneId(dc.getId()); List<NetworkVO> networks = _networkDao.listByAclId(lockedAcl.getId()); @@ -1059,11 +1062,6 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ return allAclRules; } - protected List<NetworkACLItem> getAclRulesSortedByNumber(long aclId) { - List<NetworkACLItemVO> allAclRules = getAllAclRulesSortedByNumber(aclId); - return new ArrayList<>(allAclRules); - } - /** * Moves an ACL to the space between to other rules. If there is already enough room to accommodate the ACL rule being moved, we simply get the 'number' field from the previous ACL rule and add one, and then define this new value as the 'number' value for the ACL rule being moved. * Otherwise, we will need to make room. This process is executed via {@link #updateAclRuleToNewPositionAndExecuteShiftIfNecessary(NetworkACLItem, int, List, int)}, which will create the space between ACL rules if necessary. This involves shifting ACL rules to accommodate the rule being moved. diff --git a/server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java b/server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java index afd2b61960e..e9fcf32431c 100644 --- a/server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java +++ b/server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java @@ -24,6 +24,7 @@ import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; +import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Collections; @@ -138,8 +139,6 @@ public class NetworkACLServiceImplTest { private VpcVO vpcVOMock; @Mock DataCenter dataCenterVO; - @Mock - NsxProviderVO nsxProviderVO; @Mock private Account accountMock; @@ -148,23 +147,25 @@ public class NetworkACLServiceImplTest { @Before public void setup() { - callContextMocked = Mockito.mockStatic(CallContext.class); - Mockito.when(CallContext.current()).thenReturn(callContextMock); - Mockito.doReturn(Mockito.mock(User.class)).when(callContextMock).getCallingUser(); - Mockito.doReturn(Mockito.mock(Account.class)).when(callContextMock).getCallingAccount(); + try (MockedStatic<CallContext> callContextMocked = Mockito.mockStatic(CallContext.class)) { + CallContext callContextMock = Mockito.mock(CallContext.class); + callContextMocked.when(CallContext::current).thenReturn(callContextMock); + Mockito.doReturn(Mockito.mock(User.class)).when(callContextMock).getCallingUser(); + Mockito.doReturn(Mockito.mock(Account.class)).when(callContextMock).getCallingAccount(); - Mockito.when(networkAclDaoMock.findById(networkAclListId)).thenReturn(networkACLVOMock); - Mockito.when(createNetworkAclCmdMock.getNetworkId()).thenReturn(1L); - Mockito.when(createNetworkAclCmdMock.getProtocol()).thenReturn("tcp"); + Mockito.when(networkAclDaoMock.findById(networkAclListId)).thenReturn(networkACLVOMock); + Mockito.when(createNetworkAclCmdMock.getNetworkId()).thenReturn(1L); + Mockito.when(createNetworkAclCmdMock.getProtocol()).thenReturn("tcp"); - Mockito.when(networkMock.getNetworkOfferingId()).thenReturn(networkOfferingMockId); - Mockito.when(networkMock.getVpcId()).thenReturn(networkMockVpcMockId); + Mockito.when(networkMock.getNetworkOfferingId()).thenReturn(networkOfferingMockId); + Mockito.when(networkMock.getVpcId()).thenReturn(networkMockVpcMockId); - Mockito.when(moveNetworkAclItemCmdMock.getUuidRuleBeingMoved()).thenReturn(uuidAclRuleBeingMoved); + Mockito.when(moveNetworkAclItemCmdMock.getUuidRuleBeingMoved()).thenReturn(uuidAclRuleBeingMoved); - Mockito.when(aclRuleBeingMovedMock.getAclId()).thenReturn(networkAclMockId); + Mockito.when(aclRuleBeingMovedMock.getAclId()).thenReturn(networkAclMockId); - Mockito.when(networkAclMock.getVpcId()).thenReturn(networkMockVpcMockId); + Mockito.when(networkAclMock.getVpcId()).thenReturn(networkMockVpcMockId); + } } @After @@ -1013,6 +1014,7 @@ public class NetworkACLServiceImplTest { Mockito.doReturn(previousAclRuleMock).when(networkAclServiceImpl).retrieveAndValidateAclRule(previousAclRuleUuid); Mockito.doReturn(nextAclRuleMock).when(networkAclServiceImpl).retrieveAndValidateAclRule(nextAclRuleUuid); + when(nsxProviderDao.findByZoneId(anyLong())).then(null); configureMoveMethodsToDoNothing();
