Allon Mureinik has uploaded a new change for review. Change subject: core: Don't use IsVmWithSameNameExistsQuery in BE ......................................................................
core: Don't use IsVmWithSameNameExistsQuery in BE Backend does not have to use IsVmWithSameNameExistsQuery, it can invoke VmHandler directly, saving the overhead of another query object. Change-Id: Iad6411245bf53a8f07139b3b36c9892e55809cea Signed-off-by: Allon Mureinik <[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/CommonVmPoolWithVmsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.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/AddVmCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java 7 files changed, 11 insertions(+), 39 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/15060/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 b0960c5..9a77af3 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 @@ -51,8 +51,6 @@ import org.ovirt.engine.core.common.errors.VdcBLLException; import org.ovirt.engine.core.common.errors.VdcBllErrors; import org.ovirt.engine.core.common.locks.LockingGroup; -import org.ovirt.engine.core.common.queries.IsVmWithSameNameExistParameters; -import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.common.utils.Pair; import org.ovirt.engine.core.common.utils.VmDeviceType; import org.ovirt.engine.core.common.validation.group.CreateEntity; @@ -440,9 +438,7 @@ int vmPriority) { boolean returnValue; // Checking if a desktop with same name already exists - boolean exists = (Boolean) getBackend() - .runInternalQuery(VdcQueryType.IsVmWithSameNameExist, new IsVmWithSameNameExistParameters(name)) - .getReturnValue(); + boolean exists = isVmWithSameNameExists(name); if (exists) { if (reasons != null) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java index 048a6bb..9fce9f9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java @@ -30,8 +30,6 @@ import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.job.Step; import org.ovirt.engine.core.common.job.StepEnum; -import org.ovirt.engine.core.common.queries.IsVmWithSameNameExistParameters; -import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.dal.VdcBllMessages; @@ -106,10 +104,7 @@ do { number++; currentVmName = NameForVmInPoolGenerator.generateVmName(poolName, number); - } while ((Boolean) Backend - .getInstance() - .runInternalQuery(VdcQueryType.IsVmWithSameNameExist, - new IsVmWithSameNameExistParameters(currentVmName)).getReturnValue()); + } while (VmHandler.isVmWithSameNameExistStatic(currentVmName)); VmStatic currVm = new VmStatic(getParameters().getVmStaticData()); currVm.setName(currentVmName); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index 7de2fa7..342286f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -56,7 +56,6 @@ import org.ovirt.engine.core.common.locks.LockingGroup; import org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; -import org.ovirt.engine.core.common.queries.IsVmWithSameNameExistParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.common.utils.Pair; @@ -497,9 +496,7 @@ protected boolean canAddVm() { // Checking if a desktop with same name already exists - boolean exists = (Boolean) getBackend() - .runInternalQuery(VdcQueryType.IsVmWithSameNameExist, - new IsVmWithSameNameExistParameters(getVm().getName())).getReturnValue(); + boolean exists = VmHandler.isVmWithSameNameExistStatic(getVm().getName()); if (exists) { addCanDoActionMessage(VdcBllMessages.VM_CANNOT_IMPORT_VM_NAME_EXISTS); 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 eefeac7..c1aea66 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 @@ -32,7 +32,6 @@ import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.locks.LockingGroup; import org.ovirt.engine.core.common.queries.IdQueryParameters; -import org.ovirt.engine.core.common.queries.IsVmWithSameNameExistParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.common.utils.Pair; @@ -222,10 +221,8 @@ // Checking if a desktop with same name already exists if (!StringUtils.equals(vmFromDB.getName(), vmFromParams.getName())) { - boolean exists = (Boolean) getBackend() - .runInternalQuery(VdcQueryType.IsVmWithSameNameExist, - new IsVmWithSameNameExistParameters(vmFromParams.getName())) - .getReturnValue(); + boolean exists = isVmWithSameNameExists(vmFromParams.getName()); + if (exists) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED); 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 bb1bf98..fc17119 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 @@ -202,4 +202,7 @@ return true; } + protected boolean isVmWithSameNameExists(String name) { + return VmHandler.isVmWithSameNameExistStatic(name); + } } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java index abbf53e..a49aed8 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java @@ -45,9 +45,6 @@ import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.interfaces.VDSBrokerFrontend; -import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; -import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; -import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSParametersBase; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; @@ -345,10 +342,6 @@ } private void mockBackend(AddVmCommand<?> cmd) { - VdcQueryReturnValue returnValue = new VdcQueryReturnValue(); - returnValue.setReturnValue(Boolean.FALSE); - when(backend.runInternalQuery(Matchers.<VdcQueryType> any(VdcQueryType.class), - Matchers.any(VdcQueryParametersBase.class))).thenReturn(returnValue); when(backend.getResourceManager()).thenReturn(vdsBrokerFrontend); doReturn(backend).when(cmd).getBackend(); } @@ -501,6 +494,7 @@ private <T extends VmManagementParametersBase> void mockUninterestingMethods(AddVmCommand<T> spy) { doReturn(true).when(spy).isVmNameValidLength(Matchers.<VM> any(VM.class)); + doReturn(false).when(spy).isVmWithSameNameExists(anyString()); doReturn(STORAGE_POOL_ID).when(spy).getStoragePoolId(); doReturn(createVmTemplate()).when(spy).getVmTemplate(); doReturn(true).when(spy).areParametersLegal(anyListOf(String.class)); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java index 10e60e0..96c4169 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java @@ -3,8 +3,8 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import static org.ovirt.engine.core.utils.MockConfigRule.mockConfig; @@ -19,7 +19,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.ovirt.engine.core.bll.interfaces.BackendInternal; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VmManagementParametersBase; import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; @@ -28,9 +27,6 @@ import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VmStatic; import org.ovirt.engine.core.common.config.ConfigValues; -import org.ovirt.engine.core.common.queries.IsVmWithSameNameExistParameters; -import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; -import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.dal.VdcBllMessages; @@ -48,8 +44,6 @@ private UpdateVmCommand<VmManagementParametersBase> command; private VDSGroup group; - @Mock - private BackendInternal backendInternal; @Mock private VmDAO vmDAO; @Mock @@ -97,7 +91,6 @@ } }); doReturn(vm).when(command).getVm(); - doReturn(backendInternal).when(command).getBackend(); } @Test @@ -240,9 +233,6 @@ } private void mockSameNameQuery(boolean result) { - VdcQueryReturnValue returnValue = mock(VdcQueryReturnValue.class); - when(backendInternal.runInternalQuery(any(VdcQueryType.class), any(IsVmWithSameNameExistParameters.class))) - .thenReturn(returnValue); - when(returnValue.getReturnValue()).thenReturn(result); + doReturn(result).when(command).isVmWithSameNameExists(anyString()); } } -- To view, visit http://gerrit.ovirt.org/15060 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad6411245bf53a8f07139b3b36c9892e55809cea Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
