apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-17 02:53:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

some more changes for the account creation

Browse Source
This commit is contained in:
abhishek 2010-12-15 13:47:45 -08:00
parent 7c7989abb2
commit 37996132ed
4 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/api/ResponseGenerator.java
View File

@ -207,6 +207,6 @@ public interface ResponseGenerator {
UserResponse createUserResponse(User user); UserResponse createUserResponse(User user);
UserResponse createUserAccountResponse(UserAccount user); AccountResponse createUserAccountResponse(UserAccount user);
} }

3
api/src/com/cloud/api/commands/CreateAccountCmd.java
View File

@ -25,6 +25,7 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.Implementation; import com.cloud.api.Implementation;
import com.cloud.api.Parameter; import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException; import com.cloud.api.ServerApiException;
import com.cloud.api.response.AccountResponse;
import com.cloud.api.response.UserResponse; import com.cloud.api.response.UserResponse;
import com.cloud.user.UserAccount; import com.cloud.user.UserAccount;
@ -125,7 +126,7 @@ public class CreateAccountCmd extends BaseCmd {
public void execute(){ public void execute(){
UserAccount user = _accountService.createAccount(this); UserAccount user = _accountService.createAccount(this);
if (user != null) { if (user != null) {
UserResponse response = _responseGenerator.createUserAccountResponse(user); AccountResponse response = _responseGenerator.createUserAccountResponse(user);
response.setResponseName(getCommandName()); response.setResponseName(getCommandName());
this.setResponseObject(response); this.setResponseObject(response);
} else { } else {

2
client/tomcatconf/commands.properties.in
View File

@ -7,7 +7,7 @@ deleteAccount=com.cloud.api.commands.DeleteAccountCmd;1
updateAccount=com.cloud.api.commands.UpdateAccountCmd;3 updateAccount=com.cloud.api.commands.UpdateAccountCmd;3
disableAccount=com.cloud.api.commands.DisableAccountCmd;3 disableAccount=com.cloud.api.commands.DisableAccountCmd;3
enableAccount=com.cloud.api.commands.EnableAccountCmd;3 enableAccount=com.cloud.api.commands.EnableAccountCmd;3
lockAccount=com.cloud.api.commands.LockAccountCmd;3 ###lockAccount=com.cloud.api.commands.LockAccountCmd;3
listAccounts=com.cloud.api.commands.ListAccountsCmd;15 listAccounts=com.cloud.api.commands.ListAccountsCmd;15
#### User commands #### User commands

22
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -203,28 +203,10 @@ public class ApiResponseHelper implements ResponseGenerator {
return userResponse; return userResponse;
} }
//this method is used for response generation via createAccount (which creates an account + user) //this method is used for response generation via createAccount (which creates an account + user)
@Override @Override
public UserResponse createUserAccountResponse(UserAccount user) { public AccountResponse createUserAccountResponse(UserAccount user) {
UserResponse userResponse = new UserResponse(); return createAccountResponse(ApiDBUtils.findAccountById(user.getAccountId()));
userResponse.setAccountName(user.getAccountName());
userResponse.setAccountType(user.getType());
userResponse.setCreated(user.getCreated());
userResponse.setDomainId(user.getDomainId());
userResponse.setDomainName(ApiDBUtils.findDomainById(user.getDomainId()).getName());
userResponse.setEmail(user.getEmail());
userResponse.setFirstname(user.getFirstname());
userResponse.setId(user.getId());
userResponse.setLastname(user.getLastname());
userResponse.setState(user.getState());
userResponse.setTimezone(user.getTimezone());
userResponse.setUsername(user.getUsername());
userResponse.setApiKey(user.getApiKey());
userResponse.setSecretKey(user.getSecretKey());
userResponse.setObjectName("account");
return userResponse;
} }