Skip to content

[WIP] CLOUDSTACK-6276: project support in affinitygroups #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
resmo wants to merge 7 commits into from
Closed

[WIP] CLOUDSTACK-6276: project support in affinitygroups #508

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2dfe55e
CLOUDSTACK-6276: add project support to AffinityGroupJoinVO and API
resmo Jun 22, 2015
f8577d3
CLOUDSTACK-6276: implement searchForAffinityGroups in QueryService
resmo Jun 22, 2015
4170813
CLOUDSTACK-6276: use query service for listAffinityGroups
resmo Jun 22, 2015
df50fc3
CLOUDSTACK-6276: add project support in AffinityGroupService in creat…
resmo Jun 22, 2015
111b6a9
CLOUDSTACK-6276: remove unused imports
resmo Jun 22, 2015
dfbfb9a
CLOUDSTACK-6276: add projectId null value for affinityGroups in Confi…
resmo Jun 22, 2015
5f9c7e1
CLOUDSTACK-6276: add projectId null value for affinityApiUnitTest
resmo Jun 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
CLOUDSTACK-6276: add projectId null value for affinityGroups in Confi… 
…gurationManager
  • Loading branch information
@resmo
resmo committed Jun 24, 2015
commit dfbfb9a6fa67ef6fa6ab5dcfd6e7ddadb87fbf59
6 changes: 3 additions & 3 deletions server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1577,7 +1577,7 @@ public Boolean doInTransaction(final TransactionStatus status) {
final List<DedicatedResourceVO> resourcesInGroup = _dedicatedDao.listByAffinityGroupId(dr.getAffinityGroupId());
if (resourcesInGroup.isEmpty()) {
// delete the group
_affinityGroupService.deleteAffinityGroup(dr.getAffinityGroupId(), null, null, null);
_affinityGroupService.deleteAffinityGroup(dr.getAffinityGroupId(), null, null, null, null);
}
}
}
Expand Down Expand Up @@ -1795,7 +1795,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
final List<DedicatedResourceVO> resourcesInGroup = _dedicatedDao.listByAffinityGroupId(resource.getAffinityGroupId());
if (resourcesInGroup.isEmpty()) {
// delete the group
_affinityGroupService.deleteAffinityGroup(resource.getAffinityGroupId(), null, null, null);
_affinityGroupService.deleteAffinityGroup(resource.getAffinityGroupId(), null, null, null, null);
}
}
}
Expand Down Expand Up @@ -1893,7 +1893,7 @@ private AffinityGroup createDedicatedAffinityGroup(String affinityGroupName, fin
}
}

group = _affinityGroupService.createAffinityGroupInternal(accountName, domainId, affinityGroupName, "ExplicitDedication", "dedicated resources group");
group = _affinityGroupService.createAffinityGroupInternal(accountName, null, domainId, affinityGroupName, "ExplicitDedication", "dedicated resources group");

return group;

Expand Down