From 56ce65710dfd55ad395d67db59019b3602713a6f Mon Sep 17 00:00:00 2001 From: Nitin Date: Thu, 11 Aug 2011 16:14:27 +0530 Subject: [PATCH] bug 5370: copy Template/Iso - generating the started and completed events. status 5370: resolved fixed --- api/src/com/cloud/api/commands/CopyTemplateCmd.java | 2 ++ server/src/com/cloud/template/TemplateManagerImpl.java | 1 + 2 files changed, 3 insertions(+) diff --git a/api/src/com/cloud/api/commands/CopyTemplateCmd.java b/api/src/com/cloud/api/commands/CopyTemplateCmd.java index a08aba599d7..b5d771a166f 100755 --- a/api/src/com/cloud/api/commands/CopyTemplateCmd.java +++ b/api/src/com/cloud/api/commands/CopyTemplateCmd.java @@ -36,6 +36,7 @@ import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.StorageUnavailableException; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; +import com.cloud.user.UserContext; @Implementation(description="Copies a template from one zone to another.", responseObject=TemplateResponse.class) public class CopyTemplateCmd extends BaseAsyncCmd { @@ -117,6 +118,7 @@ public class CopyTemplateCmd extends BaseAsyncCmd { @Override public void execute() throws ResourceAllocationException{ try { + UserContext.current().setEventDetails(getEventDescription()); VirtualMachineTemplate template = _templateService.copyTemplate(this); if (template != null){ diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index 21aa7935933..7bdf9404bd8 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -588,6 +588,7 @@ public class TemplateManagerImpl implements TemplateManager, Manager, TemplateSe @Override + @ActionEvent(eventType = EventTypes.EVENT_TEMPLATE_COPY, eventDescription = "copying template", async = true) public VirtualMachineTemplate copyTemplate(CopyTemplateCmd cmd) throws StorageUnavailableException, ResourceAllocationException { Long templateId = cmd.getId(); Long userId = UserContext.current().getCallerUserId();