ofri masad has uploaded a new change for review. Change subject: core: prevent selection of "cpu pinning" and "manual migration" ......................................................................
core: prevent selection of "cpu pinning" and "manual migration" Cpu pinning and migration (manual or automat) should be mutually excluded. Currently only the use of automatic migration is checked. this patch adds a check for manual migration as well. Change-Id: I906ae6c46e7ce520fedc172be1601b4c61735bf8 Bug-Url: https://bugzilla.redhat.com/926962 Signed-off-by: Ofri Masad <oma...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/16370/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java index a11b075..44f59ac 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java @@ -184,7 +184,8 @@ static boolean validatePinningAndMigration(List<String> reasons, VmStatic vmStaticData, String cpuPinning) { final boolean cpuPinMigrationEnabled = Boolean.TRUE.equals(Config.<Boolean> GetValue(ConfigValues.CpuPinMigrationEnabled)); if (!cpuPinMigrationEnabled - && vmStaticData.getMigrationSupport() == MigrationSupport.MIGRATABLE + && (vmStaticData.getMigrationSupport() == MigrationSupport.MIGRATABLE + || vmStaticData.getMigrationSupport() == MigrationSupport.IMPLICITLY_NON_MIGRATABLE) && StringUtils.isNotEmpty(cpuPinning)) { reasons.add(VdcBllMessages.ACTION_TYPE_FAILED_VM_CANNOT_BE_PINNED_TO_CPU_AND_MIGRATABLE.toString()); return false; -- To view, visit http://gerrit.ovirt.org/16370 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I906ae6c46e7ce520fedc172be1601b4c61735bf8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: ofri masad <oma...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
