Change in ovirt-engine[master]: core: double cdrom and video devices if both template and in...

[ofrenkel at redhat.com]

Omer Frenkel has submitted this change and it was merged.

Change subject: core: double cdrom and video devices if both template and instance type used
......................................................................


core: double cdrom and video devices if both template and instance type used

The problem was that when both template and instance type is used, first
all the devices has been copied from the instance type using the
VmDeviceUtils.copyVmDevices (which creates by default also the cdrom and the
video devices). Than, the disk and and CD device is copied from the template
also using the VmDeviceUtils.copyVmDevices which again by default creates a new
CD and video device. This way they are duplicated.

Fixed by creating a new method VmDeviceUtils.copyDiskDevices() which makes sure
to copy only the disks and do not create any new devices and calling this
method instead of copyVmDevices.

Change-Id: Id6dfbced0b702f3ce0e71283b1e7c4b4cf2604f6
Bug-Url: https://bugzilla.redhat.com/1109880
Signed-off-by: Tomas Jelinek <tjelinek 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/utils/VmDeviceUtils.java
2 files changed, 22 insertions(+), 12 deletions(-)

Approvals:
  Tomas Jelinek: Verified
  Omer Frenkel: Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6dfbced0b702f3ce0e71283b1e7c4b4cf2604f6
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjelinek at redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel at redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server