Tal Nisan has submitted this change and it was merged. Change subject: core: Add conflicts check to host affinity ...................................................................... core: Add conflicts check to host affinity Added conflicts check for host affinity. These conflicts will include : Hosts that have enforcing positive and negative affinity conflicts. Hosts that have positive and negative affinity conflicts. Non intersecting hosts conflicts. VM to host affinity with positive VM to VM conflicts VM to host affinity with negative VM to VM conflicts Bug-Url: https://bugzilla.redhat.com/1417935 Change-Id: Ia515a2429bd2db3c290b40b69f3079fcd1cd1a1b Signed-off-by: Yanir Quinn <yquinn(a)redhat.com&gt; (cherry picked from commit 066f100) --- A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/arem/AffinityRulesConflicts.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/arem/AffinityRulesEnforcer.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/arem/AffinityRulesUtils.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/AffinityGroupCRUDCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/arem/AffinityRulesEnforcerTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineMessage.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/frontend/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 12 files changed, 770 insertions(+), 43 deletions(-) Approvals: Martin Sivák: Looks good to me, approved Jenkins CI: Passed CI tests Yanir Quinn: Verified -- To view, visit https://gerrit.ovirt.org/72322 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia515a2429bd2db3c290b40b69f3079fcd1cd1a1b Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-4.1 Gerrit-Owner: Yanir Quinn <yquinn(a)redhat.com&gt; Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com&gt; Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com&gt; Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com&gt; Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com&gt; Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com&gt; Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt; Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com&gt; Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;