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

Populate acl_group_account_map table in creating an account.

Browse Source
This commit is contained in:
Min Chen 2013-10-07 13:20:49 -07:00
parent ddd4f80911
commit 7342c97fa9
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -599,6 +599,9 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
//delete the account from project accounts //delete the account from project accounts
_projectAccountDao.removeAccountFromProjects(accountId); _projectAccountDao.removeAccountFromProjects(accountId);
//delete the account from group
_aclGroupAccountDao.removeAccountFromGroups(accountId);
// delete all vm groups belonging to accont // delete all vm groups belonging to accont
List<InstanceGroupVO> groups = _vmGroupDao.listByAccountId(accountId); List<InstanceGroupVO> groups = _vmGroupDao.listByAccountId(accountId);
for (InstanceGroupVO group : groups) { for (InstanceGroupVO group : groups) {
@ -943,6 +946,13 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
String registrationToken = UUID.nameUUIDFromBytes(bytes).toString(); String registrationToken = UUID.nameUUIDFromBytes(bytes).toString();
user.setRegistrationToken(registrationToken); user.setRegistrationToken(registrationToken);
} }
// create correct account and group association based on accountType
if (accountType != Account.ACCOUNT_TYPE_PROJECT) {
AclGroupAccountMapVO grpAcct = new AclGroupAccountMapVO(accountType + 1, accountId);
_aclGroupAccountDao.persist(grpAcct);
}
txn.commit(); txn.commit();
CallContext.current().putContextParameter(Account.class, account.getUuid()); CallContext.current().putContextParameter(Account.class, account.getUuid());