Skip to content

Remove powermock from network elements #7791

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
DaanHoogland merged 5 commits into from
Aug 7, 2023
Merged

Remove powermock from network elements #7791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
656adc9
Remove powermock from network elements
vishesh92 Jul 29, 2023
6279d92
temp commit
vishesh92 Jul 29, 2023
43ffd67
fix failing tests
vishesh92 Jul 29, 2023
49e22d8
fixes
vishesh92 Jul 29, 2023
be4fd17
Replace configservice by setting s_maxPageSize
vishesh92 Jul 30, 2023
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
6 changes: 3 additions & 3 deletions ...c-loadbalancer/src/test/java/com/cloud/network/lb/ElasticLoadBalancerManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.runners.MockitoJUnitRunner;
import org.powermock.reflect.Whitebox;
import org.mockito.junit.MockitoJUnitRunner;

import com.cloud.agent.api.check.CheckSshAnswer;
import com.cloud.agent.manager.Commands;
import com.cloud.network.lb.dao.ElasticLbVmMapDao;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachineProfile;
import org.springframework.test.util.ReflectionTestUtils;

@RunWith(MockitoJUnitRunner.class)
public class ElasticLoadBalancerManagerImplTest {
Expand Down Expand Up @@ -90,7 +90,7 @@ public void testFinalizeStartWhenCmdsAnswerIsNotNullAndAnswerResultIsTrue() thro
public void testGarbageCollectUnusedElbVmsWhenVariableUnusedElbVmsIsNull() throws Exception {
ElasticLbVmMapDao elasticLbVmMapDaoMock = mock(ElasticLbVmMapDao.class);
when(elasticLbVmMapDaoMock.listUnusedElbVms()).thenReturn(null);
Whitebox.setInternalState(elasticLoadBalancerManagerImpl, "_elbVmMapDao", elasticLbVmMapDaoMock);
ReflectionTestUtils.setField(elasticLoadBalancerManagerImpl, "_elbVmMapDao", elasticLbVmMapDaoMock);

try {
elasticLoadBalancerManagerImpl.garbageCollectUnusedElbVms();
Expand Down
12 changes: 6 additions & 6 deletions ...s/elastic-loadbalancer/src/test/java/com/cloud/network/lb/LoadBalanceRuleHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.powermock.reflect.Whitebox;

import com.cloud.dc.PodVlanMapVO;
import com.cloud.dc.dao.PodVlanMapDao;
Expand All @@ -47,6 +45,8 @@
import com.cloud.vm.VirtualMachineManager;
import com.cloud.vm.VirtualMachineProfile.Param;
import com.cloud.vm.dao.DomainRouterDao;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;

@RunWith(MockitoJUnitRunner.class)
public class LoadBalanceRuleHandlerTest {
Expand All @@ -68,10 +68,10 @@ public class LoadBalanceRuleHandlerTest {

@Before
public void setup() {
Whitebox.setInternalState(loadBalanceRuleHandler, "_itMgr", virtualMachineManagerMock);
Whitebox.setInternalState(loadBalanceRuleHandler, "_routerDao", domainRouterDaoMock);
Whitebox.setInternalState(loadBalanceRuleHandler, "_elbVmMapDao", elasticLbVmMapDao);
Whitebox.setInternalState(loadBalanceRuleHandler, "_podVlanMapDao", podVlanMapDao);
ReflectionTestUtils.setField(loadBalanceRuleHandler, "_itMgr", virtualMachineManagerMock);
ReflectionTestUtils.setField(loadBalanceRuleHandler, "_routerDao", domainRouterDaoMock);
ReflectionTestUtils.setField(loadBalanceRuleHandler, "_elbVmMapDao", elasticLbVmMapDao);
ReflectionTestUtils.setField(loadBalanceRuleHandler, "_podVlanMapDao", podVlanMapDao);
}

@Test
Expand Down
1 change: 1 addition & 0 deletions .../elastic-loadbalancer/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mock-maker-inline
21 changes: 16 additions & 5 deletions ...k/network/tungsten/api/command/AddTungstenFabricNetworkGatewayToLogicalRouterCmdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,47 @@
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.network.tungsten.service.TungstenService;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.powermock.reflect.Whitebox;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;

import java.util.List;

@RunWith(MockitoJUnitRunner.class)
public class AddTungstenFabricNetworkGatewayToLogicalRouterCmdTest {

@Mock
TungstenService tungstenService;

AddTungstenFabricNetworkGatewayToLogicalRouterCmd addTungstenFabricNetworkGatewayToLogicalRouterCmd;

AutoCloseable closeable;

@Before
public void setup() {
MockitoAnnotations.initMocks(this);
closeable = MockitoAnnotations.openMocks(this);
addTungstenFabricNetworkGatewayToLogicalRouterCmd = new AddTungstenFabricNetworkGatewayToLogicalRouterCmd();
addTungstenFabricNetworkGatewayToLogicalRouterCmd.tungstenService = tungstenService;
Whitebox.setInternalState(addTungstenFabricNetworkGatewayToLogicalRouterCmd, "zoneId", 1L);
Whitebox.setInternalState(addTungstenFabricNetworkGatewayToLogicalRouterCmd, "networkUuid", "005f0dea-0196" +
ReflectionTestUtils.setField(addTungstenFabricNetworkGatewayToLogicalRouterCmd, "zoneId", 1L);
ReflectionTestUtils.setField(addTungstenFabricNetworkGatewayToLogicalRouterCmd, "networkUuid", "005f0dea-0196" +
"-11ec-a1ed-b42e99f6e187");
Whitebox.setInternalState(addTungstenFabricNetworkGatewayToLogicalRouterCmd, "logicalRouterUuid", "125f0dea" +
ReflectionTestUtils.setField(addTungstenFabricNetworkGatewayToLogicalRouterCmd, "logicalRouterUuid", "125f0dea" +
"-0196-11ec-a1ed-b42e99f6e187");
}

@After
public void tearDown() throws Exception {
closeable.close();
}

@Test
public void executeTest() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException,
ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
Expand Down
43 changes: 26 additions & 17 deletions ...rg/apache/cloudstack/network/tungsten/api/command/AddTungstenFabricPolicyRuleCmdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,39 +27,48 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.powermock.reflect.Whitebox;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;

@RunWith(MockitoJUnitRunner.class)
public class AddTungstenFabricPolicyRuleCmdTest {

@Mock
TungstenService tungstenService;

AddTungstenFabricPolicyRuleCmd addTungstenFabricPolicyRuleCmd;

AutoCloseable closeable;

@Before
public void setup() {
MockitoAnnotations.initMocks(this);
closeable = MockitoAnnotations.openMocks(this);
addTungstenFabricPolicyRuleCmd = new AddTungstenFabricPolicyRuleCmd();
addTungstenFabricPolicyRuleCmd.tungstenService = tungstenService;
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "zoneId", 1L);
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "policyUuid", "test");
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "action", "test");
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "direction", "oneway");
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "protocol", "test");
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "srcNetwork", "test");
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "srcIpPrefix", "test");
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "srcIpPrefixLen", 1);
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "srcStartPort", 1);
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "srcEndPort", 1);
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "destNetwork", "test");
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "destIpPrefix", "test");
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "destIpPrefixLen", 1);
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "destStartPort", 1);
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "destEndPort", 1);
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "zoneId", 1L);
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "policyUuid", "test");
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "action", "test");
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "direction", "oneway");
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "protocol", "test");
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "srcNetwork", "test");
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "srcIpPrefix", "test");
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "srcIpPrefixLen", 1);
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "srcStartPort", 1);
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "srcEndPort", 1);
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "destNetwork", "test");
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "destIpPrefix", "test");
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "destIpPrefixLen", 1);
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "destStartPort", 1);
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "destEndPort", 1);
}

public void tearDown() throws Exception {
closeable.close();
}

@Test
Expand Down
25 changes: 18 additions & 7 deletions .../org/apache/cloudstack/network/tungsten/api/command/ApplyTungstenFabricPolicyCmdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,43 @@
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.network.tungsten.api.response.TungstenFabricPolicyResponse;
import org.apache.cloudstack.network.tungsten.service.TungstenService;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.powermock.reflect.Whitebox;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;

@RunWith(MockitoJUnitRunner.class)
public class ApplyTungstenFabricPolicyCmdTest {

@Mock
TungstenService tungstenService;

ApplyTungstenFabricPolicyCmd applyTungstenFabricPolicyCmd;

AutoCloseable closeable;

@Before
public void setup() {
MockitoAnnotations.initMocks(this);
closeable = MockitoAnnotations.openMocks(this);
applyTungstenFabricPolicyCmd = new ApplyTungstenFabricPolicyCmd();
applyTungstenFabricPolicyCmd.tungstenService = tungstenService;
Whitebox.setInternalState(applyTungstenFabricPolicyCmd, "zoneId", 1L);
Whitebox.setInternalState(applyTungstenFabricPolicyCmd, "networkUuid", "test");
Whitebox.setInternalState(applyTungstenFabricPolicyCmd, "policyUuid", "test");
Whitebox.setInternalState(applyTungstenFabricPolicyCmd, "majorSequence", 1);
Whitebox.setInternalState(applyTungstenFabricPolicyCmd, "minorSequence", 1);
ReflectionTestUtils.setField(applyTungstenFabricPolicyCmd, "zoneId", 1L);
ReflectionTestUtils.setField(applyTungstenFabricPolicyCmd, "networkUuid", "test");
ReflectionTestUtils.setField(applyTungstenFabricPolicyCmd, "policyUuid", "test");
ReflectionTestUtils.setField(applyTungstenFabricPolicyCmd, "majorSequence", 1);
ReflectionTestUtils.setField(applyTungstenFabricPolicyCmd, "minorSequence", 1);
}

@After
public void tearDown() throws Exception {
closeable.close();
}

@Test
Expand Down
29 changes: 20 additions & 9 deletions ...ava/org/apache/cloudstack/network/tungsten/api/command/ApplyTungstenFabricTagCmdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,47 @@
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.network.tungsten.api.response.TungstenFabricTagResponse;
import org.apache.cloudstack.network.tungsten.service.TungstenService;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.powermock.reflect.Whitebox;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;

import java.util.Arrays;

@RunWith(MockitoJUnitRunner.class)
public class ApplyTungstenFabricTagCmdTest {

@Mock
TungstenService tungstenService;

ApplyTungstenFabricTagCmd applyTungstenFabricTagCmd;

AutoCloseable closeable;

@Before
public void setup() {
MockitoAnnotations.initMocks(this);
closeable = MockitoAnnotations.openMocks(this);
applyTungstenFabricTagCmd = new ApplyTungstenFabricTagCmd();
applyTungstenFabricTagCmd.tungstenService = tungstenService;
Whitebox.setInternalState(applyTungstenFabricTagCmd, "zoneId", 1L);
Whitebox.setInternalState(applyTungstenFabricTagCmd, "networkUuids", Arrays.asList("test"));
Whitebox.setInternalState(applyTungstenFabricTagCmd, "vmUuids", Arrays.asList("test"));
Whitebox.setInternalState(applyTungstenFabricTagCmd, "nicUuids", Arrays.asList("test"));
Whitebox.setInternalState(applyTungstenFabricTagCmd, "policyUuid", "test");
Whitebox.setInternalState(applyTungstenFabricTagCmd, "applicationPolicySetUuid", "test");
Whitebox.setInternalState(applyTungstenFabricTagCmd, "tagUuid", "test");
ReflectionTestUtils.setField(applyTungstenFabricTagCmd, "zoneId", 1L);
ReflectionTestUtils.setField(applyTungstenFabricTagCmd, "networkUuids", Arrays.asList("test"));
ReflectionTestUtils.setField(applyTungstenFabricTagCmd, "vmUuids", Arrays.asList("test"));
ReflectionTestUtils.setField(applyTungstenFabricTagCmd, "nicUuids", Arrays.asList("test"));
ReflectionTestUtils.setField(applyTungstenFabricTagCmd, "policyUuid", "test");
ReflectionTestUtils.setField(applyTungstenFabricTagCmd, "applicationPolicySetUuid", "test");
ReflectionTestUtils.setField(applyTungstenFabricTagCmd, "tagUuid", "test");
}

@After
public void tearDown() throws Exception {
closeable.close();
}

@Test
Expand Down
38 changes: 20 additions & 18 deletions ...rg/apache/cloudstack/network/tungsten/api/command/ConfigTungstenFabricServiceCmdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,25 @@
import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionCallbackNoReturn;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.powermock.reflect.Whitebox;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;

import java.util.Arrays;
import java.util.List;

import static org.mockito.ArgumentMatchers.any;
import static org.powermock.api.mockito.PowerMockito.mockStatic;

@RunWith(PowerMockRunner.class)
@PrepareForTest({Transaction.class, ConfigTungstenFabricServiceCmd.class})
@RunWith(MockitoJUnitRunner.class)
public class ConfigTungstenFabricServiceCmdTest {
@Mock
EntityManager entityManager;
Expand All @@ -65,18 +63,24 @@ public class ConfigTungstenFabricServiceCmdTest {

ConfigTungstenFabricServiceCmd configTungstenFabricServiceCmd;

AutoCloseable closeable;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
closeable = MockitoAnnotations.openMocks(this);
configTungstenFabricServiceCmd = new ConfigTungstenFabricServiceCmd();
configTungstenFabricServiceCmd._entityMgr = entityManager;
configTungstenFabricServiceCmd.networkModel = networkModel;
configTungstenFabricServiceCmd.networkOfferingDao = networkOfferingDao;
configTungstenFabricServiceCmd.networkOfferingServiceMapDao = networkOfferingServiceMapDao;
configTungstenFabricServiceCmd.networkServiceMapDao = networkServiceMapDao;
configTungstenFabricServiceCmd.physicalNetworkServiceProviderDao = physicalNetworkServiceProviderDao;
Whitebox.setInternalState(configTungstenFabricServiceCmd, "zoneId", 1L);
Whitebox.setInternalState(configTungstenFabricServiceCmd, "physicalNetworkId", 1L);
ReflectionTestUtils.setField(configTungstenFabricServiceCmd, "zoneId", 1L);
ReflectionTestUtils.setField(configTungstenFabricServiceCmd, "physicalNetworkId", 1L);
}

@After
public void tearDown() throws Exception {
closeable.close();
}

@Test
Expand All @@ -86,16 +90,14 @@ public void executeTest() throws Exception {
Network managementNetwork = Mockito.mock(Network.class);
TransactionCallbackNoReturn transactionCallbackNoReturn = Mockito.mock(TransactionCallbackNoReturn.class);
List<NetworkOfferingVO> systemNetworkOffering = Arrays.asList(Mockito.mock(NetworkOfferingVO.class));
mockStatic(Transaction.class);
Mockito.when(entityManager.findById(ArgumentMatchers.any(), ArgumentMatchers.anyLong())).thenReturn(dataCenter);
Mockito.when(dataCenter.isSecurityGroupEnabled()).thenReturn(true);
Mockito.when(networkModel.getSystemNetworkByZoneAndTrafficType(ArgumentMatchers.anyLong(),
ArgumentMatchers.any())).thenReturn(managementNetwork);
Mockito.when(networkOfferingDao.listSystemNetworkOfferings()).thenReturn(systemNetworkOffering);
PowerMockito.when(Transaction.execute(any(TransactionCallbackNoReturn.class))).thenReturn(transactionCallbackNoReturn);
PowerMockito.whenNew(SuccessResponse.class).withAnyArguments().thenReturn(successResponse);
configTungstenFabricServiceCmd.execute();
Assert.assertEquals(successResponse, configTungstenFabricServiceCmd.getResponseObject());
try (MockedStatic<Transaction> transactionMocked = Mockito.mockStatic(Transaction.class)) {
transactionMocked.when(() -> Transaction.execute(any(TransactionCallbackNoReturn.class))).thenReturn(transactionCallbackNoReturn);
configTungstenFabricServiceCmd.execute();
SuccessResponse response = (SuccessResponse) configTungstenFabricServiceCmd.getResponseObject();
Assert.assertTrue(response.getSuccess());
}
}

}
Loading