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

Method signature change

Browse Source
This commit is contained in:
alena 2011-08-24 14:56:37 -07:00
parent e3f179844e
commit ee9fbf10b6
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
View File

@ -225,7 +225,7 @@ public class BareMetalVmManagerImpl extends UserVmManagerImpl implements BareMet
throw new InvalidParameterValueException("Unable to find account " + accountName + " in domain " + domainId); throw new InvalidParameterValueException("Unable to find account " + accountName + " in domain " + domainId);
} }
_accountMgr.checkAccess(caller, owner); _accountMgr.checkAccess(caller, null, owner);
long accountId = owner.getId(); long accountId = owner.getId();
DataCenterVO dc = _dcDao.findById(cmd.getZoneId()); DataCenterVO dc = _dcDao.findById(cmd.getZoneId());
@ -300,7 +300,7 @@ public class BareMetalVmManagerImpl extends UserVmManagerImpl implements BareMet
sshPublicKey = pair.getPublicKey(); sshPublicKey = pair.getPublicKey();
} }
_accountMgr.checkAccess(caller, template); _accountMgr.checkAccess(caller, null, template);
DataCenterDeployment plan = new DataCenterDeployment(dc.getId()); DataCenterDeployment plan = new DataCenterDeployment(dc.getId());

6
server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
View File

@ -833,7 +833,7 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG
} }
// Verify permissions // Verify permissions
_accountMgr.checkAccess(caller, securityGroup); _accountMgr.checkAccess(caller, null, securityGroup);
Long domainId = owner.getDomainId(); Long domainId = owner.getDomainId();
if (protocol == null) { if (protocol == null) {
@ -910,7 +910,7 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG
} }
// Check permissions // Check permissions
_accountMgr.checkAccess(caller, groupVO); _accountMgr.checkAccess(caller, null, groupVO);
authorizedGroups.add(groupVO); authorizedGroups.add(groupVO);
} }
@ -993,7 +993,7 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG
// Check permissions // Check permissions
SecurityGroup securityGroup = _securityGroupDao.findById(rule.getSecurityGroupId()); SecurityGroup securityGroup = _securityGroupDao.findById(rule.getSecurityGroupId());
_accountMgr.checkAccess(caller, securityGroup); _accountMgr.checkAccess(caller, null, securityGroup);
SecurityGroupVO groupHandle = null; SecurityGroupVO groupHandle = null;
final Transaction txn = Transaction.currentTxn(); final Transaction txn = Transaction.currentTxn();

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

@ -122,7 +122,7 @@ public class ProjectManagerImpl implements ProjectManager, Manager{
throw new InvalidParameterValueException("Unable to find project by id " + projectId); throw new InvalidParameterValueException("Unable to find project by id " + projectId);
} }
_accountMgr.checkAccess(caller, project); _accountMgr.checkAccess(caller, null, project);
//TODO - delete all project resources here //TODO - delete all project resources here

2
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -3295,7 +3295,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
VirtualMachineTemplate template = _templateDao.findById(vm.getTemplateId()); VirtualMachineTemplate template = _templateDao.findById(vm.getTemplateId());
if (!template.isPublicTemplate()) { if (!template.isPublicTemplate()) {
Account templateOwner = _accountMgr.getAccount(template.getAccountId()); Account templateOwner = _accountMgr.getAccount(template.getAccountId());
_accountMgr.checkAccess(newAccount, templateOwner); _accountMgr.checkAccess(newAccount, null, templateOwner);
} }
// VV 5: check that vm owner can create vm in the domain // VV 5: check that vm owner can create vm in the domain