Juan Hernandez has uploaded a new change for review.
Change subject: restapi: Avoid permissions in VmBase
......................................................................
restapi: Avoid permissions in VmBase
A recent change (commit d2aa338) refactored the XML schema to simplify
the VM and template entities using a shared base type. Unfortunately
this change makes it impossible to generate the Java SDK, as it
generates conflicting get methods for the permissions sub collection.
Changing the Java SDK code generator to avoid this is possible but risky
for 3.5, so this patch changes the XML schema moving the "permissions"
property from the shared base type to the derived VM and template types.
This isn't ideal, but avoids the issue in the generator of the Java SDK.
Change-Id: I5aed6471a4f77a6df41ebd298f35807fbec616e1
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M
backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/32248/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 d0a8692..a64a831 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
@@ -2675,6 +2675,7 @@
<xs:element ref="vm" minOccurs="0" maxOccurs="1"/>
<!-- also rel="cdroms/disks/nics/watchdogs" links, see Devices below
-->
<xs:element name="version" type="TemplateVersion" minOccurs="0"
maxOccurs="1"/>
+ <xs:element ref="permissions" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -3070,7 +3071,6 @@
<xs:element name="tunnel_migration" type="xs:boolean" minOccurs="0"
maxOccurs="1"/>
<xs:element name="migration_downtime" type="xs:int" minOccurs="0"
maxOccurs="1" />
<xs:element ref="virtio_scsi" minOccurs="0" maxOccurs="1"/>
- <xs:element ref="permissions" minOccurs="0" maxOccurs="1"/>
<xs:element ref="serial_number" minOccurs="0" maxOccurs="1" />
<xs:element name="start_paused" type="xs:boolean" minOccurs="0"
maxOccurs="1" />
<xs:element ref="cpu_profile" minOccurs="0" maxOccurs="1"/>
@@ -3130,6 +3130,7 @@
<xs:element name="use_latest_template_version" type="xs:boolean"
minOccurs="0" maxOccurs="1"/>
<xs:element name="next_run_configuration_exists" type="xs:boolean"
minOccurs="0" maxOccurs="1"/>
<xs:element name="numa_tune_mode" type="xs:string" minOccurs="0"
maxOccurs="1"/>
+ <xs:element ref="permissions" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
--
To view, visit http://gerrit.ovirt.org/32248
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5aed6471a4f77a6df41ebd298f35807fbec616e1
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
