This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new af9764b87a6 Fix tests
af9764b87a6 is described below
commit af9764b87a6901d4dce24c34573f5d76c0441cc4
Author: nvazquez <[email protected]>
AuthorDate: Mon Oct 19 19:11:32 2026 -0300
Fix tests
---
.../java/org/apache/cloudstack/backup/BackupManagerImpl.java | 3 ---
server/src/test/java/com/cloud/api/ApiServerTest.java | 9 +++++----
.../java/com/cloud/network/vpn/Site2SiteVpnManagerImplTest.java | 1 +
server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java | 9 +++------
.../java/org/apache/cloudstack/backup/BackupManagerTest.java | 3 +--
5 files changed, 10 insertions(+), 15 deletions(-)
diff --git
a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
index e7a6ec309d5..55f85ef2f23 100644
--- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -1068,9 +1068,6 @@ public class BackupManagerImpl extends ManagerBase
implements BackupManager {
Resource.ResourceType.backup_storage, backupSize,
reservationDao, resourceLimitMgr)) {
Pair<Boolean, Backup> result = backupProvider.takeBackup(vm,
cmd.getQuiesceVM(), cmd.isIsolated());
- if (!result.first()) {
- throw new CloudRuntimeException("Failed to create Instance
Backup");
- }
Backup backup = result.second();
if (backup != null) {
updateBackupFromCmd(backup.getId(), cmd, backupScheduleId);
diff --git a/server/src/test/java/com/cloud/api/ApiServerTest.java
b/server/src/test/java/com/cloud/api/ApiServerTest.java
index 43802aaa24c..c2c35440e12 100644
--- a/server/src/test/java/com/cloud/api/ApiServerTest.java
+++ b/server/src/test/java/com/cloud/api/ApiServerTest.java
@@ -29,6 +29,7 @@ import com.cloud.user.UserAccount;
import com.cloud.user.UserVO;
import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.acl.apikeypair.ApiKeyPairPermission;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ResponseObject;
import org.apache.cloudstack.api.response.LoginCmdResponse;
@@ -302,7 +303,7 @@ public class ApiServerTest {
overrideDefaultConfigValue(ApiServiceConfiguration.ApiSourceCidrChecksEnabled,
"_defaultValue", "false");
User user = Mockito.mock(User.class);
- ReflectionTestUtils.invokeMethod(apiServer, "checkCommandAvailable",
user, "listVirtualMachines", InetAddress.getByName("127.0.0.1"));
+ ReflectionTestUtils.invokeMethod(apiServer, "checkCommandAvailable",
user, "listVirtualMachines", InetAddress.getByName("127.0.0.1"), null, new
ApiKeyPairPermission[0]);
Mockito.verify(accountManager,
Mockito.never()).getAccount(Mockito.anyLong());
}
@@ -317,7 +318,7 @@ public class ApiServerTest {
Mockito.when(account.getId()).thenReturn(1L);
Mockito.when(accountManager.getAccount(1L)).thenReturn(account);
- ReflectionTestUtils.invokeMethod(apiServer, "checkCommandAvailable",
user, "listVirtualMachines", InetAddress.getByName("127.0.0.1"));
+ ReflectionTestUtils.invokeMethod(apiServer, "checkCommandAvailable",
user, "listVirtualMachines", InetAddress.getByName("127.0.0.1"), null, new
ApiKeyPairPermission[0]);
Mockito.verify(accountManager).getAccount(1L);
}
@@ -332,11 +333,11 @@ public class ApiServerTest {
Mockito.when(account.getId()).thenReturn(1L);
Mockito.when(accountManager.getAccount(1L)).thenReturn(account);
- ReflectionTestUtils.invokeMethod(apiServer, "checkCommandAvailable",
user, "listVirtualMachines", InetAddress.getByName("127.0.0.1"));
+ ReflectionTestUtils.invokeMethod(apiServer, "checkCommandAvailable",
user, "listVirtualMachines", InetAddress.getByName("127.0.0.1"), null, new
ApiKeyPairPermission[0]);
}
@Test(expected = PermissionDeniedException.class)
public void testCheckCommandAvailableThrowsWhenUserNull() throws Exception
{
- ReflectionTestUtils.invokeMethod(apiServer, "checkCommandAvailable",
null, "listVirtualMachines", InetAddress.getByName("127.0.0.1"));
+ ReflectionTestUtils.invokeMethod(apiServer, "checkCommandAvailable",
null, "listVirtualMachines", InetAddress.getByName("127.0.0.1"), null, new
ApiKeyPairPermission[0]);
}
}
diff --git
a/server/src/test/java/com/cloud/network/vpn/Site2SiteVpnManagerImplTest.java
b/server/src/test/java/com/cloud/network/vpn/Site2SiteVpnManagerImplTest.java
index 291d3a4aa81..7e419e353f6 100644
---
a/server/src/test/java/com/cloud/network/vpn/Site2SiteVpnManagerImplTest.java
+++
b/server/src/test/java/com/cloud/network/vpn/Site2SiteVpnManagerImplTest.java
@@ -216,6 +216,7 @@ public class Site2SiteVpnManagerImplTest {
when(cmd.isDisplay()).thenReturn(true);
when(_vpcDao.findById(VPC_ID)).thenReturn(vpc);
+
when(vpcOfferingServiceMapDao.areServicesSupportedByVpcOffering(anyLong(),
any())).thenReturn(true);
when(_vpnGatewayDao.findByVpcId(VPC_ID)).thenReturn(null);
when(_ipAddressDao.listByAssociatedVpc(VPC_ID,
true)).thenReturn(List.of(ipAddress));
when(_vpnGatewayDao.persist(any(Site2SiteVpnGatewayVO.class))).thenReturn(vpnGateway);
diff --git a/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
b/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
index 62a8433c055..6ad13bbd429 100644
--- a/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
+++ b/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
@@ -503,9 +503,6 @@ public class UserVmManagerImplTest {
@Mock
ServiceOfferingDetailsDao serviceOfferingDetailsDao;
- @Mock
- InstanceGroupVMMapDao instanceGroupVMMapDao;
-
private static final long vmId = 1L;
private static final long zoneId = 2L;
private static final long accountId = 3L;
@@ -694,9 +691,9 @@ public class UserVmManagerImplTest {
Mockito.when(userVmVoMock.getId()).thenReturn(vmId);
InstanceGroupVMMapVO mapVO = Mockito.mock(InstanceGroupVMMapVO.class);
Mockito.when(mapVO.getInstanceId()).thenReturn(vmId);
-
Mockito.when(instanceGroupVMMapDao.listByInstanceId(vmId)).thenReturn(Collections.singletonList(mapVO));
+
Mockito.when(_groupVMMapDao.listByInstanceId(vmId)).thenReturn(Collections.singletonList(mapVO));
SearchCriteria<InstanceGroupVMMapVO> searchCriteria =
Mockito.mock(SearchCriteria.class);
-
Mockito.when(instanceGroupVMMapDao.createSearchCriteria()).thenReturn(searchCriteria);
+
Mockito.when(_groupVMMapDao.createSearchCriteria()).thenReturn(searchCriteria);
// Set group = "" to reset/restore the instance group for a VM
Mockito.when(updateVmCommand.getGroup()).thenReturn("");
@@ -705,7 +702,7 @@ public class UserVmManagerImplTest {
verifyMethodsThatAreAlwaysExecuted();
Mockito.verify(userVmManagerImpl).removeInstanceFromInstanceGroup(vmId);
- Mockito.verify(instanceGroupVMMapDao).expunge(searchCriteria);
+ Mockito.verify(_groupVMMapDao).expunge(searchCriteria);
}
@Test
diff --git
a/server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java
b/server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java
index 1bb35463b86..b9d247ad427 100644
--- a/server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java
+++ b/server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.atLeastOnce;
@@ -795,7 +794,7 @@ public class BackupManagerTest {
Backup backup = mock(Backup.class);
when(backup.getId()).thenReturn(backupId);
when(backupProvider.getName()).thenReturn("testbackupprovider");
- when(backupProvider.takeBackup(vmInstanceVOMock, null,
anyBoolean())).thenReturn(new Pair<>(false, backup));
+ when(backupProvider.takeBackup(vmInstanceVOMock, null,
false)).thenReturn(new Pair<>(false, backup));
Map<String, BackupProvider> backupProvidersMap = new HashMap<>();
backupProvidersMap.put(backupProvider.getName().toLowerCase(),
backupProvider);
ReflectionTestUtils.setField(backupManager, "backupProvidersMap",
backupProvidersMap);
