Laszlo Hornyak has uploaded a new change for review. Change subject: engine: renamed validatePinningAndMigration to validateMigrationRules ......................................................................
engine: renamed validatePinningAndMigration to validateMigrationRules validatePinningAndMigration was a bit misleading, it was not only about pinning, but in general the relationship of migration and other settings. Change-Id: Ib9b8a0dca428fe2ddb0e3073667bb7980cd12b04 Signed-off-by: Laszlo Hornyak <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmManagementCommandBaseTest.java 4 files changed, 34 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/16292/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java index b311965..6f48939 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java @@ -609,7 +609,7 @@ returnValue = IsLegalClusterId(vmStaticData.getVdsGroupId(), reasons); - if (!validatePinningAndMigration(reasons, vmStaticData, getParameters().getVm().getCpuPinning())) { + if (!validateMigrationRules(reasons, vmStaticData, getParameters().getVm().getCpuPinning())) { returnValue = false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java index 7dd81c8..62d5bcc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java @@ -314,7 +314,7 @@ return false; } - if (!validatePinningAndMigration(getReturnValue().getCanDoActionMessages(), + if (!validateMigrationRules(getReturnValue().getCanDoActionMessages(), getParameters().getVm().getStaticData(), getParameters().getVm().getCpuPinning())) { return false; } 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..23edf57 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 @@ -181,7 +181,7 @@ } } - static boolean validatePinningAndMigration(List<String> reasons, VmStatic vmStaticData, String cpuPinning) { + static boolean validateMigrationRules(List<String> reasons, VmStatic vmStaticData, String cpuPinning) { final boolean cpuPinMigrationEnabled = Boolean.TRUE.equals(Config.<Boolean> GetValue(ConfigValues.CpuPinMigrationEnabled)); if (!cpuPinMigrationEnabled && vmStaticData.getMigrationSupport() == MigrationSupport.MIGRATABLE diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmManagementCommandBaseTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmManagementCommandBaseTest.java index 3f37813..996b7b8 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmManagementCommandBaseTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmManagementCommandBaseTest.java @@ -1,24 +1,34 @@ package org.ovirt.engine.core.bll; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; + import java.util.ArrayList; +import java.util.Arrays; import junit.framework.Assert; +import org.junit.Rule; import org.junit.Test; - import org.ovirt.engine.core.common.action.VmManagementParametersBase; +import org.ovirt.engine.core.common.businessentities.MigrationSupport; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VmStatic; +import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.Version; - -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; +import org.ovirt.engine.core.utils.MockConfigRule; +import org.ovirt.engine.core.utils.MockConfigRule.MockConfigDescriptor; public class VmManagementCommandBaseTest { + @Rule + public MockConfigRule config = new MockConfigRule(new MockConfigDescriptor<Boolean>(ConfigValues.CpuPinMigrationEnabled, + "false", + false)); + @Test public void isCpuPinningValidWithoutPinnedHost() { VmManagementCommandBase<VmManagementParametersBase> test = @@ -130,4 +140,21 @@ Assert.assertTrue(test.isCpuPinningValid("10#1,2,3_11#1-20,^3", vmStatic)); } + + @Test + public void testValidatePinningAndMigration() { + VmStatic vmStaticData = new VmStatic(); + vmStaticData.setAutoStartup(true); + vmStaticData.setMigrationSupport(MigrationSupport.PINNED_TO_HOST); + Assert.assertFalse(VmManagementCommandBase.validateMigrationRules(new ArrayList<String>(), vmStaticData, null)); + } + + @Test + public void testValidatePinningAndMigrationNotHA() { + VmStatic vmStaticData = new VmStatic(); + vmStaticData.setAutoStartup(false); + vmStaticData.setMigrationSupport(MigrationSupport.PINNED_TO_HOST); + Assert.assertTrue(VmManagementCommandBase.validateMigrationRules(new ArrayList<String>(), vmStaticData, null)); + } + } -- To view, visit http://gerrit.ovirt.org/16292 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9b8a0dca428fe2ddb0e3073667bb7980cd12b04 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
