CLOUDSTACK-8908: After copying the template charging for that template is stopped (#2308)

When a template is copied back to zone after it is deleted. deleted field gets reset to null. delete field is added to Search on template zone mapping table to take care of the existing mapping.

Author: subhash yedugundla

engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java

@@ -66,6 +66,7 @@ public UsageStorageDaoImpl() {
         IdZoneSearch.and("id", IdZoneSearch.entity().getId(), SearchCriteria.Op.EQ);
         IdZoneSearch.and("type", IdZoneSearch.entity().getStorageType(), SearchCriteria.Op.EQ);
         IdZoneSearch.and("dcId", IdZoneSearch.entity().getZoneId(), SearchCriteria.Op.EQ);
+        IdZoneSearch.and("deleted", IdZoneSearch.entity().getDeleted(), SearchCriteria.Op.NULL);
         IdZoneSearch.done();
     }
 
@@ -85,6 +86,7 @@ public List<UsageStorageVO> listByIdAndZone(long accountId, long id, int type, l
         sc.setParameters("id", id);
         sc.setParameters("type", type);
         sc.setParameters("dcId", dcId);
+        sc.setParameters("deleted", null);
         return listBy(sc, null);
     }