From a9efec6403a6b97e25bb2b50ea5f78305402bf8d Mon Sep 17 00:00:00 2001
From: Min Chen <min.chen@citrix.com>
Date: Tue, 30 Jul 2013 18:05:08 -0700
Subject: [PATCH] CLOUDSTACK-3949:[Object_Store_Refactor][Usage] No usage event
 is generated for registered ISO.

---
 .../src/com/cloud/template/HypervisorTemplateAdapter.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/com/cloud/template/HypervisorTemplateAdapter.java
index d106e91507b..21a0f6e559e 100755
--- a/server/src/com/cloud/template/HypervisorTemplateAdapter.java
+++ b/server/src/com/cloud/template/HypervisorTemplateAdapter.java
@@ -214,6 +214,10 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase {
             long accountId = tmplt.getAccountId();
             if (template.getSize() != null) {
                 // publish usage event
+                String etype = EventTypes.EVENT_TEMPLATE_CREATE;
+                if (tmplt.getFormat() == ImageFormat.ISO) {
+                    etype = EventTypes.EVENT_ISO_CREATE;
+                }
                 // get physical size from template_store_ref table
                 long physicalSize = 0;
                 DataStore ds = template.getDataStore();
@@ -227,7 +231,7 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase {
                 Scope dsScope = ds.getScope();
                 if (dsScope.getScopeType() == ScopeType.ZONE) {
                     if (dsScope.getScopeId() != null) {
-                        UsageEventUtils.publishUsageEvent(EventTypes.EVENT_TEMPLATE_CREATE, template.getAccountId(), dsScope.getScopeId(), template.getId(), template.getName(), null,
+                        UsageEventUtils.publishUsageEvent(etype, template.getAccountId(), dsScope.getScopeId(), template.getId(), template.getName(), null,
                                 null, physicalSize, template.getSize(), VirtualMachineTemplate.class.getName(), template.getUuid());
                     }
                     else{
@@ -235,7 +239,7 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase {
                     }
                 } else if (dsScope.getScopeType() == ScopeType.REGION) {
                     // publish usage event for region-wide image store using a -1 zoneId for 4.2, need to revisit post-4.2
-                    UsageEventUtils.publishUsageEvent(EventTypes.EVENT_TEMPLATE_CREATE, template.getAccountId(), -1, template.getId(), template.getName(), null, null,
+                    UsageEventUtils.publishUsageEvent(etype, template.getAccountId(), -1, template.getId(), template.getName(), null, null,
                             physicalSize, template.getSize(), VirtualMachineTemplate.class.getName(), template.getUuid());
                 }
                 _resourceLimitMgr.incrementResourceCount(accountId, ResourceType.secondary_storage, template.getSize());