Change in ovirt-engine[master]: core: Handle correct NIC ID from OVF (#827061)

[mkolesni at redhat.com]

Mike Kolesnik has submitted this change and it was merged.

Change subject: core: Handle correct NIC ID from OVF (#827061)
......................................................................


core: Handle correct NIC ID from OVF (#827061)

https://bugzilla.redhat.com/827061

Someone forgot to handle NIC ID correctly, although they changed the
OVF format.
ID was added to NIC in the new OVF format, so need to set new ID only
if the OVF didn't contain ID for the nic.
Overriding the ID always would cause the VM Device for the NIC to be
added but not updated with actual data that was saved in the OVF.

Change-Id: Id842c8b4546e80676f8e8e023e0e66ff9cec5814
Signed-off-by: Mike Kolesnik <mkolesni at redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Mike Kolesnik: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id842c8b4546e80676f8e8e023e0e66ff9cec5814
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Mike Kolesnik <mkolesni at redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni at redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs at redhat.com>