Itamar Heim has submitted this change and it was merged.
Change subject: restapi: Allow both "type" and "data"
......................................................................
restapi: Allow both "type" and "data"
The "type" and "data" elements used when importing a VM from a
configuration are both allowed and needed, but they are specified as a
XML schema "choice" instead of a "sequence". This patch fixes that.
Change-Id: I6d67b5b14b908c503c1e7d7fffb2a303cc026557
Bug-Url:
https://bugzilla.redhat.com/1069522
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
(cherry picked from commit 87b1d9acc9c5c1f01512b6b6e58aede9ad04b735)
---
M backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Ori Liel: Looks good to me, approved
Juan Hernandez: Verified
Oved Ourfali: Looks good to me, but someone else must approve
--
To view, visit
http://gerrit.ovirt.org/25076
To unsubscribe, visit
http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6d67b5b14b908c503c1e7d7fffb2a303cc026557
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Itamar Heim <iheim(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Ori Liel <oliel(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server