etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 8672: Added action events for User commands 

status 8672: resolved fixed
This commit is contained in:
kishan 2011-03-04 16:45:49 +05:30
parent 44ec214ad8
commit db7a0ddb75
7 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/com/cloud/api/commands/CreateUserCmd.java
View File

@ -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);

2
api/src/com/cloud/api/commands/DeleteUserCmd.java
View File

@ -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());

2
api/src/com/cloud/api/commands/DisableUserCmd.java
View File

@ -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);

2
api/src/com/cloud/api/commands/EnableUserCmd.java
View File

@ -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);

2
api/src/com/cloud/api/commands/UpdateUserCmd.java
View File

@ -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);

3
api/src/com/cloud/event/EventTypes.java
View File

@ -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";

10
server/src/com/cloud/user/AccountManagerImpl.java
View File

@ -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();