Tomas Jelinek has submitted this change and it was merged. Change subject: engine: added proper instance type handling for the watchdog ...................................................................... engine: added proper instance type handling for the watchdog 1: Added support for adding the watchdog also for the UpdateTemplateCommand. 2: If the watchdog is added/updated on the instance type, the specific validation should not be run since you can add any device to the instance type. The proper validations are added only when creating the specific VM from the instance type. Change-Id: Ibd953828b7bc3ce1607377a7db28970f5ab7a03e Signed-off-by: Tomas Jelinek <tjelinek(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddWatchdogCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateWatchdogCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/WatchdogParameters.java 6 files changed, 81 insertions(+), 63 deletions(-) Approvals: Tomas Jelinek: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/25088 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd953828b7bc3ce1607377a7db28970f5ab7a03e Gerrit-PatchSet: 20 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <tjelinek(a)redhat.com&gt; Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com&gt; Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com&gt; Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com&gt; Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com&gt; Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com&gt; Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server