Juan Hernandez has uploaded a new change for review.
Change subject: codegen: Add XML schema and RSDL from latest 3.4
......................................................................
codegen: Add XML schema and RSDL from latest 3.4
This patch adds the XML schema and RSDL documents obtained from the
latest build of the engine 3.4 branch, commit 715cb4.
Change-Id: Ia4042b46712b9a6162902c62463c6dbe5f6f296e
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M ovirt-engine-sdk-java-codegen/src/main/resources/api.rsdl
M ovirt-engine-sdk-java-codegen/src/main/resources/api.xsd
2 files changed, 429 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk-java
refs/changes/97/23697/1
diff --git a/ovirt-engine-sdk-java-codegen/src/main/resources/api.rsdl
b/ovirt-engine-sdk-java-codegen/src/main/resources/api.rsdl
index 45b5844..4cf9fbf 100644
--- a/ovirt-engine-sdk-java-codegen/src/main/resources/api.rsdl
+++ b/ovirt-engine-sdk-java-codegen/src/main/resources/api.rsdl
@@ -120,6 +120,9 @@
<name>cluster.trusted_service</name>
</parameter>
<parameter required="false" type="xs:boolean">
+ <name>cluster.ha_reservation</name>
+ </parameter>
+ <parameter required="false" type="xs:boolean">
<name>cluster.ballooning_enabled</name>
</parameter>
<parameter required="false" type="xs:string">
@@ -127,6 +130,9 @@
</parameter>
<parameter required="false" type="xs:string">
<name>cluster.display.proxy</name>
+ </parameter>
+ <parameter required="false" type="xs:boolean">
+ <name>cluster.ksm.enabled</name>
</parameter>
</parameters_set>
</body>
@@ -221,7 +227,7 @@
<body>
<type>Cluster</type>
<parameters_set>
- <description>update the specified cluster in the
system. The capabilities like virt servicem luster service, tarnsparent huge
pages etc can be changed.</description>
+ <description>update the specified cluster in the
system. The capabilities like virt service, cluster service, tarnsparent huge
pages etc can be changed.</description>
<parameter required="false" type="xs:string">
<name>cluster.name</name>
</parameter>
@@ -284,6 +290,9 @@
</parameter>
<parameter required="false" type="xs:string">
<name>cluster.display.proxy</name>
+ </parameter>
+ <parameter required="false" type="xs:boolean">
+ <name>cluster.ksm.enabled</name>
</parameter>
</parameters_set>
</body>
@@ -1137,7 +1146,7 @@
</request>
</link>
<link
href="/ovirt-engine/api/clusters/{cluster:id}/networks/{network:id}" rel="get">
- <description>get the detials of the specified network in the
cluster</description>
+ <description>get the details of the specified network in the
cluster</description>
<request>
<http_method>GET</http_method>
<body/>
@@ -1300,14 +1309,18 @@
<parameter required="true" type="xs:string">
<name>datacenter.name</name>
</parameter>
- <parameter required="true" type="xs:string">
- <name>datacenter.storage_type</name>
- </parameter>
<parameter required="true" type="xs:int">
<name>datacenter.version.major</name>
</parameter>
<parameter required="true" type="xs:int">
<name>datacenter.version.minor</name>
+ </parameter>
+ <parameter required="false" type="xs:string">
+ <name>datacenter.storage_type</name>
+ <deprecated>true</deprecated>
+ </parameter>
+ <parameter required="false" type="xs:boolean">
+ <name>datacenter.local</name>
</parameter>
<parameter required="false" type="xs:string">
<name>datacenter.description</name>
@@ -1441,6 +1454,10 @@
</parameter>
<parameter required="false" type="xs:string">
<name>datacenter.storage_type</name>
+ <deprecated>true</deprecated>
+ </parameter>
+ <parameter required="false" type="xs:boolean">
+ <name>datacenter.local</name>
</parameter>
<parameter required="false" type="xs:int">
<name>datacenter.version.major</name>
@@ -1536,6 +1553,9 @@
</parameter>
<parameter required="false" type="xs:string">
<name>cluster.display.proxy</name>
+ </parameter>
+ <parameter required="false" type="xs:boolean">
+ <name>cluster.ksm.enabled</name>
</parameter>
</parameters_set>
</body>
@@ -1675,6 +1695,9 @@
<name>cluster.trusted_service</name>
</parameter>
<parameter required="false" type="xs:boolean">
+ <name>cluster.ha_reservation</name>
+ </parameter>
+ <parameter required="false" type="xs:boolean">
<name>cluster.ballooning_enabled</name>
</parameter>
<parameter required="false" type="xs:string">
@@ -1682,6 +1705,9 @@
</parameter>
<parameter required="false" type="xs:string">
<name>cluster.display.proxy</name>
+ </parameter>
+ <parameter required="false" type="xs:boolean">
+ <name>cluster.ksm.enabled</name>
</parameter>
</parameters_set>
</body>
@@ -2288,6 +2314,58 @@
</request>
<response>
<type>Network</type>
+ </response>
+ </link>
+ <link
href="/ovirt-engine/api/datacenters/{datacenter:id}/networks/{network:id}/labels"
rel="add">
+ <request>
+ <http_method>POST</http_method>
+ <body>
+ <type>Label</type>
+ </body>
+ </request>
+ <response>
+ <type>Label</type>
+ </response>
+ </link>
+ <link
href="/ovirt-engine/api/datacenters/{datacenter:id}/networks/{network:id}/labels"
rel="get">
+ <description>get the labels of a network</description>
+ <request>
+ <http_method>GET</http_method>
+ <body/>
+ </request>
+ <response>
+ <type>Labels</type>
+ </response>
+ </link>
+ <link
href="/ovirt-engine/api/datacenters/{datacenter:id}/networks/{network:id}/labels/{label:id}"
rel="delete">
+ <description>delete the specified label of a network</description>
+ <request>
+ <http_method>DELETE</http_method>
+ <headers>
+ <header required="false">
+ <name>Correlation-Id</name>
+ <value>any string</value>
+ </header>
+ </headers>
+ <url>
+ <parameters_set>
+ <parameter required="false" type="xs:boolean"
context="matrix">
+ <name>async</name>
+ <value>true|false</value>
+ </parameter>
+ </parameters_set>
+ </url>
+ <body/>
+ </request>
+ </link>
+ <link
href="/ovirt-engine/api/datacenters/{datacenter:id}/networks/{network:id}/labels/{label:id}"
rel="get">
+ <description>get a specific label of a network</description>
+ <request>
+ <http_method>GET</http_method>
+ <body/>
+ </request>
+ <response>
+ <type>Label</type>
</response>
</link>
<link
href="/ovirt-engine/api/datacenters/{datacenter:id}/networks/{network:id}/permissions"
rel="add">
@@ -2920,7 +2998,7 @@
</response>
</link>
<link href="/ovirt-engine/api/disks" rel="add">
- <description>add a new disk the system</description>
+ <description>add a new disk to the system</description>
<request>
<http_method>POST</http_method>
<headers>
@@ -2940,7 +3018,7 @@
<body>
<type>Disk</type>
<parameters_set>
- <description>add a new disk the system with specified
size, space will be allocated from the storage domain for the disk</description>
+ <description>add a new disk to the system with
specified size, space will be allocated from the storage domain for the
disk</description>
<parameter required="true" type="xs:int">
<name>provisioned_size</name>
</parameter>
@@ -2984,7 +3062,7 @@
</parameter>
</parameters_set>
<parameters_set>
- <description>add a new lun disk the system, this
operation does not require size but requires lun connection
details</description>
+ <description>add a new lun disk to the system, this
operation does not require size but requires lun connection
details</description>
<parameter required="true" type="xs:string">
<name>disk.interface</name>
</parameter>
@@ -3127,7 +3205,7 @@
</response>
</link>
<link href="/ovirt-engine/api/disks/{disk:id}/permissions" rel="get">
- <description>get the list of permission for the disk in the
system. Disk inherits permissions from the VM it is attached to and from the
storage domain it resides on (if there is one)</description>
+ <description>get the list of permissions for the disk in the
system. Disk inherits permissions from the VM it is attached to and from the
storage domain it resides on (if there is one)</description>
<request>
<http_method>GET</http_method>
<url>
@@ -3860,6 +3938,9 @@
<parameter required="false" type="xs:string">
<name>host.power_management.username</name>
</parameter>
+ <parameter required="false" type="xs:boolean">
+
<name>host.power_management.automatic_pm_enabled</name>
+ </parameter>
<parameter required="false" type="xs:string">
<name>host.power_management.password</name>
</parameter>
@@ -3957,6 +4038,9 @@
</parameter>
<parameter required="false" type="xs:string">
<name>host.power_management.type</name>
+ </parameter>
+ <parameter required="false" type="xs:boolean">
+
<name>host.power_management.automatic_pm_enabled</name>
</parameter>
<parameter required="false" type="xs:boolean">
<name>host.power_management.enabled</name>
@@ -4191,6 +4275,9 @@
<parameter required="false" type="xs:string">
<name>host.power_management.password</name>
</parameter>
+ <parameter required="false" type="xs:boolean">
+
<name>host.power_management.automatic_pm_enabled</name>
+ </parameter>
<parameter required="false" type="collection">
<name>host.power_management.options.option</name>
<parameters_set>
@@ -4273,6 +4360,9 @@
</parameter>
<parameter required="false" type="xs:string">
<name>host.power_management.type</name>
+ </parameter>
+ <parameter required="false" type="xs:boolean">
+
<name>host.power_management.automatic_pm_enabled</name>
</parameter>
<parameter required="false" type="xs:boolean">
<name>host.power_management.enabled</name>
@@ -5021,6 +5111,58 @@
<type>Action</type>
</response>
</link>
+ <link href="/ovirt-engine/api/hosts/{host:id}/nics/{nic:id}/labels"
rel="add">
+ <request>
+ <http_method>POST</http_method>
+ <body>
+ <type>Label</type>
+ </body>
+ </request>
+ <response>
+ <type>Label</type>
+ </response>
+ </link>
+ <link href="/ovirt-engine/api/hosts/{host:id}/nics/{nic:id}/labels"
rel="get">
+ <description>get the labels of an interface</description>
+ <request>
+ <http_method>GET</http_method>
+ <body/>
+ </request>
+ <response>
+ <type>Labels</type>
+ </response>
+ </link>
+ <link
href="/ovirt-engine/api/hosts/{host:id}/nics/{nic:id}/labels/{label:id}"
rel="delete">
+ <description>delete the specified label of an
interface</description>
+ <request>
+ <http_method>DELETE</http_method>
+ <headers>
+ <header required="false">
+ <name>Correlation-Id</name>
+ <value>any string</value>
+ </header>
+ </headers>
+ <url>
+ <parameters_set>
+ <parameter required="false" type="xs:boolean"
context="matrix">
+ <name>async</name>
+ <value>true|false</value>
+ </parameter>
+ </parameters_set>
+ </url>
+ <body/>
+ </request>
+ </link>
+ <link
href="/ovirt-engine/api/hosts/{host:id}/nics/{nic:id}/labels/{label:id}"
rel="get">
+ <description>get a specific label of an interface</description>
+ <request>
+ <http_method>GET</http_method>
+ <body/>
+ </request>
+ <response>
+ <type>Label</type>
+ </response>
+ </link>
<link
href="/ovirt-engine/api/hosts/{host:id}/nics/{nic:id}/statistics" rel="get">
<description>get the statistics for the network interface card
attached to the specified host</description>
<request>
@@ -5717,6 +5859,58 @@
</request>
<response>
<type>Network</type>
+ </response>
+ </link>
+ <link href="/ovirt-engine/api/networks/{network:id}/labels" rel="add">
+ <request>
+ <http_method>POST</http_method>
+ <body>
+ <type>Label</type>
+ </body>
+ </request>
+ <response>
+ <type>Label</type>
+ </response>
+ </link>
+ <link href="/ovirt-engine/api/networks/{network:id}/labels" rel="get">
+ <description>get the labels of a network</description>
+ <request>
+ <http_method>GET</http_method>
+ <body/>
+ </request>
+ <response>
+ <type>Labels</type>
+ </response>
+ </link>
+ <link href="/ovirt-engine/api/networks/{network:id}/labels/{label:id}"
rel="delete">
+ <description>delete the specified label of a network</description>
+ <request>
+ <http_method>DELETE</http_method>
+ <headers>
+ <header required="false">
+ <name>Correlation-Id</name>
+ <value>any string</value>
+ </header>
+ </headers>
+ <url>
+ <parameters_set>
+ <parameter required="false" type="xs:boolean"
context="matrix">
+ <name>async</name>
+ <value>true|false</value>
+ </parameter>
+ </parameters_set>
+ </url>
+ <body/>
+ </request>
+ </link>
+ <link href="/ovirt-engine/api/networks/{network:id}/labels/{label:id}"
rel="get">
+ <description>get a specific label of a network</description>
+ <request>
+ <http_method>GET</http_method>
+ <body/>
+ </request>
+ <response>
+ <type>Label</type>
</response>
</link>
<link href="/ovirt-engine/api/networks/{network:id}/permissions"
rel="add">
@@ -7780,6 +7974,14 @@
<parameter required="false" type="xs:boolean">
<name>template.delete_protected</name>
</parameter>
+ <parameter required="false" type="collection">
+ <name>template.sso.methods.method</name>
+ <parameters_set>
+<parameter required="false" type="xs:string">
+ <name>method.id</name>
+</parameter>
+ </parameters_set>
+ </parameter>
<parameter required="false" type="xs:boolean">
<name>template.console.enabled</name>
</parameter>
@@ -7855,6 +8057,9 @@
</parameter>
<parameter required="false" type="xs:boolean">
<name>template.tunnel_migration</name>
+ </parameter>
+ <parameter required="false" type="xs:int">
+ <name>template.migration_downtime</name>
</parameter>
<parameter required="false" type="xs:boolean">
<name>template.virtio_scsi.enabled</name>
@@ -8019,6 +8224,14 @@
<parameter required="false" type="xs:boolean">
<name>template.delete_protected</name>
</parameter>
+ <parameter required="false" type="collection">
+ <name>template.sso.methods.method</name>
+ <parameters_set>
+<parameter required="false" type="xs:string">
+ <name>method.id</name>
+</parameter>
+ </parameters_set>
+ </parameter>
<parameter required="false" type="xs:boolean">
<name>template.console.enabled</name>
</parameter>
@@ -8094,6 +8307,9 @@
</parameter>
<parameter required="false" type="xs:boolean">
<name>template.tunnel_migration</name>
+ </parameter>
+ <parameter required="false" type="xs:int">
+ <name>template.migration_downtime</name>
</parameter>
<parameter required="false" type="xs:boolean">
<name>template.virtio_scsi.enabled</name>
@@ -9481,6 +9697,14 @@
<parameter required="false" type="xs:boolean">
<name>vm.delete_protected</name>
</parameter>
+ <parameter required="false" type="collection">
+ <name>vm.sso.methods.method</name>
+ <parameters_set>
+<parameter required="false" type="xs:string">
+ <name>method.id</name>
+</parameter>
+ </parameters_set>
+ </parameter>
<parameter required="false" type="xs:boolean">
<name>vm.console.enabled</name>
</parameter>
@@ -9510,6 +9734,9 @@
</parameter>
<parameter required="false" type="xs:boolean">
<name>vm.tunnel_migration</name>
+ </parameter>
+ <parameter required="false" type="xs:int">
+ <name>vm.migration_downtime</name>
</parameter>
<parameter required="false" type="xs:boolean">
<name>vm.virtio_scsi.enabled</name>
@@ -9670,6 +9897,14 @@
<parameter required="false" type="xs:boolean">
<name>vm.delete_protected</name>
</parameter>
+ <parameter required="false" type="collection">
+ <name>vm.sso.methods.method</name>
+ <parameters_set>
+<parameter required="false" type="xs:string">
+ <name>method.id</name>
+</parameter>
+ </parameters_set>
+ </parameter>
<parameter required="false" type="xs:boolean">
<name>vm.console.enabled</name>
</parameter>
@@ -9690,6 +9925,9 @@
</parameter>
<parameter required="false" type="xs:boolean">
<name>vm.tunnel_migration</name>
+ </parameter>
+ <parameter required="false" type="xs:int">
+ <name>vm.migration_downtime</name>
</parameter>
<parameter required="false" type="xs:boolean">
<name>vm.virtio_scsi.enabled</name>
@@ -9830,6 +10068,14 @@
<parameter required="false" type="xs:boolean">
<name>vm.delete_protected</name>
</parameter>
+ <parameter required="false" type="collection">
+ <name>vm.sso.methods.method</name>
+ <parameters_set>
+<parameter required="false" type="xs:string">
+ <name>method.id</name>
+</parameter>
+ </parameters_set>
+ </parameter>
<parameter required="false" type="xs:string">
<name>vm.cpu.mode</name>
</parameter>
@@ -9853,6 +10099,9 @@
</parameter>
<parameter required="false" type="xs:boolean">
<name>vm.tunnel_migration</name>
+ </parameter>
+ <parameter required="false" type="xs:int">
+ <name>vm.migration_downtime</name>
</parameter>
<parameter required="false" type="xs:boolean">
<name>vm.virtio_scsi.enabled</name>
@@ -10111,6 +10360,14 @@
<parameter required="false" type="xs:boolean">
<name>vm.delete_protected</name>
</parameter>
+ <parameter required="false" type="collection">
+ <name>vm.sso.methods.method</name>
+ <parameters_set>
+<parameter required="false" type="xs:string">
+ <name>method.id</name>
+</parameter>
+ </parameters_set>
+ </parameter>
<parameter required="false" type="xs:boolean">
<name>vm.console.enabled</name>
</parameter>
@@ -10131,6 +10388,9 @@
</parameter>
<parameter required="false" type="xs:boolean">
<name>vm.tunnel_migration</name>
+ </parameter>
+ <parameter required="false" type="xs:int">
+ <name>vm.migration_downtime</name>
</parameter>
<parameter required="false" type="xs:boolean">
<name>vm.virtio_scsi.enabled</name>
@@ -11317,6 +11577,28 @@
<type>Permission</type>
</response>
</link>
+ <link href="/ovirt-engine/api/vms/{vm:id}/reboot" rel="reboot">
+ <description>reboot a virtual machine in the system identified by
the given id</description>
+ <request>
+ <http_method>POST</http_method>
+ <headers>
+ <header required="true">
+ <name>Content-Type</name>
+ <value>application/xml|json</value>
+ </header>
+ <header required="false">
+ <name>Correlation-Id</name>
+ <value>any string</value>
+ </header>
+ </headers>
+ <body>
+ <type>Action</type>
+ </body>
+ </request>
+ <response>
+ <type>Action</type>
+ </response>
+ </link>
<link href="/ovirt-engine/api/vms/{vm:id}/reporteddevices" rel="get">
<request>
<http_method>GET</http_method>
@@ -11393,6 +11675,14 @@
</parameter>
<parameter required="false" type="xs:boolean">
<name>snapshot.persist_memorystate</name>
+ </parameter>
+ <parameter required="false" type="collection">
+ <name>snapshot.disks.disk</name>
+ <parameters_set>
+<parameter required="false" type="xs:string">
+ <name>disk.id</name>
+</parameter>
+ </parameters_set>
</parameter>
</parameters_set>
</body>
@@ -11549,6 +11839,17 @@
<parameter required="false" type="xs:long">
<name>action.grace_period.expiry</name>
</parameter>
+ <parameter required="false" type="collection">
+ <name>action.disks.disk</name>
+ <parameters_set>
+<parameter required="false" type="xs:string">
+ <name>disk.id</name>
+</parameter>
+<parameter required="false" type="xs:string">
+ <name>disk.image_id</name>
+</parameter>
+ </parameters_set>
+ </parameter>
</parameters_set>
</body>
</request>
diff --git a/ovirt-engine-sdk-java-codegen/src/main/resources/api.xsd
b/ovirt-engine-sdk-java-codegen/src/main/resources/api.xsd
index 012dd94..0a2f6da 100644
--- a/ovirt-engine-sdk-java-codegen/src/main/resources/api.xsd
+++ b/ovirt-engine-sdk-java-codegen/src/main/resources/api.xsd
@@ -195,6 +195,8 @@
<xs:element name="clone" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
<!-- indicates whether to restore snapshot's memory on preview/restore
snapshot -->
<xs:element name="restore_memory" type="xs:boolean" minOccurs="0"
maxOccurs="1"/>
+ <!-- Custom disks list for preview/restore snapshot -->
+ <xs:element ref="disks" minOccurs="0" maxOccurs="1"/>
<!-- Used for external job -->
<xs:element name="succeeded" type="xs:boolean" minOccurs="0"/>
<!-- resolve GlusterHook using one of the resolution -->
@@ -634,6 +636,7 @@
<xs:element ref="content_types" minOccurs="0" />
<xs:element ref="hook_states" minOccurs="0" />
<xs:element ref="stages" minOccurs="0" />
+ <xs:element ref="sso_methods" minOccurs="0"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -1033,6 +1036,20 @@
</xs:sequence>
</xs:complexType>
+ <xs:element name="sso_methods" type="SsoMethods"/>
+
+ <xs:complexType name="SsoMethods">
+ <xs:sequence>
+ <xs:element name="sso_method" type="xs:string" minOccurs="0"
maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:appinfo>
+ <jaxb:property name="SsoMethods"/>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
<!-- Common to all resources -->
<xs:complexType name="ActionableResource">
@@ -1106,7 +1123,9 @@
<xs:complexContent>
<xs:extension base="BaseResource">
<xs:sequence>
+ <!-- TODO: (deprecated) remove 'storage_type' element post 4.0 -->
<xs:element name="storage_type" type="xs:string" minOccurs="0" />
+ <xs:element name="local" type="xs:boolean" minOccurs="0" />
<xs:element name="storage_format" type="xs:string" minOccurs="0" />
<xs:element name="version" type="Version" minOccurs="0" />
<xs:element name="supported_versions" type="SupportedVersions"
minOccurs="0" />
@@ -1265,8 +1284,10 @@
<xs:element name="threads_as_cores" type="xs:boolean" minOccurs="0"
maxOccurs="1"/>
<xs:element name="tunnel_migration" type="xs:boolean" minOccurs="0"
maxOccurs="1"/>
<xs:element name="trusted_service" type="xs:boolean" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="ha_reservation" type="xs:boolean" minOccurs="0"
maxOccurs="1"/>
<xs:element name="ballooning_enabled" type="xs:boolean"
minOccurs="0" maxOccurs="1"/>
<xs:element ref="display" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="ksm" minOccurs="0" maxOccurs="1"/>
<!-- Also a rel="networks" link -->
</xs:sequence>
</xs:extension>
@@ -1328,6 +1349,7 @@
<xs:element ref="status" minOccurs="0" maxOccurs="1"/>
<xs:element ref="pm_proxies" minOccurs="0" maxOccurs="1"/>
<xs:element ref="agents" minOccurs="0"/>
+ <xs:element name="automatic_pm_enabled" type="xs:boolean" minOccurs="0"
maxOccurs="1"/>
</xs:sequence>
<xs:attribute name="type" type="xs:string"/>
</xs:complexType>
@@ -1589,6 +1611,7 @@
<xs:extension base="BaseResource">
<xs:sequence>
<xs:element ref="domain" minOccurs="0"/>
+ <xs:element name="external_id" type="xs:string" minOccurs="0"
maxOccurs="1"/>
<xs:element name="department" type="xs:string" minOccurs="0"
maxOccurs="1"/>
<xs:element name="logged_in" type="xs:boolean" minOccurs="0"
maxOccurs="1"/>
<xs:element name="last_name" type="xs:string" minOccurs="0"
maxOccurs="1"/>
@@ -1658,6 +1681,7 @@
<xs:extension base="BaseResource">
<xs:sequence>
<xs:element ref="domain" minOccurs="0"/>
+ <xs:element name="external_id" type="xs:string" minOccurs="0"
maxOccurs="1"/>
<!-- used only to represent the initial role assignments for a
new group, therafter modification of role assignments are
only supported via the rel="roles" sub-collection -->
@@ -1993,6 +2017,36 @@
</xs:complexContent>
</xs:complexType>
+ <xs:element name="label" type="Label"/>
+
+ <xs:element name="labels" type="Labels"/>
+
+ <xs:complexType name="Label">
+ <xs:complexContent>
+ <xs:extension base="BaseResource">
+ <xs:sequence>
+ <xs:element ref="network" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="host_nic" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="Labels">
+ <xs:complexContent>
+ <xs:extension base="BaseResources">
+ <xs:sequence>
+ <xs:annotation>
+ <xs:appinfo>
+ <jaxb:property name="Labels"/>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:element ref="label" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
<!-- Vnic Profiles -->
<xs:element name="vnic_profile" type="VnicProfile"/>
@@ -2250,11 +2304,13 @@
<xs:element name="display" type="Display" minOccurs="0"
maxOccurs="1"/>
<xs:element name="stateless" type="xs:boolean" minOccurs="0"/>
<xs:element name="delete_protected" type="xs:boolean" minOccurs="0"/>
+ <xs:element ref="sso" minOccurs="0" maxOccurs="1"/>
<xs:element ref="console" minOccurs="0" maxOccurs="1"/>
<xs:element name="timezone" type="xs:string" minOccurs="0"
maxOccurs="1"/>
<xs:element ref="domain" minOccurs="0" maxOccurs="1"/>
<xs:element ref="usb" minOccurs="0" maxOccurs="1"/>
<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"/>
<!-- also rel="cdroms/disks/nics/watchdogs" links, see Devices below
-->
@@ -2307,6 +2363,34 @@
<xs:element name="version" type="Version" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
<xs:attribute name="type" type="xs:string"/>
+ </xs:complexType>
+
+ <!-- Single Sign-On Section -->
+ <xs:element name="sso" type="Sso"/>
+
+ <xs:complexType name="Sso">
+ <xs:sequence>
+ <xs:element ref="methods" minOccurs="1" maxOccurs="1" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="methods" type="Methods"/>
+
+ <xs:complexType name="Methods">
+ <xs:sequence>
+ <xs:annotation>
+ <xs:appinfo>
+ <jaxb:property name="methods"/>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:element ref="method" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="method" type="Method" />
+
+ <xs:complexType name="Method">
+ <xs:attribute name="id" type="xs:string"/>
</xs:complexType>
<xs:complexType name="HighAvailability">
@@ -2406,6 +2490,17 @@
<xs:sequence>
<xs:element name="configuration" type="Configuration" minOccurs="0"
maxOccurs="1"/>
<xs:element name="cloud_init" type="CloudInit" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="host_name" type="xs:string" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="domain" type="xs:string" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="timezone" type="xs:string" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="authorized_ssh_keys" type="xs:string" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="regenerate_ssh_keys" type="xs:boolean" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="dns_servers" type="xs:string" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="dns_search" type="xs:string" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="nics" type="GuestNicsConfiguration" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="windows_license_key" type="xs:string" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="root_password" type="xs:string" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="custom_script" type="xs:string" minOccurs="0"
maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
@@ -2520,6 +2615,7 @@
<xs:element name="origin" type="xs:string" minOccurs="0"/>
<xs:element name="stateless" type="xs:boolean" minOccurs="0"/>
<xs:element name="delete_protected" type="xs:boolean" minOccurs="0"/>
+ <xs:element ref="sso" minOccurs="0" maxOccurs="1"/>
<xs:element ref="console" minOccurs="0" maxOccurs="1"/>
<xs:element name="timezone" type="xs:string" minOccurs="0"
maxOccurs="1"/>
<xs:element ref="domain" minOccurs="0" maxOccurs="1"/>
@@ -2537,6 +2633,7 @@
<xs:element ref="quota" minOccurs="0" maxOccurs="1"/>
<xs:element ref="usb" minOccurs="0" maxOccurs="1"/>
<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="vmpool" minOccurs="0" maxOccurs="1">
@@ -2668,6 +2765,8 @@
</xs:element>
</xs:sequence>
</xs:complexType>
+
+
<!-- Virtual Machine Pools -->
<xs:element name="vmpool" type="VmPool"/>
@@ -2975,6 +3074,7 @@
</xs:complexContent>
</xs:complexType>
+
<!-- Host NICs -->
<xs:element name="host_nic" type="HostNIC"/>
@@ -3022,6 +3122,25 @@
</xs:complexContent>
</xs:complexType>
+ <xs:element name="guest_nic_configuration" type="GuestNicConfiguration"/>
+
+ <xs:element name="guest_nics_configuation" type="GuestNicsConfiguration"/>
+
+ <xs:complexType name="GuestNicConfiguration">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="ip" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="boot_protocol" type="xs:string" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="on_boot" type="xs:boolean" minOccurs="0"
maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="GuestNicsConfiguration">
+ <xs:sequence>
+ <xs:element name="nics" type="GuestNicConfiguration" minOccurs="0"
maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
<xs:element name="host_nic_states" type="HostNICStates"/>
<xs:complexType name="HostNICStates">
--
To view, visit http://gerrit.ovirt.org/23697
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4042b46712b9a6162902c62463c6dbe5f6f296e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine-sdk-java
Gerrit-Branch: sdk_3.4
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
