You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/03/30 00:36:03 UTC
[13/35] git commit: updated refs/heads/object_store to e64030a
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/48311363
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/48311363
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/48311363
Branch: refs/heads/object_store
Commit: 48311363d600264cb3542992a615706cb92f90ad
Parents: b585fa1
Author: Murali Reddy <mu...@citrix.com>
Authored: Fri Mar 29 15:53:21 2013 +0530
Committer: Murali Reddy <mu...@citrix.com>
Committed: Fri Mar 29 15:54:00 2013 +0530
----------------------------------------------------------------------
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/48311363/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 2e961e5..704a1bf 100755
--- a/api/src/com/cloud/event/EventTypes.java
+++ b/api/src/com/cloud/event/EventTypes.java
@@ -122,9 +122,11 @@ public class EventTypes {
public static final String EVENT_GLOBAL_LOAD_BALANCER_DELETE = "GLOBAL.LB.DELETE";
// 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
@@ -137,6 +139,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/48311363/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 ecd7751..26bc18d 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -3005,6 +3005,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/48311363/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 b69f314..77864fd 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -1172,6 +1172,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
@@ -1262,6 +1263,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();