Change in ovirt-engine[master]: restapi: Don't override potentially existing configuration

[juan.hernandez at redhat.com]

Juan Hernandez has submitted this change and it was merged.

Change subject: restapi: Don't override potentially existing configuration
......................................................................


restapi: Don't override potentially existing configuration

Currently the mapping method that populates the configuration of a VM
(the OVF configuration, for example) doesn't take into account that it
may already contain other values, like cloud-init or sysprep
configuration.  As a result the existing configuration is completely
replaced, and a wrong result is returned to the user. This patch changes
that mapping method so that it uses the existing configuration should it
exist.

Change-Id: Ica89aac29e19e959f0a44402f2715f18de984c1f
Bug-Url: https://bugzilla.redhat.com/1218316
Signed-off-by: Juan Hernandez <juan.hernandez at redhat.com>
---
M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
1 file changed, 13 insertions(+), 5 deletions(-)

Approvals:
  Juan Hernandez: Verified; Looks good to me, approved
  Jenkins CI: Looks good to me, but someone else must approve



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ica89aac29e19e959f0a44402f2715f18de984c1f
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: Liron Aravot <laravot at redhat.com>
Gerrit-Reviewer: automation at ovirt.org