Change in ovirt-engine[ovirt-engine-3.6]: core: prevent duplicate watchdog device on new vm

[tnisan at redhat.com]

Tal Nisan has submitted this change and it was merged.

Change subject: core: prevent duplicate watchdog device on new vm
......................................................................


core: prevent duplicate watchdog device on new vm

When a template is set with watchdog device and the user creates a
VM from that template, the VM ends up with 2 watchdog devices:
1. The one that was copied from the template
2. Additional device that is added by AddVmCommand#addVmWatchdog

The solution is not to add another watchdog device if one is already
defined in the template.

Change-Id: I1280cb9fe3f9e9047c796bf54cb05dceda4ff43f
Bug-Url: https://bugzilla.redhat.com/1304676
Signed-off-by: Arik Hadas <ahadas at redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateWatchdogCommand.java
2 files changed, 15 insertions(+), 5 deletions(-)

Approvals:
  Tal Nisan: Passed CI tests
  Shahar Havivi: Looks good to me, approved
  Arik Hadas: Verified



-- 
To view, visit https://gerrit.ovirt.org/54291
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1280cb9fe3f9e9047c796bf54cb05dceda4ff43f
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Arik Hadas <ahadas at redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Shahar Havivi <shavivi at redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>