Juan Hernandez has uploaded a new change for review. Change subject: sdk: Regenerate against the latest API ......................................................................
sdk: Regenerate against the latest API This patch regenerates the SDK using the latest API obtained from the engine built from commit 9a2e2b3, tag ovirt-engine-3.6.0_alpha3. Change-Id: I8189c42fc1ceb7a5070f24b922892e87305c27c3 Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com> --- M generator/src/main/resources/api.xsd M generator/src/main/resources/memory.properties M generator/src/main/resources/rsdl.xml M sdk/Makefile M sdk/src/main/java/org/ovirt/engine/sdk/Api.java M sdk/src/main/java/org/ovirt/engine/sdk/decorators/Disk.java M sdk/src/main/java/org/ovirt/engine/sdk/decorators/ExternalHostProvider.java M sdk/src/main/java/org/ovirt/engine/sdk/decorators/ExternalHostProviders.java M sdk/src/main/java/org/ovirt/engine/sdk/decorators/Host.java M sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackImageProvider.java M sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackImageProviders.java M sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackNetworkProvider.java M sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackNetworkProviders.java M sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackVolumeProviders.java M sdk/src/main/java/org/ovirt/engine/sdk/decorators/VM.java A sdk/src/main/java/org/ovirt/engine/sdk/decorators/VMKatelloErrata.java A sdk/src/main/java/org/ovirt/engine/sdk/decorators/VMKatelloErratum.java M sdk/src/main/java/org/ovirt/engine/sdk/entities/GlusterVolume.java M sdk/src/main/java/org/ovirt/engine/sdk/entities/Host.java M sdk/src/main/java/org/ovirt/engine/sdk/entities/KatelloErratum.java M sdk/src/main/java/org/ovirt/engine/sdk/entities/VM.java 21 files changed, 685 insertions(+), 25 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk-java refs/changes/11/41211/1 diff --git a/generator/src/main/resources/api.xsd b/generator/src/main/resources/api.xsd index 16cf751..96fa365 100644 --- a/generator/src/main/resources/api.xsd +++ b/generator/src/main/resources/api.xsd @@ -1962,6 +1962,7 @@ <xs:element name="live_snapshot_support" type="xs:boolean" minOccurs="0" maxOccurs="1" /> <xs:element ref="katello_errata" minOccurs="0" maxOccurs="1"/> <xs:element ref="external_host_provider" minOccurs="0" maxOccurs="1"/> + <xs:element name="update_available" type="xs:boolean" minOccurs="0" maxOccurs="1" /> </xs:sequence> </xs:extension> </xs:complexContent> @@ -3345,6 +3346,8 @@ <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:element ref="external_host_provider" minOccurs="0" maxOccurs="1"/> + <xs:element ref="katello_errata" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:extension> </xs:complexContent> @@ -4276,6 +4279,8 @@ <xs:element ref="transport_types" minOccurs="0" maxOccurs="1"/> <xs:element name="replica_count" type="xs:unsignedShort" minOccurs="0" maxOccurs="1"/> <xs:element name="stripe_count" type="xs:unsignedShort" minOccurs="0" maxOccurs="1"/> + <xs:element name="disperse_count" type="xs:unsignedShort" minOccurs="0" maxOccurs="1"/> + <xs:element name="redundancy_count" type="xs:unsignedShort" minOccurs="0" maxOccurs="1"/> <xs:element ref="bricks" minOccurs="0" maxOccurs="1"/> <xs:element ref="options" minOccurs="0" maxOccurs="1"/> <xs:element ref="status" minOccurs="0" maxOccurs="1"/> @@ -5548,6 +5553,7 @@ <xs:element name="summary" type="xs:string" minOccurs="0" maxOccurs="1"/> <xs:element ref="packages" minOccurs="0" maxOccurs="1"/> <xs:element ref="host" minOccurs="0" maxOccurs="1"/> + <xs:element ref="vm" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:extension> </xs:complexContent> diff --git a/generator/src/main/resources/memory.properties b/generator/src/main/resources/memory.properties index 52d8d64..132df03 100644 --- a/generator/src/main/resources/memory.properties +++ b/generator/src/main/resources/memory.properties @@ -127,6 +127,7 @@ link.hosts.host_id.tags.tag_id.delete.headers.order=Correlation-Id link.hosts.host_id.unregisteredstoragedomainsdiscover.unregisteredstoragedomainsdiscover.headers.order=Correlation-Id link.hosts.host_id.update.headers.order=Correlation-Id Expect +link.hosts.host_id.upgrade.upgrade.headers.order=Correlation-Id link.instancetypes.add.headers.order=Expect Correlation-Id link.instancetypes.instancetype_id.delete.headers.order=Correlation-Id link.jobs.add.headers.order=Expect Correlation-Id diff --git a/generator/src/main/resources/rsdl.xml b/generator/src/main/resources/rsdl.xml index dc1ef6f..807e731 100644 --- a/generator/src/main/resources/rsdl.xml +++ b/generator/src/main/resources/rsdl.xml @@ -5997,6 +5997,9 @@ <parameter required="true" type="xs:string"> <name>action.storage_domain.id|name</name> </parameter> + <parameter required="false" type="xs:string"> + <name>action.disk.name|alias</name> + </parameter> <parameter required="false" type="xs:boolean"> <name>action.async</name> </parameter> @@ -6482,9 +6485,6 @@ <parameter required="false" type="xs:string"> <name>external_host_provider.password</name> </parameter> - <parameter required="false" type="xs:string"> - <name>external_host_provider.authentication_url</name> - </parameter> </parameters_set> </body> </request> @@ -6589,9 +6589,6 @@ </parameter> <parameter required="false" type="xs:string"> <name>external_host_provider.password</name> - </parameter> - <parameter required="false" type="xs:string"> - <name>external_host_provider.authentication_url</name> </parameter> </parameters_set> </body> @@ -9310,7 +9307,7 @@ </response> </link> <link href="hosts/{host:id}/unregisteredstoragedomainsdiscover" rel="unregisteredstoragedomainsdiscover"> - <description>Discover the Storage Domains which are candidiates to be imported to the setup</description> + <description>Discover the block Storage Domains which are candidates to be imported to the setup. For FCP no arguments are needed.</description> <request> <http_method>POST</http_method> <headers> @@ -9334,12 +9331,53 @@ <body> <type>Action</type> <parameters_set> - <description>Discover the Storage Domains which are candidiates to be imported to the setup</description> + <description>Discover the block Storage Domains which are candidates to be imported to the setup. For FCP no arguments are needed.</description> <parameter required="false" type="xs:string"> <name>action.iscsi.address</name> </parameter> <parameter required="false" type="xs:string"> <name>action.iscsi_target</name> + </parameter> + <parameter required="false" type="xs:boolean"> + <name>action.async</name> + </parameter> + <parameter required="false" type="xs:long"> + <name>action.grace_period.expiry</name> + </parameter> + </parameters_set> + </body> + </request> + <response> + <type>Action</type> + </response> + </link> + <link href="hosts/{host:id}/upgrade" rel="upgrade"> + <description>upgrade vdsm and other packages of the specified host in the system</description> + <request> + <http_method>POST</http_method> + <headers> + <header required="false"> + <name>Correlation-Id</name> + <value>any string</value> + </header> + <header required="true"> + <name>Content-Type</name> + <value>application/xml|json</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> + <type>Action</type> + <parameters_set> + <parameter required="false" type="xs:string"> + <name>action.image</name> </parameter> <parameter required="false" type="xs:boolean"> <name>action.async</name> @@ -10722,6 +10760,9 @@ <parameter required="false" type="xs:string"> <name>openstack_image_provider.password</name> </parameter> + <parameter required="false" type="xs:string"> + <name>openstack_image_provider.authentication_url</name> + </parameter> <parameter required="false" type="collection"> <name>openstack_image_provider.properties.property</name> <parameters_set> @@ -10837,6 +10878,9 @@ </parameter> <parameter required="false" type="xs:string"> <name>openstack_image_provider.password</name> + </parameter> + <parameter required="false" type="xs:string"> + <name>openstack_image_provider.authentication_url</name> </parameter> <parameter required="false" type="collection"> <name>openstack_image_provider.properties.property</name> @@ -11081,6 +11125,9 @@ <parameter required="false" type="xs:string"> <name>openstack_network_provider.password</name> </parameter> + <parameter required="false" type="xs:string"> + <name>openstack_network_provider.authentication_url</name> + </parameter> <parameter required="false" type="collection"> <name>openstack_network_provider.properties.property</name> <parameters_set> @@ -11196,6 +11243,9 @@ </parameter> <parameter required="false" type="xs:string"> <name>openstack_network_provider.password</name> + </parameter> + <parameter required="false" type="xs:string"> + <name>openstack_network_provider.authentication_url</name> </parameter> <parameter required="false" type="collection"> <name>openstack_network_provider.properties.property</name> @@ -11385,14 +11435,14 @@ <parameter required="true" type="xs:string"> <name>openstack_volume_provider.name</name> </parameter> - <parameter required="true" type="xs:string,"> - <name>openstack_volume_provider.data_center.id|name</name> - </parameter> <parameter required="false" type="xs:string"> <name>openstack_volume_provider.description</name> </parameter> <parameter required="false" type="xs:string"> <name>openstack_volume_provider.url</name> + </parameter> + <parameter required="false" type="xs:string"> + <name>openstack_volume_provider.data_center.id|name</name> </parameter> <parameter required="false" type="xs:boolean"> <name>openstack_volume_provider.requires_authentication</name> @@ -17808,6 +17858,9 @@ <parameter required="false" type="xs:string"> <name>vm.migration.compressed</name> </parameter> + <parameter required="false" type="xs:string"> + <name>vm.external_host_provider.id</name> + </parameter> </parameters_set> </body> </request> @@ -18721,6 +18774,33 @@ <type>Action</type> </response> </link> + <link href="vms/{vm:id}/katelloerrata" rel="get"> + <description>get the list of errata available for the vm</description> + <request> + <http_method>GET</http_method> + <url> + <parameters_set> + <parameter required="false" type="xs:int" context="matrix"> + <name>max</name> + <value>max results</value> + </parameter> + </parameters_set> + </url> + <body/> + </request> + <response> + <type>KatelloErrata</type> + </response> + </link> + <link href="vms/{vm:id}/katelloerrata/{katelloerrata:id}" rel="get"> + <request> + <http_method>GET</http_method> + <body/> + </request> + <response> + <type>KatelloErratum</type> + </response> + </link> <link href="vms/{vm:id}/logon" rel="logon"> <description>Perform automatic logon on the VM using the guest agent.</description> <request> diff --git a/sdk/Makefile b/sdk/Makefile index 81c0677..893295c 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -4,7 +4,7 @@ pomversion=$(shell $(PWD)/version.py --pom) rpmversion=$(shell $(PWD)/version.py --rpm) rpmdist=$(shell rpm --eval '%dist') -rpmrelease=0.9$(rpmsuffix)$(rpmdist) +rpmrelease=0.10$(rpmsuffix)$(rpmdist) RPMTOP=$(PWD)/rpmtop NAME=ovirt-engine-sdk-java diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/Api.java b/sdk/src/main/java/org/ovirt/engine/sdk/Api.java index 885c346..a3f889e 100644 --- a/sdk/src/main/java/org/ovirt/engine/sdk/Api.java +++ b/sdk/src/main/java/org/ovirt/engine/sdk/Api.java @@ -632,6 +632,9 @@ rootLogger.getLoggerRepository() .getLogger("org.apache.http"); pkgLogger.setLevel(Level.DEBUG); + pkgLogger.addAppender(new ConsoleAppender( + new PatternLayout(patternLayout))); + } else { Logger rootLogger = Logger.getRootLogger(); if (!rootLogger.getAllAppenders().hasMoreElements()) { diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/Disk.java b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/Disk.java index 286421b..deee431 100644 --- a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/Disk.java +++ b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/Disk.java @@ -103,6 +103,7 @@ * @param action {@link org.ovirt.engine.sdk.entities.Action} * <pre> * action.storage_domain.id|name + * [action.disk.name|alias] * [action.async] * [action.grace_period.expiry] * </pre> @@ -135,6 +136,7 @@ * @param action {@link org.ovirt.engine.sdk.entities.Action} * <pre> * action.storage_domain.id|name + * [action.disk.name|alias] * [action.async] * [action.grace_period.expiry] * </pre> @@ -176,6 +178,7 @@ * @param action {@link org.ovirt.engine.sdk.entities.Action} * <pre> * action.storage_domain.id|name + * [action.disk.name|alias] * [action.async] * [action.grace_period.expiry] * </pre> diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/ExternalHostProvider.java b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/ExternalHostProvider.java index a49976b..d063042 100644 --- a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/ExternalHostProvider.java +++ b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/ExternalHostProvider.java @@ -497,7 +497,6 @@ * [external_host_provider.requires_authentication] * [external_host_provider.username] * [external_host_provider.password] - * [external_host_provider.authentication_url] * </pre> * * @return @@ -537,7 +536,6 @@ * [external_host_provider.requires_authentication] * [external_host_provider.username] * [external_host_provider.password] - * [external_host_provider.authentication_url] * </pre> * * @param async @@ -586,7 +584,6 @@ * [external_host_provider.requires_authentication] * [external_host_provider.username] * [external_host_provider.password] - * [external_host_provider.authentication_url] * </pre> * * @param correlationId @@ -643,7 +640,6 @@ * [external_host_provider.requires_authentication] * [external_host_provider.username] * [external_host_provider.password] - * [external_host_provider.authentication_url] * </pre> * * @param correlationId diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/ExternalHostProviders.java b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/ExternalHostProviders.java index f528755..f187bb9 100644 --- a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/ExternalHostProviders.java +++ b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/ExternalHostProviders.java @@ -124,7 +124,6 @@ * [external_host_provider.requires_authentication] * [external_host_provider.username] * [external_host_provider.password] - * [external_host_provider.authentication_url] * </pre> * * @return @@ -162,7 +161,6 @@ * [external_host_provider.requires_authentication] * [external_host_provider.username] * [external_host_provider.password] - * [external_host_provider.authentication_url] * </pre> * * @param expect @@ -208,7 +206,6 @@ * [external_host_provider.requires_authentication] * [external_host_provider.username] * [external_host_provider.password] - * [external_host_provider.authentication_url] * </pre> * * @param expect diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/Host.java b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/Host.java index 8c9264f..086cc39 100644 --- a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/Host.java +++ b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/Host.java @@ -2295,5 +2295,127 @@ Host.class, headers); } + /** + * Performs upgrade action. + * + * @param action {@link org.ovirt.engine.sdk.entities.Action} + * <pre> + * [action.image] + * [action.async] + * [action.grace_period.expiry] + * </pre> + * + * @return + * {@link Action } + * + * @throws ClientProtocolException + * Signals that HTTP/S protocol error has occurred. + * @throws ServerException + * Signals that an oVirt api error has occurred. + * @throws IOException + * Signals that an I/O exception of some sort has occurred. + */ + public Action upgrade(Action action) throws ClientProtocolException, + ServerException, IOException { + String url = this.getHref() + "/upgrade"; + + HttpHeaderBuilder headersBuilder = new HttpHeaderBuilder(); + List<Header> headers = headersBuilder.build(); + + UrlBuilder urlBuilder = new UrlBuilder(url); + url = urlBuilder.build(); + + return getProxy().action(url, action, Action.class, Action.class, headers); + } + /** + * Performs upgrade action. + * + * @param action {@link org.ovirt.engine.sdk.entities.Action} + * <pre> + * [action.image] + * [action.async] + * [action.grace_period.expiry] + * </pre> + * + * @param async + * <pre> + * [true|false] + * </pre> + * + * @return + * {@link Action } + * + * @throws ClientProtocolException + * Signals that HTTP/S protocol error has occurred. + * @throws ServerException + * Signals that an oVirt api error has occurred. + * @throws IOException + * Signals that an I/O exception of some sort has occurred. + */ + public Action upgrade(Action action, Boolean async) throws ClientProtocolException, + ServerException, IOException { + String url = this.getHref() + "/upgrade"; + + HttpHeaderBuilder headersBuilder = new HttpHeaderBuilder(); + List<Header> headers = headersBuilder.build(); + + UrlBuilder urlBuilder = new UrlBuilder(url); + if (async != null) { + urlBuilder.add("async", async, UrlParameterType.MATRIX); + } + + url = urlBuilder.build(); + + return getProxy().action(url, action, Action.class, Action.class, headers); + } + /** + * Performs upgrade action. + * + * @param action {@link org.ovirt.engine.sdk.entities.Action} + * <pre> + * [action.image] + * [action.async] + * [action.grace_period.expiry] + * </pre> + * + * @param correlationId + * <pre> + * [any string] + * </pre> + * + * @param async + * <pre> + * [true|false] + * </pre> + * + * @return + * {@link Action } + * + * @throws ClientProtocolException + * Signals that HTTP/S protocol error has occurred. + * @throws ServerException + * Signals that an oVirt api error has occurred. + * @throws IOException + * Signals that an I/O exception of some sort has occurred. + */ + public Action upgrade(Action action, Boolean async, String correlationId) throws ClientProtocolException, + ServerException, IOException { + String url = this.getHref() + "/upgrade"; + + HttpHeaderBuilder headersBuilder = new HttpHeaderBuilder(); + if (correlationId != null) { + headersBuilder.add("Correlation-Id", correlationId); + } + List<Header> headers = headersBuilder.build(); + + UrlBuilder urlBuilder = new UrlBuilder(url); + if (async != null) { + urlBuilder.add("async", async, UrlParameterType.MATRIX); + } + + url = urlBuilder.build(); + + return getProxy().action(url, action, Action.class, Action.class, headers); + } } diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackImageProvider.java b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackImageProvider.java index 40a72a1..4a65873 100644 --- a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackImageProvider.java +++ b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackImageProvider.java @@ -446,6 +446,7 @@ * [openstack_image_provider.requires_authentication] * [openstack_image_provider.username] * [openstack_image_provider.password] + * [openstack_image_provider.authentication_url] * [openstack_image_provider.properties.property] * </pre> * @@ -486,6 +487,7 @@ * [openstack_image_provider.requires_authentication] * [openstack_image_provider.username] * [openstack_image_provider.password] + * [openstack_image_provider.authentication_url] * [openstack_image_provider.properties.property] * </pre> * @@ -535,6 +537,7 @@ * [openstack_image_provider.requires_authentication] * [openstack_image_provider.username] * [openstack_image_provider.password] + * [openstack_image_provider.authentication_url] * [openstack_image_provider.properties.property] * </pre> * @@ -592,6 +595,7 @@ * [openstack_image_provider.requires_authentication] * [openstack_image_provider.username] * [openstack_image_provider.password] + * [openstack_image_provider.authentication_url] * [openstack_image_provider.properties.property] * </pre> * diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackImageProviders.java b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackImageProviders.java index c32eb8c..8112d1a 100644 --- a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackImageProviders.java +++ b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackImageProviders.java @@ -124,6 +124,7 @@ * [openstack_image_provider.requires_authentication] * [openstack_image_provider.username] * [openstack_image_provider.password] + * [openstack_image_provider.authentication_url] * [openstack_image_provider.properties.property] * </pre> * @@ -162,6 +163,7 @@ * [openstack_image_provider.requires_authentication] * [openstack_image_provider.username] * [openstack_image_provider.password] + * [openstack_image_provider.authentication_url] * [openstack_image_provider.properties.property] * </pre> * @@ -208,6 +210,7 @@ * [openstack_image_provider.requires_authentication] * [openstack_image_provider.username] * [openstack_image_provider.password] + * [openstack_image_provider.authentication_url] * [openstack_image_provider.properties.property] * </pre> * diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackNetworkProvider.java b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackNetworkProvider.java index 07aa006..46af2ec 100644 --- a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackNetworkProvider.java +++ b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackNetworkProvider.java @@ -330,6 +330,7 @@ * [openstack_network_provider.requires_authentication] * [openstack_network_provider.username] * [openstack_network_provider.password] + * [openstack_network_provider.authentication_url] * [openstack_network_provider.properties.property] * </pre> * @@ -370,6 +371,7 @@ * [openstack_network_provider.requires_authentication] * [openstack_network_provider.username] * [openstack_network_provider.password] + * [openstack_network_provider.authentication_url] * [openstack_network_provider.properties.property] * </pre> * @@ -419,6 +421,7 @@ * [openstack_network_provider.requires_authentication] * [openstack_network_provider.username] * [openstack_network_provider.password] + * [openstack_network_provider.authentication_url] * [openstack_network_provider.properties.property] * </pre> * @@ -476,6 +479,7 @@ * [openstack_network_provider.requires_authentication] * [openstack_network_provider.username] * [openstack_network_provider.password] + * [openstack_network_provider.authentication_url] * [openstack_network_provider.properties.property] * </pre> * diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackNetworkProviders.java b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackNetworkProviders.java index 4c9aa11..1a980ce 100644 --- a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackNetworkProviders.java +++ b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackNetworkProviders.java @@ -124,6 +124,7 @@ * [openstack_network_provider.requires_authentication] * [openstack_network_provider.username] * [openstack_network_provider.password] + * [openstack_network_provider.authentication_url] * [openstack_network_provider.properties.property] * </pre> * @@ -162,6 +163,7 @@ * [openstack_network_provider.requires_authentication] * [openstack_network_provider.username] * [openstack_network_provider.password] + * [openstack_network_provider.authentication_url] * [openstack_network_provider.properties.property] * </pre> * @@ -208,6 +210,7 @@ * [openstack_network_provider.requires_authentication] * [openstack_network_provider.username] * [openstack_network_provider.password] + * [openstack_network_provider.authentication_url] * [openstack_network_provider.properties.property] * </pre> * diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackVolumeProviders.java b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackVolumeProviders.java index 57df641..eafd461 100644 --- a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackVolumeProviders.java +++ b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/OpenStackVolumeProviders.java @@ -119,9 +119,9 @@ * @param openstackvolumeprovider {@link org.ovirt.engine.sdk.entities.OpenStackVolumeProvider} * <pre> * openstack_volume_provider.name - * openstack_volume_provider.data_center.id|name * [openstack_volume_provider.description] * [openstack_volume_provider.url] + * [openstack_volume_provider.data_center.id|name] * [openstack_volume_provider.requires_authentication] * [openstack_volume_provider.username] * [openstack_volume_provider.password] @@ -159,9 +159,9 @@ * @param openstackvolumeprovider {@link org.ovirt.engine.sdk.entities.OpenStackVolumeProvider} * <pre> * openstack_volume_provider.name - * openstack_volume_provider.data_center.id|name * [openstack_volume_provider.description] * [openstack_volume_provider.url] + * [openstack_volume_provider.data_center.id|name] * [openstack_volume_provider.requires_authentication] * [openstack_volume_provider.username] * [openstack_volume_provider.password] @@ -207,9 +207,9 @@ * @param openstackvolumeprovider {@link org.ovirt.engine.sdk.entities.OpenStackVolumeProvider} * <pre> * openstack_volume_provider.name - * openstack_volume_provider.data_center.id|name * [openstack_volume_provider.description] * [openstack_volume_provider.url] + * [openstack_volume_provider.data_center.id|name] * [openstack_volume_provider.requires_authentication] * [openstack_volume_provider.username] * [openstack_volume_provider.password] diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/VM.java b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/VM.java index b6237aa..6e75218 100644 --- a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/VM.java +++ b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/VM.java @@ -48,6 +48,7 @@ private volatile VMApplications vMApplications; private volatile VMCdRoms vMCdRoms; private volatile VMDisks vMDisks; + private volatile VMKatelloErrata vMKatelloErrata; private volatile VMNICs vMNICs; private volatile VMPermissions vMPermissions; private volatile VMReportedDevices vMReportedDevices; @@ -120,6 +121,22 @@ } } return vMDisks; + } + /** + * Gets the value of the VMKatelloErrata property. + * + * @return + * {@link VMKatelloErrata } + */ + public VMKatelloErrata getKatelloErrata() { + if (this.vMKatelloErrata == null) { + synchronized (this.LOCK) { + if (this.vMKatelloErrata == null) { + this.vMKatelloErrata = new VMKatelloErrata(proxy, this); + } + } + } + return vMKatelloErrata; } /** * Gets the value of the VMNICs property. @@ -2559,6 +2576,7 @@ * [vm.cpu_profile.id] * [vm.migration.auto_converge] * [vm.migration.compressed] + * [vm.external_host_provider.id] * </pre> * * @return @@ -2654,6 +2672,7 @@ * [vm.cpu_profile.id] * [vm.migration.auto_converge] * [vm.migration.compressed] + * [vm.external_host_provider.id] * </pre> * * @param async @@ -2758,6 +2777,7 @@ * [vm.cpu_profile.id] * [vm.migration.auto_converge] * [vm.migration.compressed] + * [vm.external_host_provider.id] * </pre> * * @param correlationId @@ -2870,6 +2890,7 @@ * [vm.cpu_profile.id] * [vm.migration.auto_converge] * [vm.migration.compressed] + * [vm.external_host_provider.id] * </pre> * * @param correlationId diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/VMKatelloErrata.java b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/VMKatelloErrata.java new file mode 100644 index 0000000..b40f6aa --- /dev/null +++ b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/VMKatelloErrata.java @@ -0,0 +1,157 @@ +// +// Copyright (c) 2012 Red Hat, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +// ********************************************************************* +// ********************* GENERATED CODE - DO NOT MODIFY **************** +// ********************************************************************* + +package org.ovirt.engine.sdk.decorators; + +import java.io.IOException; +import java.util.List; +import java.util.UUID; + +import org.apache.http.Header; +import org.apache.http.client.ClientProtocolException; +import org.ovirt.engine.sdk.common.CollectionDecorator; +import org.ovirt.engine.sdk.exceptions.ServerException; +import org.ovirt.engine.sdk.utils.CollectionUtils; +import org.ovirt.engine.sdk.utils.HttpHeaderBuilder; +import org.ovirt.engine.sdk.utils.HttpHeaderUtils; +import org.ovirt.engine.sdk.utils.UrlBuilder; +import org.ovirt.engine.sdk.utils.UrlBuilder; +import org.ovirt.engine.sdk.utils.UrlHelper; +import org.ovirt.engine.sdk.web.HttpProxyBroker; +import org.ovirt.engine.sdk.web.UrlParameterType; +import org.ovirt.engine.sdk.entities.Action; + +/** + * <p>VMKatelloErrata providing relation and functional services + * <p>to {@link org.ovirt.engine.sdk.entities.KatelloErrata }. + */ +@SuppressWarnings("unused") +public class VMKatelloErrata extends + CollectionDecorator<org.ovirt.engine.sdk.entities.KatelloErratum, + org.ovirt.engine.sdk.entities.KatelloErrata, + VMKatelloErratum> { + + private VM parent; + + /** + * @param proxy HttpProxyBroker + * @param parent VM + */ + public VMKatelloErrata(HttpProxyBroker proxy, VM parent) { + super(proxy, "katelloerrata"); + this.parent = parent; + } + + /** + * Lists VMKatelloErratum objects. + * + * @return + * List of {@link VMKatelloErratum } + * + * @throws ClientProtocolException + * Signals that HTTP/S protocol error has occurred. + * @throws ServerException + * Signals that an oVirt api error has occurred. + * @throws IOException + * Signals that an I/O exception of some sort has occurred. + */ + @Override + public List<VMKatelloErratum> list() throws ClientProtocolException, + ServerException, IOException { + String url = this.parent.getHref() + SLASH + getName(); + return list(url, org.ovirt.engine.sdk.entities.KatelloErrata.class, VMKatelloErratum.class); + } + + /** + * Fetches VMKatelloErratum object by id. + * + * @return + * {@link VMKatelloErratum } + * + * @throws ClientProtocolException + * Signals that HTTP/S protocol error has occurred. + * @throws ServerException + * Signals that an oVirt api error has occurred. + * @throws IOException + * Signals that an I/O exception of some sort has occurred. + */ + @Override + public VMKatelloErratum get(UUID id) throws ClientProtocolException, + ServerException, IOException { + String url = this.parent.getHref() + SLASH + getName() + SLASH + id.toString(); + return getProxy().get(url, org.ovirt.engine.sdk.entities.KatelloErratum.class, VMKatelloErratum.class); + } + + /** + * Fetches VMKatelloErratum object by id. + * + * @return + * {@link VMKatelloErratum } + * + * @throws ClientProtocolException + * Signals that HTTP/S protocol error has occurred. + * @throws ServerException + * Signals that an oVirt api error has occurred. + * @throws IOException + * Signals that an I/O exception of some sort has occurred. + */ + @Override + public VMKatelloErratum getById(String id) throws ClientProtocolException, + ServerException, IOException { + String url = this.parent.getHref() + SLASH + getName() + SLASH + id; + return getProxy().get(url, org.ovirt.engine.sdk.entities.KatelloErratum.class, VMKatelloErratum.class); + } + + /** + * Lists VMKatelloErratum objects. + * + * @param max + * <pre> + * [max results] + * </pre> + * + * + * @return List of {@link VMKatelloErratum } + * + * @throws ClientProtocolException + * Signals that HTTP/S protocol error has occurred. + * @throws ServerException + * Signals that an oVirt api error has occurred. + * @throws IOException + * Signals that an I/O exception of some sort has occurred. + */ + public List<VMKatelloErratum> list(Integer max) throws ClientProtocolException, + ServerException, IOException { + + HttpHeaderBuilder headersBuilder = new HttpHeaderBuilder(); + List<Header> headers = headersBuilder.build(); + + UrlBuilder urlBuilder = new UrlBuilder(this.parent.getHref() + SLASH + getName()); + if (max != null) { + urlBuilder.add("max", max, UrlParameterType.MATRIX); + } + + String url = urlBuilder.build(); + + return list(url, org.ovirt.engine.sdk.entities.KatelloErrata.class, + VMKatelloErratum.class, headers); + } + +} diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/decorators/VMKatelloErratum.java b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/VMKatelloErratum.java new file mode 100644 index 0000000..52d9cfb --- /dev/null +++ b/sdk/src/main/java/org/ovirt/engine/sdk/decorators/VMKatelloErratum.java @@ -0,0 +1,67 @@ +// +// Copyright (c) 2012 Red Hat, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +// ********************************************************************* +// ********************* GENERATED CODE - DO NOT MODIFY **************** +// ********************************************************************* + +package org.ovirt.engine.sdk.decorators; + +import java.io.IOException; +import java.util.List; + +import org.apache.http.Header; +import org.apache.http.client.ClientProtocolException; +import org.ovirt.engine.sdk.entities.Action; +import org.ovirt.engine.sdk.entities.Response; +import org.ovirt.engine.sdk.exceptions.ServerException; +import org.ovirt.engine.sdk.utils.HttpHeaderBuilder; +import org.ovirt.engine.sdk.utils.HttpHeaderUtils; +import org.ovirt.engine.sdk.utils.UrlBuilder; +import org.ovirt.engine.sdk.web.HttpProxyBroker; +import org.ovirt.engine.sdk.web.UrlParameterType; + +/** + * <p>VMKatelloErratum providing relation and functional services + * <p>to {@link org.ovirt.engine.sdk.entities.KatelloErratum }. + */ +@SuppressWarnings("unused") +public class VMKatelloErratum extends + org.ovirt.engine.sdk.entities.KatelloErratum { + + private HttpProxyBroker proxy; + private final Object LOCK = new Object(); + + + + /** + * @param proxy HttpProxyBroker + */ + public VMKatelloErratum(HttpProxyBroker proxy) { + this.proxy = proxy; + } + + /** + * @return HttpProxyBroker + */ + private HttpProxyBroker getProxy() { + return proxy; + } + + + + +} diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/entities/GlusterVolume.java b/sdk/src/main/java/org/ovirt/engine/sdk/entities/GlusterVolume.java index 4a878f9..3eecab5 100644 --- a/sdk/src/main/java/org/ovirt/engine/sdk/entities/GlusterVolume.java +++ b/sdk/src/main/java/org/ovirt/engine/sdk/entities/GlusterVolume.java @@ -42,6 +42,8 @@ * <element ref="{}transport_types" minOccurs="0"/> * <element name="replica_count" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/> * <element name="stripe_count" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/> + * <element name="disperse_count" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/> + * <element name="redundancy_count" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/> * <element ref="{}bricks" minOccurs="0"/> * <element ref="{}options" minOccurs="0"/> * <element ref="{}status" minOccurs="0"/> @@ -60,6 +62,8 @@ "transportTypes", "replicaCount", "stripeCount", + "disperseCount", + "redundancyCount", "bricks", "options", "status" @@ -79,6 +83,12 @@ @XmlElement(name = "stripe_count") @XmlSchemaType(name = "unsignedShort") protected Integer stripeCount; + @XmlElement(name = "disperse_count") + @XmlSchemaType(name = "unsignedShort") + protected Integer disperseCount; + @XmlElement(name = "redundancy_count") + @XmlSchemaType(name = "unsignedShort") + protected Integer redundancyCount; protected GlusterBricks bricks; protected Options options; protected Status status; @@ -224,6 +234,62 @@ } /** + * Gets the value of the disperseCount property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getDisperseCount() { + return disperseCount; + } + + /** + * Sets the value of the disperseCount property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setDisperseCount(Integer value) { + this.disperseCount = value; + } + + public boolean isSetDisperseCount() { + return (this.disperseCount!= null); + } + + /** + * Gets the value of the redundancyCount property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getRedundancyCount() { + return redundancyCount; + } + + /** + * Sets the value of the redundancyCount property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setRedundancyCount(Integer value) { + this.redundancyCount = value; + } + + public boolean isSetRedundancyCount() { + return (this.redundancyCount!= null); + } + + /** * Gets the value of the bricks property. * * @return diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/entities/Host.java b/sdk/src/main/java/org/ovirt/engine/sdk/entities/Host.java index cc22764..d10f1fe 100644 --- a/sdk/src/main/java/org/ovirt/engine/sdk/entities/Host.java +++ b/sdk/src/main/java/org/ovirt/engine/sdk/entities/Host.java @@ -73,6 +73,7 @@ * <element name="live_snapshot_support" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element ref="{}katello_errata" minOccurs="0"/> * <element ref="{}external_host_provider" minOccurs="0"/> + * <element name="update_available" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * </sequence> * </extension> * </complexContent> @@ -118,7 +119,8 @@ "numaSupported", "liveSnapshotSupport", "katelloErrata", - "externalHostProvider" + "externalHostProvider", + "updateAvailable" }) public class Host extends BaseResource @@ -177,6 +179,8 @@ protected KatelloErrata katelloErrata; @XmlElement(name = "external_host_provider") protected ExternalHostProvider externalHostProvider; + @XmlElement(name = "update_available") + protected Boolean updateAvailable; /** * Gets the value of the address property. @@ -1186,4 +1190,32 @@ return (this.externalHostProvider!= null); } + /** + * Gets the value of the updateAvailable property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean getUpdateAvailable() { + return updateAvailable; + } + + /** + * Sets the value of the updateAvailable property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setUpdateAvailable(Boolean value) { + this.updateAvailable = value; + } + + public boolean isSetUpdateAvailable() { + return (this.updateAvailable!= null); + } + } diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/entities/KatelloErratum.java b/sdk/src/main/java/org/ovirt/engine/sdk/entities/KatelloErratum.java index 333ff97..c47c0da 100644 --- a/sdk/src/main/java/org/ovirt/engine/sdk/entities/KatelloErratum.java +++ b/sdk/src/main/java/org/ovirt/engine/sdk/entities/KatelloErratum.java @@ -45,6 +45,7 @@ * <element name="summary" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element ref="{}packages" minOccurs="0"/> * <element ref="{}host" minOccurs="0"/> + * <element ref="{}vm" minOccurs="0"/> * </sequence> * </extension> * </complexContent> @@ -62,7 +63,8 @@ "solution", "summary", "packages", - "host" + "host", + "vm" }) public class KatelloErratum extends BaseResource @@ -77,6 +79,7 @@ protected String summary; protected Packages packages; protected Host host; + protected VM vm; /** * Gets the value of the title property. @@ -302,4 +305,32 @@ return (this.host!= null); } + /** + * Gets the value of the vm property. + * + * @return + * possible object is + * {@link VM } + * + */ + public VM getVm() { + return vm; + } + + /** + * Sets the value of the vm property. + * + * @param value + * allowed object is + * {@link VM } + * + */ + public void setVm(VM value) { + this.vm = value; + } + + public boolean isSetVm() { + return (this.vm!= null); + } + } diff --git a/sdk/src/main/java/org/ovirt/engine/sdk/entities/VM.java b/sdk/src/main/java/org/ovirt/engine/sdk/entities/VM.java index ab8f752..e328bec 100644 --- a/sdk/src/main/java/org/ovirt/engine/sdk/entities/VM.java +++ b/sdk/src/main/java/org/ovirt/engine/sdk/entities/VM.java @@ -66,6 +66,8 @@ * <element name="next_run_configuration_exists" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element name="numa_tune_mode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element ref="{}permissions" minOccurs="0"/> + * <element ref="{}external_host_provider" minOccurs="0"/> + * <element ref="{}katello_errata" minOccurs="0"/> * </sequence> * </extension> * </complexContent> @@ -102,7 +104,9 @@ "useLatestTemplateVersion", "nextRunConfigurationExists", "numaTuneMode", - "permissions" + "permissions", + "externalHostProvider", + "katelloErrata" }) @XmlSeeAlso({ Snapshot.class @@ -153,6 +157,10 @@ @XmlElement(name = "numa_tune_mode") protected String numaTuneMode; protected Permissions permissions; + @XmlElement(name = "external_host_provider") + protected ExternalHostProvider externalHostProvider; + @XmlElement(name = "katello_errata") + protected KatelloErrata katelloErrata; /** * Gets the value of the stopReason property. @@ -910,4 +918,60 @@ return (this.permissions!= null); } + /** + * Gets the value of the externalHostProvider property. + * + * @return + * possible object is + * {@link ExternalHostProvider } + * + */ + public ExternalHostProvider getExternalHostProvider() { + return externalHostProvider; + } + + /** + * Sets the value of the externalHostProvider property. + * + * @param value + * allowed object is + * {@link ExternalHostProvider } + * + */ + public void setExternalHostProvider(ExternalHostProvider value) { + this.externalHostProvider = value; + } + + public boolean isSetExternalHostProvider() { + return (this.externalHostProvider!= null); + } + + /** + * Gets the value of the katelloErrata property. + * + * @return + * possible object is + * {@link KatelloErrata } + * + */ + public Object getKatelloErrata() { + return katelloErrata; + } + + /** + * Sets the value of the katelloErrata property. + * + * @param value + * allowed object is + * {@link KatelloErrata } + * + */ + public void setKatelloErrata(KatelloErrata value) { + this.katelloErrata = value; + } + + public boolean isSetKatelloErrata() { + return (this.katelloErrata!= null); + } + } -- To view, visit https://gerrit.ovirt.org/41211 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8189c42fc1ceb7a5070f24b922892e87305c27c3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-sdk-java 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