diff --git a/api/src/com/cloud/api/commands/CreateUserCmd.java b/api/src/com/cloud/api/commands/CreateUserCmd.java index 203160e8520..660ed62bdf4 100644 --- a/api/src/com/cloud/api/commands/CreateUserCmd.java +++ b/api/src/com/cloud/api/commands/CreateUserCmd.java @@ -130,6 +130,7 @@ public class CreateUserCmd extends BaseCmd { @Override public void execute(){ + UserContext.current().setEventDetails("UserName: "+getUsername()+", FirstName :"+getFirstname()+", LastName: "+getLastname()); User user = _accountService.createUser(this); if (user != null) { UserResponse response = _responseGenerator.createUserResponse(user); diff --git a/api/src/com/cloud/api/commands/DeleteUserCmd.java b/api/src/com/cloud/api/commands/DeleteUserCmd.java index e7081c4b046..a32d03063ee 100644 --- a/api/src/com/cloud/api/commands/DeleteUserCmd.java +++ b/api/src/com/cloud/api/commands/DeleteUserCmd.java @@ -29,6 +29,7 @@ import com.cloud.api.response.SuccessResponse; import com.cloud.api.response.UserResponse; import com.cloud.user.Account; import com.cloud.user.User; +import com.cloud.user.UserContext; @Implementation(description="Creates a user for an account", responseObject=UserResponse.class) public class DeleteUserCmd extends BaseCmd { @@ -72,6 +73,7 @@ public class DeleteUserCmd extends BaseCmd { @Override public void execute(){ + UserContext.current().setEventDetails("UserId: "+getId()); boolean result = _accountService.deleteUser(this); if (result) { SuccessResponse response = new SuccessResponse(getCommandName()); diff --git a/api/src/com/cloud/api/commands/DisableUserCmd.java b/api/src/com/cloud/api/commands/DisableUserCmd.java index 22745c42dfe..23a3852f064 100644 --- a/api/src/com/cloud/api/commands/DisableUserCmd.java +++ b/api/src/com/cloud/api/commands/DisableUserCmd.java @@ -30,6 +30,7 @@ import com.cloud.event.EventTypes; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.user.UserAccount; +import com.cloud.user.UserContext; @Implementation(description="Disables a user account", responseObject=UserResponse.class) public class DisableUserCmd extends BaseAsyncCmd { @@ -83,6 +84,7 @@ public class DisableUserCmd extends BaseAsyncCmd { @Override public void execute(){ + UserContext.current().setEventDetails("UserId: "+getId()); UserAccount user = _accountService.disableUser(this); if (user != null){ UserResponse response = _responseGenerator.createUserResponse(user); diff --git a/api/src/com/cloud/api/commands/EnableUserCmd.java b/api/src/com/cloud/api/commands/EnableUserCmd.java index 73613a14a8a..1d5f57969dc 100644 --- a/api/src/com/cloud/api/commands/EnableUserCmd.java +++ b/api/src/com/cloud/api/commands/EnableUserCmd.java @@ -29,6 +29,7 @@ import com.cloud.api.response.UserResponse; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.user.UserAccount; +import com.cloud.user.UserContext; @Implementation(description="Enables a user account", responseObject=UserResponse.class) public class EnableUserCmd extends BaseCmd { @@ -72,6 +73,7 @@ public class EnableUserCmd extends BaseCmd { @Override public void execute(){ + UserContext.current().setEventDetails("UserId: "+getId()); UserAccount user = _accountService.enableUser(this); if (user != null){ UserResponse response = _responseGenerator.createUserResponse(user); diff --git a/api/src/com/cloud/api/commands/UpdateUserCmd.java b/api/src/com/cloud/api/commands/UpdateUserCmd.java index 5fc9ae03863..1b553f10694 100644 --- a/api/src/com/cloud/api/commands/UpdateUserCmd.java +++ b/api/src/com/cloud/api/commands/UpdateUserCmd.java @@ -29,6 +29,7 @@ import com.cloud.api.response.UserResponse; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.user.UserAccount; +import com.cloud.user.UserContext; @Implementation(description="Updates a user account", responseObject=UserResponse.class) public class UpdateUserCmd extends BaseCmd { @@ -128,6 +129,7 @@ public class UpdateUserCmd extends BaseCmd { @Override public void execute(){ + UserContext.current().setEventDetails("UserId: "+getId()); UserAccount user = _accountService.updateUser(this); if (user != null){ UserResponse response = _responseGenerator.createUserResponse(user); diff --git a/api/src/com/cloud/event/EventTypes.java b/api/src/com/cloud/event/EventTypes.java index 30dee9cd480..a476b4a1155 100755 --- a/api/src/com/cloud/event/EventTypes.java +++ b/api/src/com/cloud/event/EventTypes.java @@ -76,7 +76,8 @@ public class EventTypes { public static final String EVENT_USER_CREATE = "USER.CREATE"; public static final String EVENT_USER_DELETE = "USER.DELETE"; public static final String EVENT_USER_DISABLE = "USER.DISABLE"; - public static final String EVENT_USER_UPDATE = "USER.UPDATE"; + public static final String EVENT_USER_UPDATE = "USER.UPDATE"; + public static final String EVENT_USER_ENABLE = "USER.ENABLE"; //Template Events public static final String EVENT_TEMPLATE_CREATE = "TEMPLATE.CREATE"; diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index b29fe681d74..50ca54ab3b6 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -1089,7 +1089,7 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag } } - @Override + @Override @ActionEvent (eventType=EventTypes.EVENT_USER_CREATE, eventDescription="creating User") public UserVO createUser(CreateUserCmd cmd){ String accountName = cmd.getAccountName(); Long domainId = cmd.getDomainId(); @@ -1144,7 +1144,7 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag return dbUser; } - @Override + @Override @ActionEvent (eventType=EventTypes.EVENT_USER_UPDATE, eventDescription="updating User") public UserAccount updateUser(UpdateUserCmd cmd) throws InvalidParameterValueException { Long id = cmd.getId(); String apiKey = cmd.getApiKey(); @@ -1228,7 +1228,7 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag return _userAccountDao.findById(id); } - @Override + @Override @ActionEvent (eventType=EventTypes.EVENT_USER_DISABLE, eventDescription="disabling User", async=true) public UserAccount disableUser(DisableUserCmd cmd) throws InvalidParameterValueException, PermissionDeniedException{ Long userId = cmd.getId(); Account adminAccount = UserContext.current().getCaller(); @@ -1258,7 +1258,7 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag } } - @Override + @Override @ActionEvent (eventType=EventTypes.EVENT_USER_ENABLE, eventDescription="enabling User") public UserAccount enableUser(EnableUserCmd cmd) throws InvalidParameterValueException, PermissionDeniedException{ Long userId = cmd.getId(); Account adminAccount = UserContext.current().getCaller(); @@ -1505,7 +1505,7 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag } } - @Override + @Override @ActionEvent (eventType=EventTypes.EVENT_USER_DELETE, eventDescription="deleting User") public boolean deleteUser(DeleteUserCmd deleteUserCmd) { long id = deleteUserCmd.getId();