Github user ustcweizhou commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1134#discussion_r46554416
--- Diff:
server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java ---
@@ -229,59 +205,99 @@ public AffinityGroupVO
doInTransaction(TransactionStatus status) {
return group;
}
});
+ }
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Created affinity group =" + affinityGroupName);
+ private DomainVO getDomain(Long domainId) {
+ DomainVO domain = _domainDao.findById(domainId);
+ if (domain == null) {
+ throw new InvalidParameterValueException("Unable to find
domain by specified id");
}
+ return domain;
+ }
- return group;
+ private void verifyAffinityGroupNameInUse(long accountId, long
domainId, String affinityGroupName) {
+ if (_affinityGroupDao.isNameInUse(accountId, domainId,
affinityGroupName)) {
+ throw new InvalidParameterValueException("Unable to create
affinity group, a group with name " + affinityGroupName + " already exists.");
+ }
+ }
+
+ private void verifyDomainLevelAffinityGroupName(boolean domainLevel,
long domainId, String affinityGroupName) {
+ if (domainLevel &&
_affinityGroupDao.findDomainLevelGroupByName(domainId, affinityGroupName) !=
null) {
+ throw new InvalidParameterValueException("Unable to create
affinity group, a group with name " + affinityGroupName + " already exists
under the domain.");
+ }
}
@DB
- @Override
@ActionEvent(eventType = EventTypes.EVENT_AFFINITY_GROUP_DELETE,
eventDescription = "Deleting affinity group")
- public boolean deleteAffinityGroup(Long affinityGroupId, String
account, Long domainId, String affinityGroupName) {
+ public boolean deleteAffinityGroup(Long affinityGroupId, String
account, Long projectId, Long domainId, String affinityGroupName) {
+
+ AffinityGroupVO group = getAffinityGroup(affinityGroupId, account,
projectId, domainId, affinityGroupName);
+ // check permissions
Account caller = CallContext.current().getCallingAccount();
- Account owner = _accountMgr.finalizeOwner(caller, account,
domainId, null);
+ _accountMgr.checkAccess(caller, AccessType.OperateEntry, true,
group);
--- End diff --
Checked the cloudstack, the difference of project admin and project user are
http://docs.cloudstack.apache.org/projects/cloudstack-administration/en/4.6/projects.html
The project administrator can pass on the role to another project member.
The project administrator can also add more members, remove members from the
project, set new resource limits (as long as they are below the global defaults
set by the CloudStack administrator), and delete the project. When the
administrator removes a member from the project, resources created by that
user, such as VM instances, remain with the project. This brings us to the
subject of resource ownership and which resources can be used by a project.
so, @pdube you can ignore this comment.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
