Oved Ourfali has uploaded a new change for review. Change subject: core: moving isManagedVm and related methods to the VM entity ......................................................................
core: moving isManagedVm and related methods to the VM entity Change-Id: Ia1ed04ea8a6430860fadc616c7c017ee1e2680ee Signed-off-by: Oved Ourfali <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java 2 files changed, 13 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/18283/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java index 920e2fd..2adbd1d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java @@ -20,7 +20,6 @@ import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.EditableField; import org.ovirt.engine.core.common.businessentities.EditableOnVmStatusField; -import org.ovirt.engine.core.common.businessentities.OriginType; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; import org.ovirt.engine.core.common.businessentities.StorageDomainType; @@ -574,24 +573,12 @@ public static ValidationResult canRunActionOnNonManagedVm(VM vm, VdcActionType actionType) { ValidationResult validationResult = ValidationResult.VALID; - if (!isManagedVm(vm)) { + if (!vm.isManagedVm()) { if (!COMMANDS_ALLOWED_ON_NON_MANAGED_VMS.contains(actionType)) { validationResult = new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_CANNOT_RUN_ACTION_ON_NON_MANAGED_VM); } } return validationResult; - } - - public static boolean isHostedEngine(VM vm) { - return OriginType.HOSTED_ENGINE.equals(vm.getOrigin()); - } - - public static boolean isExternalVm(VM vm) { - return OriginType.EXTERNAL.equals(vm.getOrigin()); - } - - public static boolean isManagedVm(VM vm) { - return !isHostedEngine(vm) && !isExternalVm(vm); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java index 7dedcda..6f7b671 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java @@ -1558,4 +1558,16 @@ vmDynamic.setLastWatchdogEvent(lastWatchdogEvent); } + public boolean isHostedEngine() { + return OriginType.HOSTED_ENGINE.equals(getOrigin()); + } + + public boolean isExternalVm() { + return OriginType.EXTERNAL.equals(getOrigin()); + } + + public boolean isManagedVm() { + return !isHostedEngine() && !isExternalVm(); + } + } -- To view, visit http://gerrit.ovirt.org/18283 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia1ed04ea8a6430860fadc616c7c017ee1e2680ee Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Oved Ourfali <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
