You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2013/04/09 14:16:17 UTC

git commit: updated refs/heads/master to 9180bd5

Updated Branches:
  refs/heads/master 47dc98967 -> 9180bd599


CLOUDSTACK-1834: Events are not generated for registerUserKeys()


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9180bd59
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9180bd59
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9180bd59

Branch: refs/heads/master
Commit: 9180bd599015ce248e894a0ef476a4604b1533e4
Parents: 47dc989
Author: Murali Reddy <mu...@citrix.com>
Authored: Tue Apr 9 17:45:19 2013 +0530
Committer: Murali Reddy <mu...@citrix.com>
Committed: Tue Apr 9 17:45:57 2013 +0530

----------------------------------------------------------------------
 api/src/com/cloud/event/EventTypes.java           |    3 +++
 server/src/com/cloud/user/AccountManagerImpl.java |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9180bd59/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 704a1bf..5671f99 100755
--- a/api/src/com/cloud/event/EventTypes.java
+++ b/api/src/com/cloud/event/EventTypes.java
@@ -142,6 +142,9 @@ public class EventTypes {
     //registering SSH keypair events
     public static final String EVENT_REGISTER_SSH_KEYPAIR = "REGISTER.SSH.KEYPAIR";
 
+    //register for user API and secret keys
+    public static final String EVENT_REGISTER_FOR_SECRET_API_KEY = "REGISTER.USER.KEY";
+
     // 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/9180bd59/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 52ca79d..9736aa1 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -1984,6 +1984,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
     }
 
     @Override @DB
+    @ActionEvent(eventType = EventTypes.EVENT_REGISTER_FOR_SECRET_API_KEY, eventDescription = "register for the developer API keys")
     public String[] createApiKeyAndSecretKey(RegisterCmd cmd) {
         Long userId = cmd.getId();