Fix build after merging 4.22

Author: nvazquez

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/network/NetworkExtensionElement.java

@@ -2014,7 +2014,7 @@ public boolean completeAggregatedExecution(Network network, DeployDestination de
         }
 
         // Query all active User-VM NICs on this network
-        List<NicVO> nics = nicDao.listByNetworkIdAndType(network.getId(), VirtualMachine.Type.User);
+        List<NicVO> nics = nicDao.listNonPlaceholderNicsByNetworkIdAndType(network.getId(), VirtualMachine.Type.User);
         if (CollectionUtils.isEmpty(nics)) {
             logger.debug("completeAggregatedExecution: no user VM NICs on network={}, skipping", network);
             return true;

plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java

@@ -291,7 +291,7 @@ public void takeBackupFailureNeedingCleanupReturnsErrorBackup() throws AgentUnav
 
         Mockito.when(backupDao.persist(Mockito.any(BackupVO.class))).thenAnswer(invocation -> invocation.getArgument(0));
 
-        Pair<Boolean, Backup> result = nasBackupProvider.takeBackup(vm, true);
+        Pair<Boolean, Backup> result = nasBackupProvider.takeBackup(vm, true, false);
 
         Assert.assertFalse(result.first());
         Assert.assertNotNull(result.second());
@@ -321,7 +321,7 @@ public void takeBackupFailureWithoutCleanupRemovesBackup() throws AgentUnavailab
 
         Mockito.when(backupDao.persist(Mockito.any(BackupVO.class))).thenAnswer(invocation -> invocation.getArgument(0));
 
-        Pair<Boolean, Backup> result = nasBackupProvider.takeBackup(vm, false);
+        Pair<Boolean, Backup> result = nasBackupProvider.takeBackup(vm, false, false);
 
         Assert.assertFalse(result.first());
         Assert.assertNull(result.second());

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java

@@ -57,6 +57,7 @@
 
 import com.ceph.rados.IoCTX;
 import com.ceph.rados.Rados;
+import com.ceph.rados.exceptions.ErrorCode;
 import com.ceph.rados.exceptions.RadosException;
 import com.ceph.rbd.Rbd;
 import com.ceph.rbd.RbdException;

server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java

@@ -214,7 +214,6 @@
 import com.cloud.utils.exception.ExceptionProxyObject;
 import com.cloud.utils.fsm.NoTransitionException;
 import com.cloud.vm.dao.InstanceGroupDao;
-import com.cloud.vm.dao.InstanceGroupVMMapDao;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.UserVmDao;
 import com.cloud.vm.dao.VMInstanceDetailsDao;

server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java

@@ -22,6 +22,7 @@
 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;
@@ -794,7 +795,7 @@ public void createBackupTestFailedScheduledBackupKeepsSchedule() throws Resource
         Backup backup = mock(Backup.class);
         when(backup.getId()).thenReturn(backupId);
         when(backupProvider.getName()).thenReturn("testbackupprovider");
-        when(backupProvider.takeBackup(vmInstanceVOMock, null)).thenReturn(new Pair<>(false, backup));
+        when(backupProvider.takeBackup(vmInstanceVOMock, null, anyBoolean())).thenReturn(new Pair<>(false, backup));
         Map<String, BackupProvider> backupProvidersMap = new HashMap<>();
         backupProvidersMap.put(backupProvider.getName().toLowerCase(), backupProvider);
         ReflectionTestUtils.setField(backupManager, "backupProvidersMap", backupProvidersMap);