From 566238b08ed7ff7d496368db9fb8bd9f5127db76 Mon Sep 17 00:00:00 2001 From: subhash yedugundla Date: Sat, 16 Dec 2017 09:50:11 +0530 Subject: [PATCH] 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. --- engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java index 45337b22e13..ad8ce59dba7 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java @@ -66,6 +66,7 @@ public class UsageStorageDaoImpl extends GenericDaoBase im 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 class UsageStorageDaoImpl extends GenericDaoBase im sc.setParameters("id", id); sc.setParameters("type", type); sc.setParameters("dcId", dcId); + sc.setParameters("deleted", null); return listBy(sc, null); }