Alissa Bonas has uploaded a new change for review. Change subject: core: rename method to lowercase in VmPoolHandler ......................................................................
core: rename method to lowercase in VmPoolHandler Change-Id: I3508a78bfb15a39c41eb8147f83297fd4b4456bf Signed-off-by: Alissa Bonas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java 7 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/21370/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java index 22cc83c..438145c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java @@ -256,7 +256,7 @@ } } else - // Pool-snapshot is gone (probably due to ProcessVmPoolOnStopVm + // Pool-snapshot is gone (probably due to processVmPoolOnStopVm // treatment) -> // no point in running the VM or trying to run again the endAction // method: diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java index 1a8a5cd..9c0d5ef 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java @@ -61,7 +61,7 @@ LogSettingVmToDown(getVds().getId(), vm.getId()); } - VmPoolHandler.ProcessVmPoolOnStopVm(vm.getId(), + VmPoolHandler.processVmPoolOnStopVm(vm.getId(), ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java index a42003a..2b56d12 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java @@ -464,7 +464,7 @@ setVmId(vm.getId()); setVmName(vm.getName()); setVm(vm); - VmPoolHandler.ProcessVmPoolOnStopVm(vm.getId(), + VmPoolHandler.processVmPoolOnStopVm(vm.getId(), ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); // Handle highly available VMs diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java index 7e5ac16..25a962c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java @@ -420,7 +420,7 @@ private void removeVmStatlessImages() { isFailedStatlessSnapshot = true; - VmPoolHandler.ProcessVmPoolOnStopVm(getVm().getId(), new CommandContext(getExecutionContext(), getLock())); + VmPoolHandler.processVmPoolOnStopVm(getVm().getId(), new CommandContext(getExecutionContext(), getLock())); // setting lock to null in order not to release lock twice setLock(null); setSucceeded(true); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java index 617c100..6ee75e5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java @@ -147,7 +147,7 @@ } private void processVmPoolOnStopVm() { - VmPoolHandler.ProcessVmPoolOnStopVm(getVm().getId(), + VmPoolHandler.processVmPoolOnStopVm(getVm().getId(), ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java index bacb7ac..8f16fa4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java @@ -96,7 +96,7 @@ @Override public void processOnVmStop(Guid vmId) { - VmPoolHandler.ProcessVmPoolOnStopVm(vmId, null); + VmPoolHandler.processVmPoolOnStopVm(vmId, null); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java index e5d3543..6c16c68 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolHandler.java @@ -29,7 +29,7 @@ * must be treated as the real implementor of VdsEventListener.processOnVmStop meanwhile till a better * solution supplied */ - public static void ProcessVmPoolOnStopVm(Guid vmId, CommandContext context) { + public static void processVmPoolOnStopVm(Guid vmId, CommandContext context) { VmPoolMap map = DbFacade.getInstance().getVmPoolDao().getVmPoolMapByVmGuid(vmId); List<DbUser> users = DbFacade.getInstance().getDbUserDao().getAllForVm(vmId); // Check if this is a Vm from a Vm pool, and is attached to a user @@ -54,7 +54,7 @@ public static void removeVmStatelessImages(Guid vmId, CommandContext context) { if (DbFacade.getInstance().getSnapshotDao().exists(vmId, SnapshotType.STATELESS)) { - log.infoFormat("VdcBll.VmPoolHandler.ProcessVmPoolOnStopVm - Deleting snapshot for stateless vm {0}", vmId); + log.infoFormat("VdcBll.VmPoolHandler.processVmPoolOnStopVm - Deleting snapshot for stateless vm {0}", vmId); Backend.getInstance().runInternalAction(VdcActionType.RestoreStatelessVm, new VmOperationParameterBase(vmId), context); -- To view, visit http://gerrit.ovirt.org/21370 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3508a78bfb15a39c41eb8147f83297fd4b4456bf Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
