Updated Branches: refs/heads/4.1 c54d9c963 -> 2e395b850
CLOUDSTACK-1834: Events are not generated for registerUserKeys(), Enabling account and Editing account. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2e395b85 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2e395b85 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2e395b85 Branch: refs/heads/4.1 Commit: 2e395b850138bed41e198c9b0aba0b9de245df76 Parents: c54d9c9 Author: Murali Reddy <murali.re...@citrix.com> Authored: Fri Mar 29 15:53:21 2013 +0530 Committer: Chip Childers <chip.child...@gmail.com> Committed: Fri Mar 29 14:50:27 2013 +0000 ---------------------------------------------------------------------- api/src/com/cloud/event/EventTypes.java | 5 +++++ .../src/com/cloud/server/ManagementServerImpl.java | 1 + server/src/com/cloud/user/AccountManagerImpl.java | 2 ++ 3 files changed, 8 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e395b85/api/src/com/cloud/event/EventTypes.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/event/EventTypes.java b/api/src/com/cloud/event/EventTypes.java index 0dd97cb..0315303 100755 --- a/api/src/com/cloud/event/EventTypes.java +++ b/api/src/com/cloud/event/EventTypes.java @@ -113,9 +113,11 @@ public class EventTypes { public static final String EVENT_LOAD_BALANCER_UPDATE = "LB.UPDATE"; // Account events + public static final String EVENT_ACCOUNT_ENABLE = "ACCOUNT.ENABLE"; public static final String EVENT_ACCOUNT_DISABLE = "ACCOUNT.DISABLE"; public static final String EVENT_ACCOUNT_CREATE = "ACCOUNT.CREATE"; public static final String EVENT_ACCOUNT_DELETE = "ACCOUNT.DELETE"; + public static final String EVENT_ACCOUNT_UPDATE = "ACCOUNT.UPDATE"; public static final String EVENT_ACCOUNT_MARK_DEFAULT_ZONE = "ACCOUNT.MARK.DEFAULT.ZONE"; // UserVO Events @@ -128,6 +130,9 @@ public class EventTypes { public static final String EVENT_USER_ENABLE = "USER.ENABLE"; public static final String EVENT_USER_LOCK = "USER.LOCK"; + //registering SSH keypair events + public static final String EVENT_REGISTER_SSH_KEYPAIR = "REGISTER.SSH.KEYPAIR"; + // Template Events public static final String EVENT_TEMPLATE_CREATE = "TEMPLATE.CREATE"; public static final String EVENT_TEMPLATE_DELETE = "TEMPLATE.DELETE"; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e395b85/server/src/com/cloud/server/ManagementServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 3a57b2f..9cddb77 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -2943,6 +2943,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe } @Override + @ActionEvent(eventType = EventTypes.EVENT_REGISTER_SSH_KEYPAIR, eventDescription = "registering ssh keypair", async = true) public SSHKeyPair registerSSHKeyPair(RegisterSSHKeyPairCmd cmd) { Account caller = UserContext.current().getCaller(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e395b85/server/src/com/cloud/user/AccountManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index f46db0e..1f54d70 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -1181,6 +1181,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M } @Override + @ActionEvent(eventType = EventTypes.EVENT_ACCOUNT_ENABLE, eventDescription = "enabling account", async = true) public AccountVO enableAccount(String accountName, Long domainId, Long accountId) { // Check if account exists @@ -1271,6 +1272,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M @Override @DB + @ActionEvent(eventType = EventTypes.EVENT_ACCOUNT_UPDATE, eventDescription = "updating account", async = true) public AccountVO updateAccount(UpdateAccountCmd cmd) { Long accountId = cmd.getId(); Long domainId = cmd.getDomainId();
