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

bug 12635: enable project account when activate the project 

status 12635: resolved fixed
This commit is contained in:
Alena Prokharchyk 2011-12-19 12:23:07 -08:00
parent bb9886af29
commit 8d27ecf4de
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/com/cloud/projects/ProjectManagerImpl.java
View File

@ -916,6 +916,7 @@ public class ProjectManagerImpl implements ProjectManager, Manager{
@Override
@ActionEvent(eventType = EventTypes.EVENT_PROJECT_ACTIVATE, eventDescription = "activating project")
@DB
public Project activateProject(long projectId) {
Account caller = UserContext.current().getCaller();
@ -941,9 +942,16 @@ public class ProjectManagerImpl implements ProjectManager, Manager{
throw new InvalidParameterValueException("Can't activate the project in " + currentState + " state");
}
Transaction txn = Transaction.currentTxn();
txn.start();
project.setState(Project.State.Active);
_projectDao.update(projectId, project);
_accountMgr.enableAccount(project.getProjectAccountId());
txn.commit();
return _projectDao.findById(projectId);
}
@ -970,7 +978,8 @@ public class ProjectManagerImpl implements ProjectManager, Manager{
}
private boolean suspendProject(ProjectVO project) throws ConcurrentOperationException, ResourceUnavailableException{
private boolean suspendProject(ProjectVO project) throws ConcurrentOperationException, ResourceUnavailableException {
s_logger.debug("Marking project " + project + " with state " + State.Suspended + " as a part of project suspend...");
project.setState(State.Suspended);
boolean updateResult = _projectDao.update(project.getId(), project);
@ -979,7 +988,7 @@ public class ProjectManagerImpl implements ProjectManager, Manager{
long projectAccountId = project.getProjectAccountId();
if (!_accountMgr.disableAccount(projectAccountId)) {
s_logger.warn("Failed to suspend all project's " + project + " resources; the resources will be suspended later by background thread");
}
}
} else {
throw new CloudRuntimeException("Failed to mark the project " + project + " with state " + State.Suspended);
}

2
server/src/com/cloud/user/AccountManager.java
View File

@ -88,5 +88,7 @@ public interface AccountManager extends AccountService {
Pair<User, Account> findUserByApiKey(String apiKey);
boolean lockAccount(long accountId);
boolean enableAccount(long accountId);
}

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

@ -379,6 +379,7 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
return _userDao.update(Long.valueOf(userId), userForUpdate);
}
@Override
public boolean enableAccount(long accountId) {
boolean success = false;
AccountVO acctForUpdate = _accountDao.createForUpdate();