implement listByIsoId method in VmIsoMapDao and update TemplateManagerImpl for ISO deletion checks

Author: Damans227

engine/schema/src/main/java/com/cloud/vm/dao/VmIsoMapDao.java

@@ -24,6 +24,8 @@
 public interface VmIsoMapDao extends GenericDao<VmIsoMapVO, Long> {
     List<VmIsoMapVO> listByVmId(long vmId);
 
+    List<VmIsoMapVO> listByIsoId(long isoId);
+
     VmIsoMapVO findByVmIdDeviceSeq(long vmId, int deviceSeq);
 
     VmIsoMapVO findByVmIdIsoId(long vmId, long isoId);

engine/schema/src/main/java/com/cloud/vm/dao/VmIsoMapDaoImpl.java

@@ -29,6 +29,7 @@
 public class VmIsoMapDaoImpl extends GenericDaoBase<VmIsoMapVO, Long> implements VmIsoMapDao {
 
     private SearchBuilder<VmIsoMapVO> ListByVmId;
+    private SearchBuilder<VmIsoMapVO> ListByIsoId;
     private SearchBuilder<VmIsoMapVO> ByVmIdDeviceSeq;
     private SearchBuilder<VmIsoMapVO> ByVmIdIsoId;
 
@@ -37,6 +38,10 @@ protected VmIsoMapDaoImpl() {
         ListByVmId.and("vmId", ListByVmId.entity().getVmId(), SearchCriteria.Op.EQ);
         ListByVmId.done();
 
+        ListByIsoId = createSearchBuilder();
+        ListByIsoId.and("isoId", ListByIsoId.entity().getIsoId(), SearchCriteria.Op.EQ);
+        ListByIsoId.done();
+
         ByVmIdDeviceSeq = createSearchBuilder();
         ByVmIdDeviceSeq.and("vmId", ByVmIdDeviceSeq.entity().getVmId(), SearchCriteria.Op.EQ);
         ByVmIdDeviceSeq.and("deviceSeq", ByVmIdDeviceSeq.entity().getDeviceSeq(), SearchCriteria.Op.EQ);
@@ -55,6 +60,13 @@ public List<VmIsoMapVO> listByVmId(long vmId) {
         return listBy(sc);
     }
 
+    @Override
+    public List<VmIsoMapVO> listByIsoId(long isoId) {
+        SearchCriteria<VmIsoMapVO> sc = ListByIsoId.create();
+        sc.setParameters("isoId", isoId);
+        return listBy(sc);
+    }
+
     @Override
     public VmIsoMapVO findByVmIdDeviceSeq(long vmId, int deviceSeq) {
         SearchCriteria<VmIsoMapVO> sc = ByVmIdDeviceSeq.create();

server/src/main/java/com/cloud/template/TemplateManagerImpl.java

@@ -1244,17 +1244,20 @@ protected TemplateManagerImpl() {
 
     @Override
     public boolean templateIsDeleteable(long templateId) {
+        // ISO can only be referenced by user_vm.iso_id (primary cdrom slot) or vm_iso_map (extra slots).
+        // Templates always live on primary storage and aren't tracked here.
         List<UserVmJoinVO> userVmUsingIso = _userVmJoinDao.listActiveByIsoId(templateId);
-        // check if there is any Vm using this ISO. We only need to check the
-        // case where templateId is an ISO since
-        // VM can be launched from ISO in secondary storage, while template will
-        // always be copied to
-        // primary storage before deploying VM.
         if (!userVmUsingIso.isEmpty()) {
             logger.debug("ISO " + templateId + " is not deleteable because it is attached to " + userVmUsingIso.size() + " Instances");
             return false;
         }
-
+        for (VmIsoMapVO row : _vmIsoMapDao.listByIsoId(templateId)) {
+            UserVmVO vm = _userVmDao.findById(row.getVmId());
+            if (vm != null && vm.getState() != State.Error && vm.getState() != State.Expunging) {
+                logger.debug("ISO " + templateId + " is not deleteable because it is attached to Instance " + vm.getUuid() + " at slot " + row.getDeviceSeq());
+                return false;
+            }
+        }
         return true;
     }