[Engine-patches] Change in ovirt-engine[master]: engine: Use conditional execution to skip can-do-action

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: engine: Use conditional execution to skip can-do-action
......................................................................

engine: Use conditional execution to skip can-do-action

If only comment or description of a network is updated,
the update shouldn't be blocked, hence the rest of the
validations should be skipped.

Change-Id: I3c6302111e567e8b4febaff93bfdae5d651cea94
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
1 file changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/35034/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
index 7e51dcc..6ff3da2 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
@@ -38,6 +38,7 @@
 import org.ovirt.engine.core.common.errors.VdcBLLException;
 import org.ovirt.engine.core.common.errors.VdcBllErrors;
 import org.ovirt.engine.core.common.errors.VdcBllMessages;
+import org.ovirt.engine.core.common.job.StepEnum;
 import org.ovirt.engine.core.common.validation.group.UpdateEntity;
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
@@ -115,10 +116,6 @@
 
     @Override
     protected boolean canDoAction() {
-        if (onlyPermittedFieldsChanged() && allowedNetworkLabelManipulation()) 
{
-            return true;
-        }
-
         NetworkValidator validatorNew = new NetworkValidator(getNetwork());
         UpdateNetworkValidator validatorOld = new 
UpdateNetworkValidator(getOldNetwork());
         return validate(validatorNew.dataCenterExists())
@@ -184,6 +181,11 @@
         return super.getValidationGroups();
     }
 
+    @Override
+    protected void markCommandStepsToSkip() {
+        skip(StepEnum.VALIDATING).when(onlyPermittedFieldsChanged() && 
allowedNetworkLabelManipulation());
+    }
+
     private Network getOldNetwork() {
         if (oldNetwork == null) {
             oldNetwork = getNetworkDAO().get(getNetwork().getId());


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

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