Doron Fediuck has submitted this change and it was merged. Change subject: engine: policy unit should contain single logic ...................................................................... engine: policy unit should contain single logic Utill now policy unit could hold logic for filtering, weighing or balancing (one or more). in this patch each policy unit could hold a single logic, according to a type field (enum) added to the entity. Change-Id: Ia6f1d88c7c9bbc600dba0199a7cab27d914c68f4 Signed-off-by: Gilad Chaplik <gchaplik(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/PolicyUnitImpl.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/PolicyUnit.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/PolicyUnitType.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/ClusterPolicyDaoImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/PolicyUnitDaoImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/PolicyUnitDaoTest.java M backend/manager/modules/dal/src/test/resources/fixtures.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/ClusterPolicyListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/NewClusterPolicyModel.java M packaging/dbscripts/cluster_policy_sp.sql A packaging/dbscripts/upgrade/03_03_0670_allow_single_logic_for_policy_unit.sql 12 files changed, 112 insertions(+), 148 deletions(-) Approvals: Doron Fediuck: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/17535 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia6f1d88c7c9bbc600dba0199a7cab27d914c68f4 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <gchaplik(a)redhat.com&gt; Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com&gt; Gerrit-Reviewer: Eli Mesika <elimesika(a)gmail.com&gt; Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com&gt; Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com&gt; Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com&gt; Gerrit-Reviewer: oVirt Jenkins CI Server