Juan Hernandez has uploaded a new change for review. Change subject: restapi: Allow both and "type" and "data" ......................................................................
restapi: Allow both and "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 <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/25066/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd index 7ca5248..163a0ea 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd @@ -2482,11 +2482,12 @@ </xs:complexType> <xs:element name="configuration" type="Configuration"/> + <xs:complexType name="Configuration"> - <xs:choice> - <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="1"/> - <xs:element name="data" type="xs:string" minOccurs="0" maxOccurs="1"/> - </xs:choice> + <xs:sequence> + <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="data" type="xs:string" minOccurs="0" maxOccurs="1"/> + </xs:sequence> </xs:complexType> <xs:element name="initialization" type="Initialization"/> -- To view, visit http://gerrit.ovirt.org/25066 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d67b5b14b908c503c1e7d7fffb2a303cc026557 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
