From 08ed58066d2cdb0892448e0d243fccc4f9bdba6c Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Tue, 6 Feb 2024 10:41:36 -0500 Subject: [PATCH] clean up and attempt test fix --- .../network/vpc/NetworkACLServiceImpl.java | 8 ++--- .../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 5b64fc24c03..0f7b99754c3 100644 --- a/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java +++ b/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java @@ -1002,6 +1002,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 networks = _networkDao.listByAclId(lockedAcl.getId()); @@ -1073,11 +1076,6 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ return allAclRules; } - protected List getAclRulesSortedByNumber(long aclId) { - List 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 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();