[Engine-patches] Change in ovirt-engine[master]: core: minor refactoring in RemoveVmCommand

[ahadas]

Arik Hadas has uploaded a new change for review.

Change subject: core: minor refactoring in RemoveVmCommand
......................................................................

core: minor refactoring in RemoveVmCommand

Change-Id: I1884a595320ac54a26d681c54770274f831ce849
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
1 file changed, 15 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/28866/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
index 6dce14b..4c440f1 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
@@ -164,35 +164,13 @@
             return false;
         }
 
-        return (super.canDoAction() && canRemoveVm());
-    }
-
-    @Override
-    protected void setActionMessageParameters() {
-        addCanDoActionMessage(VdcBllMessages.VAR__ACTION__REMOVE);
-        addCanDoActionMessage(VdcBllMessages.VAR__TYPE__VM);
-    }
-
-    public static boolean isVmRunning(Guid vmId) {
-        VM vm = DbFacade.getInstance().getVmDao().get(vmId);
-        if (vm != null) {
-            return vm.isRunningOrPaused() || vm.getStatus() == 
VMStatus.Unknown;
-        }
-        return false;
-    }
-
-    private boolean isVmInPool(Guid vmId) {
-        return getVm().getVmPoolId() != null;
-    }
-
-    private boolean canRemoveVm() {
         if (isVmRunning(getVmId()) || (getVm().getStatus() == 
VMStatus.NotResponding)) {
             return 
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_RUNNING);
         }
         if (getVm().getStatus() == VMStatus.Suspended) {
             return 
failCanDoAction(VdcBllMessages.VM_CANNOT_REMOVE_VM_WHEN_STATUS_IS_NOT_DOWN);
         }
-        if (isVmInPool(getVmId())) {
+        if (getVm().getVmPoolId() != null) {
             return 
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_ATTACHED_TO_POOL);
         }
 
@@ -247,6 +225,20 @@
         return true;
     }
 
+    @Override
+    protected void setActionMessageParameters() {
+        addCanDoActionMessage(VdcBllMessages.VAR__ACTION__REMOVE);
+        addCanDoActionMessage(VdcBllMessages.VAR__TYPE__VM);
+    }
+
+    public static boolean isVmRunning(Guid vmId) {
+        VM vm = DbFacade.getInstance().getVmDao().get(vmId);
+        if (vm != null) {
+            return vm.isRunningOrPaused() || vm.getStatus() == 
VMStatus.Unknown;
+        }
+        return false;
+    }
+
     private boolean canRemoveVmWithDetachDisks() {
         if (!Guid.Empty.equals(getVm().getVmtGuid())) {
             return 
failCanDoAction(VdcBllMessages.VM_CANNOT_REMOVE_WITH_DETACH_DISKS_BASED_ON_TEMPLATE);


-- 
To view, visit http://gerrit.ovirt.org/28866
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1884a595320ac54a26d681c54770274f831ce849
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches