Alissa Bonas has uploaded a new change for review. Change subject: core: rename methods to lowercase in vds commands ......................................................................
core: rename methods to lowercase in vds commands Change-Id: I4fec2ef0f640a621cd520b4f23c8aea30a8dd67f Signed-off-by: Alissa Bonas <abo...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetNonOperationalVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java 3 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/88/19288/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceVdsCommand.java index 8ce9b57..8d60974 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceVdsCommand.java @@ -60,7 +60,7 @@ setSucceeded(true); } else { orderListOfRunningVmsOnVds(getVdsId()); - setSucceeded(MigrateAllVms(getExecutionContext())); + setSucceeded(migrateAllVms(getExecutionContext())); // if non responsive move directly to maintenance if (getVds().getStatus() == VDSStatus.NonResponsive @@ -91,14 +91,14 @@ /** * Note: you must call {@link #orderListOfRunningVmsOnVds(Guid)} before calling this method */ - protected boolean MigrateAllVms(ExecutionContext parentContext) { - return MigrateAllVms(parentContext, false); + protected boolean migrateAllVms(ExecutionContext parentContext) { + return migrateAllVms(parentContext, false); } /** * Note: you must call {@link #orderListOfRunningVmsOnVds(Guid)} before calling this method */ - protected boolean MigrateAllVms(ExecutionContext parentContext, boolean HAOnly) { + protected boolean migrateAllVms(ExecutionContext parentContext, boolean HAOnly) { boolean succeeded = true; @@ -139,7 +139,7 @@ @Override protected boolean canDoAction() { - return CanMaintenanceVds(getVdsId(), getReturnValue().getCanDoActionMessages()); + return canMaintenanceVds(getVdsId(), getReturnValue().getCanDoActionMessages()); } @Override @@ -159,7 +159,7 @@ } } - public boolean CanMaintenanceVds(Guid vdsId, java.util.ArrayList<String> reasons) { + public boolean canMaintenanceVds(Guid vdsId, java.util.ArrayList<String> reasons) { boolean returnValue = true; // VDS vds = ResourceManager.Instance.getVds(vdsId); VDS vds = DbFacade.getInstance().getVdsDao().get(vdsId); @@ -183,7 +183,7 @@ return returnValue; } - public static void ProcessStorageOnVdsInactive(final VDS vds) { + public static void processStorageOnVdsInactive(final VDS vds) { // Clear the problematic timers since the VDS is in maintenance so it doesn't make sense to check it // anymore. diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetNonOperationalVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetNonOperationalVdsCommand.java index 7d6b710..5bd2eae 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetNonOperationalVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetNonOperationalVdsCommand.java @@ -52,10 +52,10 @@ // migrate vms according to cluster migrateOnError option switch (getVdsGroup().getMigrateOnError()) { case YES: - MigrateAllVms(getExecutionContext()); + migrateAllVms(getExecutionContext()); break; case HA_ONLY: - MigrateAllVms(getExecutionContext(), true); + migrateAllVms(getExecutionContext(), true); break; default: break; 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 34bc364..c4dfa28 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 @@ -65,7 +65,7 @@ @Override public void vdsMovedToMaintenance(VDS vds) { try { - MaintenanceVdsCommand.ProcessStorageOnVdsInactive(vds); + MaintenanceVdsCommand.processStorageOnVdsInactive(vds); } finally { ExecutionHandler.updateSpecificActionJobCompleted(vds.getId(), VdcActionType.MaintenanceVds, true); } -- To view, visit http://gerrit.ovirt.org/19288 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4fec2ef0f640a621cd520b4f23c8aea30a8dd67f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <abo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches