Allon Mureinik has uploaded a new change for review. Change subject: core: VdcCommandBase method names ......................................................................
core: VdcCommandBase method names Renamed VdcCommand's methods to adhere to proper Java conventions. Change-Id: I8bc158016c90d5d029eaa7be2cb6331206ea3339 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetCommandsCompatibilityVersionsQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetLunsByVgIdTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetoVirtISOsTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapSearchQueryTestBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ValidateSessionQueryTest.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcCommandBase.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/DestroyVmVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/MigrateVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResumeVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VDSCommandBase.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java 20 files changed, 40 insertions(+), 40 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/12113/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java index 8bfd70c..ffff7af 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java @@ -400,7 +400,7 @@ } QueriesCommandBase<?> command = createQueryCommand(actionType, parameters); command.setInternalExecution(!isPerformUserCheck); - command.Execute(); + command.execute(); return command.getQueryReturnValue(); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java index 7436a0d..908ae27 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java @@ -63,7 +63,7 @@ } @Override - protected void ExecuteCommand() { + protected void executeCommand() { if (validatePermissions()) { if (validateInputs()) { try { diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetCommandsCompatibilityVersionsQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetCommandsCompatibilityVersionsQueryTest.java index 8ea6587..52c1757 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetCommandsCompatibilityVersionsQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetCommandsCompatibilityVersionsQueryTest.java @@ -43,7 +43,7 @@ ADD_VM_FROM_SNAPSHOT_VERSION, ADD_VM_FROM_SNAPSHOT_VERSION)); doReturn(entriesFromDb).when(actionGroupDaoMock).getAllActionVersionMap(); - queryToRun.Execute(); + queryToRun.execute(); VdcQueryReturnValue returnValue = queryToRun.getQueryReturnValue(); assertNotNull(returnValue); assertNotNull(returnValue.getReturnValue()); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetLunsByVgIdTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetLunsByVgIdTest.java index 614bf30..e4ff503 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetLunsByVgIdTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetLunsByVgIdTest.java @@ -69,7 +69,7 @@ expectGetConnections(cnxDAO); getQuery().setInternalExecution(true); - getQuery().ExecuteCommand(); + getQuery().executeCommand(); checkSucceeded(getQuery(), true); checkReturnValue(getQuery()); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQueryTest.java index 1647584..05a2660 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQueryTest.java @@ -100,7 +100,7 @@ setupQueryBySnapshotId(existingSnapshotId); VM vm = new VM(); doReturn(vm).when(query).getVmFromConfiguration(any(String.class)); - query.Execute(); + query.execute(); VdcQueryReturnValue returnValue = query.getQueryReturnValue(); assertNotNull("Return value from query cannot be null", returnValue); VM returnedVm = (VM) returnValue.getReturnValue(); @@ -124,7 +124,7 @@ existingVm.getDiskMap().put(existingDiskImage.getId(), existingDiskImage); existingVm.getImages().add(existingDiskImage); doReturn(existingVm).when(query).getVmFromConfiguration(anyString()); - query.Execute(); + query.execute(); VdcQueryReturnValue returnValue = query.getQueryReturnValue(); assertNotNull("Return value from query cannot be null", returnValue); VM vm = (VM) returnValue.getReturnValue(); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetoVirtISOsTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetoVirtISOsTest.java index 1b69636..4d6204f 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetoVirtISOsTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetoVirtISOsTest.java @@ -65,7 +65,7 @@ when(getQueryParameters().getVdsId()).thenReturn(vdsId); getQuery().setInternalExecution(true); - getQuery().ExecuteCommand(); + getQuery().executeCommand(); checkSucceeded(getQuery(), true); checkReturnValue(getQuery()); @@ -84,7 +84,7 @@ when(getQueryParameters().getVdsId()).thenReturn(vdsId); getQuery().setInternalExecution(true); - getQuery().ExecuteCommand(); + getQuery().executeCommand(); checkSucceeded(getQuery(), true); checkReturnValue(getQuery()); @@ -94,7 +94,7 @@ public void testQueryWithNonExistingHostId() { when(getQueryParameters().getVdsId()).thenReturn(Guid.NewGuid()); getQuery().setInternalExecution(true); - getQuery().ExecuteCommand(); + getQuery().executeCommand(); checkSucceeded(getQuery(), true); checkReturnValue(getQuery()); @@ -103,7 +103,7 @@ @Test public void testQueryWithoutHostId() { getQuery().setInternalExecution(true); - getQuery().ExecuteCommand(); + getQuery().executeCommand(); checkSucceeded(getQuery(), true); checkReturnValue(getQuery()); @@ -114,7 +114,7 @@ public void testPrefixChange() { mcr.mockConfigValue(ConfigValues.OvirtIsoPrefix, "a different prefix"); getQuery().setInternalExecution(true); - getQuery().ExecuteCommand(); + getQuery().executeCommand(); checkSucceeded(getQuery(), true); assertTrue("Prefix was changed, no ISOs should be returned", diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapSearchQueryTestBase.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapSearchQueryTestBase.java index 0e8dd5d..d4b5105 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapSearchQueryTestBase.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapSearchQueryTestBase.java @@ -95,7 +95,7 @@ thenReturn(ldapRerunValue); getQuery().setInternalExecution(true); - getQuery().Execute(); + getQuery().execute(); assertTrue("Query should succeed, but failed with: " + getQuery().getQueryReturnValue().getExceptionString(), getQuery().getQueryReturnValue().getIsSearchValid()); assertEquals("Wrong ldap result returned", diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java index 12a777e..f888bae 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java @@ -96,7 +96,7 @@ TestHelperQueriesCommandType.setQueryTypeFieldValue(query, queryType); query.setInternalExecution(isInternalExecution); - query.ExecuteCommand(); + query.executeCommand(); assertEquals("Running with type=" + queryType + " isUserAdmin=" + isUserAdmin + " isFiltered=" + isFiltered + " isInternalExecution=" + isInternalExecution + "\n " + "Query should succeed is: ", diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ValidateSessionQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ValidateSessionQueryTest.java index 9b30fab..462ca91 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ValidateSessionQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ValidateSessionQueryTest.java @@ -16,7 +16,7 @@ when(params.getSessionId()).thenReturn("good_session_id"); when(getQuery().getSessionUser("good_session_id")).thenReturn(new VdcUser(Guid.NewGuid(), "myUser", "myDomain")); - getQuery().Execute(); + getQuery().execute(); assertTrue(getQuery().getQueryReturnValue().getSucceeded()); assertTrue(getQuery().getQueryReturnValue().getReturnValue() instanceof VdcUser); VdcUser user = (VdcUser) getQuery().getQueryReturnValue().getReturnValue(); @@ -28,7 +28,7 @@ public void testUnsuccessfulSessionId() { when(params.getSessionId()).thenReturn("bad_session_id"); - getQuery().Execute(); + getQuery().execute(); assertFalse(getQuery().getQueryReturnValue().getSucceeded()); } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcCommandBase.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcCommandBase.java index f556a6f..106ef51 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcCommandBase.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcCommandBase.java @@ -20,12 +20,12 @@ public void setReturnValue(Object value) { } - public void Execute() { + public void execute() { String logId = LoggedUtils.getObjectId(this); LoggedUtils.logEntry(log, logId, this); try { - ExecuteCommand(); + executeCommand(); LoggedUtils.logReturn(log, logId, this, getReturnValue()); } catch (Exception e) { LoggedUtils.logError(log, logId, this, e); @@ -41,10 +41,10 @@ return getClass().getSimpleName(); } - protected abstract void ExecuteCommand(); + protected abstract void executeCommand(); - public Object ExecuteWithReturnValue() { - Execute(); + public Object executeWithReturnValue() { + execute(); return getReturnValue(); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java index ef3b43e..958fdec 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java @@ -48,7 +48,7 @@ createVmFromSysPrepParam.setSysPrepParams(getParameters().getSysPrepParams()); command = new CreateVmFromSysPrepVDSCommand<CreateVmFromSysPrepVDSCommandParameters>(createVmFromSysPrepParam); - command.Execute(); + command.execute(); if (command.getVDSReturnValue().getSucceeded()) { vm.setInitialized(true); saveSetInitializedToDb(vm.getId()); @@ -58,7 +58,7 @@ } else { // normal run. command = new CreateVDSCommand<CreateVmVDSCommandParameters>(getParameters()); - command.Execute(); + command.execute(); HandleCommandResult(command); vm.setInitialized(true); saveSetInitializedToDb(vm.getId()); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/DestroyVmVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/DestroyVmVDSCommand.java index d3a987a..d309b89 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/DestroyVmVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/DestroyVmVDSCommand.java @@ -32,7 +32,7 @@ DestroyVDSCommand<DestroyVmVDSCommandParameters> vdsBrokerCommand = new DestroyVDSCommand<DestroyVmVDSCommandParameters>(parameters); - vdsBrokerCommand.Execute(); + vdsBrokerCommand.execute(); if (vdsBrokerCommand.getVDSReturnValue().getSucceeded()) { if (curVm.getStatus() == VMStatus.Down) { getVDSReturnValue().setReturnValue(VMStatus.Down); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/MigrateVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/MigrateVDSCommand.java index 996c379..7e3c001 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/MigrateVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/MigrateVDSCommand.java @@ -26,7 +26,7 @@ VMStatus retval; MigrateBrokerVDSCommand<MigrateVDSCommandParameters> command = new MigrateBrokerVDSCommand<MigrateVDSCommandParameters>(parameters); - command.Execute(); + command.execute(); VDSReturnValue vdsReturnValue = command.getVDSReturnValue(); final VM vm = DbFacade.getInstance().getVmDao().get(parameters.getVmId()); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java index f444a61..ac3dc4c 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java @@ -371,7 +371,7 @@ VDSCommandBase<P> command = CreateCommand(commandType, parameters); if (command != null) { - command.Execute(); + command.execute(); return command.getVDSReturnValue(); } @@ -383,7 +383,7 @@ FutureVDSCommand<P> command = createFutureCommand(commandType, parameters); if (command != null) { - command.Execute(); + command.execute(); return command; } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResumeVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResumeVDSCommand.java index 1e95549..0a49ff5 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResumeVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResumeVDSCommand.java @@ -19,7 +19,7 @@ VMStatus retval = VMStatus.Unknown; ResumeBrokerVDSCommand<VdsAndVmIDVDSParametersBase> command = new ResumeBrokerVDSCommand<VdsAndVmIDVDSParametersBase>(parameters); - command.Execute(); + command.execute(); if (command.getVDSReturnValue().getSucceeded()) { retval = VMStatus.PoweringUp; ResourceManager.getInstance().AddAsyncRunningVm(parameters.getVmId()); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VDSCommandBase.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VDSCommandBase.java index ea88c1b..f0ed060 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VDSCommandBase.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VDSCommandBase.java @@ -52,7 +52,7 @@ } @Override - protected void ExecuteCommand() { + protected void executeCommand() { try { // creating ReturnValue object since execute can be called more than once (failover) // and we want returnValue clean from last run. diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java index 9ece774..95a0fe0 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java @@ -518,7 +518,7 @@ VDS oldVDS = vds.clone(); GetCapabilitiesVDSCommand vdsBrokerCommand = new GetCapabilitiesVDSCommand( new VdsIdAndVdsVDSCommandParametersBase(vds)); - vdsBrokerCommand.Execute(); + vdsBrokerCommand.execute(); if (vdsBrokerCommand.getVDSReturnValue().getSucceeded()) { // Verify version capabilities HashSet<Version> hostVersions = null; diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java index a5ce436..fd33d56 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java @@ -551,7 +551,7 @@ // get statistics data, images checks and vm_count data (dynamic) GetStatsVDSCommand<VdsIdAndVdsVDSCommandParametersBase> vdsBrokerCommand = new GetStatsVDSCommand<VdsIdAndVdsVDSCommandParametersBase>(new VdsIdAndVdsVDSCommandParametersBase(_vds)); - vdsBrokerCommand.Execute(); + vdsBrokerCommand.execute(); if (!vdsBrokerCommand.getVDSReturnValue().getSucceeded() && vdsBrokerCommand.getVDSReturnValue().getExceptionObject() != null) { VDSNetworkException ex = @@ -919,7 +919,7 @@ command = new GetAllVmStatsVDSCommand<VdsIdAndVdsVDSCommandParametersBase>( new VdsIdAndVdsVDSCommandParametersBase(_vds)); } - _runningVms = (Map<Guid, VmInternalData>) command.ExecuteWithReturnValue(); + _runningVms = (Map<Guid, VmInternalData>) command.executeWithReturnValue(); if (command.getVDSReturnValue().getSucceeded()) { List<VM> running = checkVmsStatusChanged(); @@ -1066,7 +1066,7 @@ */ protected XmlRpcStruct[] getVmInfo(List<String> vmsToUpdate) { return (XmlRpcStruct[]) (new FullListVdsCommand<FullListVDSCommandParameters>( - new FullListVDSCommandParameters(_vds.getId(), vmsToUpdate)).ExecuteWithReturnValue()); + new FullListVDSCommandParameters(_vds.getId(), vmsToUpdate)).executeWithReturnValue()); } private boolean shouldLogDeviceDetails(String deviceType) { @@ -1225,7 +1225,7 @@ GetVmStatsVDSCommand<GetVmStatsVDSCommandParameters> command = new GetVmStatsVDSCommand<GetVmStatsVDSCommandParameters>(new GetVmStatsVDSCommandParameters( _vds, runningVm.getId())); - command.Execute(); + command.execute(); if (command.getVDSReturnValue().getSucceeded()) { _runningVms.put(runningVm.getId(), (VmInternalData) command.getReturnValue()); @@ -1271,7 +1271,7 @@ DestroyVDSCommand<DestroyVmVDSCommandParameters> vdsBrokerCommand = new DestroyVDSCommand<DestroyVmVDSCommandParameters>(new DestroyVmVDSCommandParameters( _vds.getId(), vm.getId(), false, false, 0)); - vdsBrokerCommand.Execute(); + vdsBrokerCommand.execute(); if (vmTo != null && status == VMStatus.SavingState) { afterSuspendTreatment(vm); @@ -1353,7 +1353,7 @@ true, false, 0)); - destroyCmd.Execute(); + destroyCmd.execute(); if (destroyCmd.getVDSReturnValue().getSucceeded()) { log.infoFormat("Stopped migrating vm: {0} on vds: {1}", curVm.getVmName(), curVm.getmigrating_to_vds()); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java index 254a022..76d1ae1 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java @@ -1488,7 +1488,7 @@ .<Integer> GetValue(ConfigValues.SpmCommandFailOverRetries) - 1) && getCurrentIrsProxyData().getHasVdssForSpmSelection() && getCurrentIrsProxyData().failover()) { _failoverCounter++; - ExecuteCommand(); + executeCommand(); } else { getVDSReturnValue().setSucceeded(false); } diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java index 31a3b31..1859195 100644 --- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java +++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java @@ -57,7 +57,7 @@ Collections.<String> emptySet(), Arrays.asList(nic, vlan)); - createCommand(parameters).Execute(); + createCommand(parameters).execute(); verifyMethodPassedToHost(); Map<String, String> networkStruct = assertNeworkWasSent(net); @@ -83,7 +83,7 @@ Collections.<String> emptySet(), ifaces); - createCommand(parameters).Execute(); + createCommand(parameters).execute(); verifyMethodPassedToHost(); assertBondWasSent(bond, slaves); @@ -104,7 +104,7 @@ Collections.<String> emptySet(), Arrays.asList(nic)); - createCommand(parameters).Execute(); + createCommand(parameters).execute(); verifyMethodPassedToHost(); Map<String, String> networkStruct = assertNeworkWasSent(net); @@ -128,7 +128,7 @@ Collections.<String> emptySet(), ifaces); - createCommand(parameters).Execute(); + createCommand(parameters).execute(); verifyMethodPassedToHost(); Map<String, Object> bondMap = assertBondWasSent(bond, slaves); -- To view, visit http://gerrit.ovirt.org/12113 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8bc158016c90d5d029eaa7be2cb6331206ea3339 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
