[Engine-patches] Change in ovirt-engine[master]: core: minor refactoring in UpdateVmCommand#canDoAction

[ahadas]

Arik Hadas has uploaded a new change for review.

Change subject: core: minor refactoring in UpdateVmCommand#canDoAction
......................................................................

core: minor refactoring in UpdateVmCommand#canDoAction

Use CommandBase#failCanDoAction instead of
CommandBase#addCanDoActionMessage.

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/25774/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
index 9cfa278..ecd8c1e 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
@@ -246,8 +246,7 @@
         VM vmFromParams = getParameters().getVm();
 
         if (!isVmExist()) {
-            
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_NOT_EXIST);
-            return false;
+            return 
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_NOT_EXIST);
         }
 
         if (!canRunActionOnNonManagedVm()) {
@@ -255,15 +254,13 @@
         }
 
         if (StringUtils.isEmpty(vmFromParams.getName())) {
-            
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_MAY_NOT_BE_EMPTY);
-            return false;
+            return 
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_NAME_MAY_NOT_BE_EMPTY);
         }
 
         // check that VM name is not too long
         boolean vmNameValidLength = isVmNameValidLength(vmFromParams);
         if (!vmNameValidLength) {
-            
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_LENGTH_IS_TOO_LONG);
-            return false;
+            return 
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_NAME_LENGTH_IS_TOO_LONG);
         }
 
         // Checking if a desktop with same name already exists
@@ -271,8 +268,7 @@
             boolean exists = isVmWithSameNameExists(vmFromParams.getName());
 
             if (exists) {
-                
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
-                return false;
+                return 
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED);
             }
         }
 
@@ -297,13 +293,11 @@
         }
 
         if (!areUpdatedFieldsLegal()) {
-            
addCanDoActionMessage(VdcBllMessages.VM_CANNOT_UPDATE_ILLEGAL_FIELD);
-            return false;
+            return 
failCanDoAction(VdcBllMessages.VM_CANNOT_UPDATE_ILLEGAL_FIELD);
         }
 
         if (!vmFromDB.getVdsGroupId().equals(vmFromParams.getVdsGroupId())) {
-            addCanDoActionMessage(VdcBllMessages.VM_CANNOT_UPDATE_CLUSTER);
-            return false;
+            return failCanDoAction(VdcBllMessages.VM_CANNOT_UPDATE_CLUSTER);
         }
 
         if (!isDedicatedVdsOnSameCluster(vmFromParams.getStaticData())) {
@@ -328,8 +322,7 @@
         }
 
         if (vmFromDB.getVmPoolId() != null && vmFromParams.isStateless()) {
-            
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_FROM_POOL_CANNOT_BE_STATELESS);
-            return false;
+            return 
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_FROM_POOL_CANNOT_BE_STATELESS);
         }
 
         if (!AddVmCommand.checkCpuSockets(vmFromParams.getNumOfSockets(),
@@ -391,14 +384,12 @@
 
         if (getParameters().isConsoleEnabled() != null && !getVm().isDown()
                 && vmDeviceChanged(VmDeviceGeneralType.CONSOLE, 
getParameters().isConsoleEnabled())) {
-            addCanDoActionMessage("$device console");
-            return 
failCanDoAction(VdcBllMessages.VM_CANNOT_UPDATE_DEVICE_VM_NOT_DOWN);
+            return 
failCanDoAction(VdcBllMessages.VM_CANNOT_UPDATE_DEVICE_VM_NOT_DOWN, "$device 
console");
         }
 
         if (getParameters().isSoundDeviceEnabled() != null && !getVm().isDown()
                 && vmDeviceChanged(VmDeviceGeneralType.SOUND, 
getParameters().isSoundDeviceEnabled())) {
-            addCanDoActionMessage("$device sound");
-            return 
failCanDoAction(VdcBllMessages.VM_CANNOT_UPDATE_DEVICE_VM_NOT_DOWN);
+            return 
failCanDoAction(VdcBllMessages.VM_CANNOT_UPDATE_DEVICE_VM_NOT_DOWN, "$device 
sound");
         }
 
         if (!isCpuSharesValid(vmFromParams)) {
@@ -432,8 +423,7 @@
                 && vmDeviceChanged(VmDeviceGeneralType.CONTROLLER,
                         VmDeviceType.VIRTIOSCSI.getName(),
                         getParameters().isVirtioScsiEnabled())) {
-            addCanDoActionMessage("$device VirtIO-SCSI");
-            return 
failCanDoAction(VdcBllMessages.VM_CANNOT_UPDATE_DEVICE_VM_NOT_DOWN);
+            return 
failCanDoAction(VdcBllMessages.VM_CANNOT_UPDATE_DEVICE_VM_NOT_DOWN, "$device 
VirtIO-SCSI");
         }
 
         return true;


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b8056dc31c3ae61dc70ff0ca6073797bcd13671
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