[Engine-patches] Change in ovirt-engine[master]: core: use setVmId or template

[rgolan]

Roy Golan has uploaded a new change for review.

Change subject: core: use setVmId or template
......................................................................

core: use setVmId or template

use the internal caching of entities for this command

Change-Id: Ia97195939c010b31ba26dcad4cc7347c3c25185f
Signed-off-by: Roy Golan <rgo...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractVmWatchdogCommand.java
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/WatchdogParameters.java
2 files changed, 8 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/22449/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractVmWatchdogCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractVmWatchdogCommand.java
index 6c66e65..f53e1f5 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractVmWatchdogCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractVmWatchdogCommand.java
@@ -51,7 +51,7 @@
 
     @Override
     protected boolean canDoAction() {
-        if (getParameters().getId() == null || !entityExists()) {
+        if (!entityExists()) {
             return failCanDoAction(getParameters().isVm() ? 
VdcBllMessages.ACTION_TYPE_FAILED_VM_NOT_FOUND
                     : 
VdcBllMessages.ACTION_TYPE_FAILED_TEMPLATE_DOES_NOT_EXIST);
         }
@@ -60,9 +60,11 @@
 
     protected boolean entityExists() {
         if (getParameters().isVm()) {
-            return getVmDAO().get(getParameters().getId()) != null;
+            setVmId(getParameters().getId());
+            return getVm() != null;
         } else {
-            return getVmTemplateDAO().get(getParameters().getId()) != null;
+            setVmTemplateId(getParameters().getId());
+            return getVmTemplate() != null;
         }
     }
 }
diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/WatchdogParameters.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/WatchdogParameters.java
index 6623b2e..c8a5435 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/WatchdogParameters.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/WatchdogParameters.java
@@ -4,12 +4,15 @@
 import org.ovirt.engine.core.common.businessentities.VmWatchdogType;
 import org.ovirt.engine.core.compat.Guid;
 
+import javax.validation.constraints.NotNull;
+
 public class WatchdogParameters extends VdcActionParametersBase {
     private static final long serialVersionUID = 8564973734004518462L;
     /**
      * true if the watchog must be set in the VM, false if it must be set in a 
template
      */
     boolean vm;
+    @NotNull
     Guid id;
     VmWatchdogAction action;
     VmWatchdogType model;


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

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