From e7eec8d0daf5c3d0d5d7c636504f963094788311 Mon Sep 17 00:00:00 2001 From: Maxim Prokopchuk Date: Fri, 17 Jun 2022 10:33:09 -0700 Subject: [PATCH 1/2] Create event TEMPLATE_UPDATE for virtual machine image update calls. --- .../src/main/java/com/cloud/template/TemplateManagerImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java index 158c717a1f8..930e0673c6e 100755 --- a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java @@ -2033,11 +2033,13 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, } @Override + @ActionEvent(eventType = EventTypes.EVENT_TEMPLATE_UPDATE, eventDescription = "updating template", async = false) public VMTemplateVO updateTemplate(UpdateIsoCmd cmd) { return updateTemplateOrIso(cmd); } @Override + @ActionEvent(eventType = EventTypes.EVENT_TEMPLATE_UPDATE, eventDescription = "updating template", async = false) public VMTemplateVO updateTemplate(UpdateTemplateCmd cmd) { return updateTemplateOrIso(cmd); } From 277f76f398e089af1795d0a3e75749d9a475cae0 Mon Sep 17 00:00:00 2001 From: Maxim Prokopchuk Date: Wed, 22 Jun 2022 10:14:26 -0700 Subject: [PATCH 2/2] Added ISO.UPDATE event for update ISO command. --- api/src/main/java/com/cloud/event/EventTypes.java | 1 + .../src/main/java/com/cloud/template/TemplateManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/com/cloud/event/EventTypes.java b/api/src/main/java/com/cloud/event/EventTypes.java index e21d86bd67e..5880804ccfb 100644 --- a/api/src/main/java/com/cloud/event/EventTypes.java +++ b/api/src/main/java/com/cloud/event/EventTypes.java @@ -278,6 +278,7 @@ public class EventTypes { // ISO public static final String EVENT_ISO_CREATE = "ISO.CREATE"; + public static final String EVENT_ISO_UPDATE = "ISO.UPDATE"; public static final String EVENT_ISO_DELETE = "ISO.DELETE"; public static final String EVENT_ISO_COPY = "ISO.COPY"; public static final String EVENT_ISO_ATTACH = "ISO.ATTACH"; diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java index 930e0673c6e..d7d38922917 100755 --- a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java @@ -2033,7 +2033,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, } @Override - @ActionEvent(eventType = EventTypes.EVENT_TEMPLATE_UPDATE, eventDescription = "updating template", async = false) + @ActionEvent(eventType = EventTypes.EVENT_ISO_UPDATE, eventDescription = "updating iso", async = false) public VMTemplateVO updateTemplate(UpdateIsoCmd cmd) { return updateTemplateOrIso(cmd); }