Juan Hernandez has uploaded a new change for review. Change subject: sdk: Regenerate from the latest master ......................................................................
sdk: Regenerate from the latest master This regenerates the SDK from the XML schema and the RSDL documents obtained from the latest build of the engine (git hash e992aa). Change-Id: I05de53959eb2730d6180bb10f2e86d0012359f13 Signed-off-by: Juan Hernandez <[email protected]> --- M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Cluster.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Clusters.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenterCluster.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenterClusters.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VmPool.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VmPools.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Cluster.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Display.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Payload.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/VmPool.java 11 files changed, 128 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk-java refs/changes/95/22995/1 diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java index 5b4b9eb..d69bb86 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/Api.java @@ -960,24 +960,6 @@ /** - * Gets the value of the Time property. - * - * @return {@link javax.xml.datatype.XMLGregorianCalendar } - * - * @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. - * @throws UnsecuredConnectionAttemptError - * Signals that attempt of connecting to SSL secured site using HTTP protocol has occurred. - */ - public javax.xml.datatype.XMLGregorianCalendar getTime() throws ClientProtocolException, ServerException, - UnsecuredConnectionAttemptError, IOException { - return getEntryPoint().getTime(); - } - /** * Gets the value of the Summary property. * * @return {@link org.ovirt.engine.sdk.entities.ApiSummary } @@ -1020,6 +1002,24 @@ return null; } /** + * Gets the value of the Time property. + * + * @return {@link javax.xml.datatype.XMLGregorianCalendar } + * + * @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. + * @throws UnsecuredConnectionAttemptError + * Signals that attempt of connecting to SSL secured site using HTTP protocol has occurred. + */ + public javax.xml.datatype.XMLGregorianCalendar getTime() throws ClientProtocolException, ServerException, + UnsecuredConnectionAttemptError, IOException { + return getEntryPoint().getTime(); + } + /** * Gets the value of the Comment property. * * @return {@link java.lang.String } diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Cluster.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Cluster.java index ea8a878..018b3ca 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Cluster.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Cluster.java @@ -156,6 +156,7 @@ * [cluster.tunnel_migration] * [cluster.ballooning_enabled] * [cluster.cpu.architecture] + * [cluster.display.proxy] * </pre> * * @return @@ -210,6 +211,7 @@ * [cluster.tunnel_migration] * [cluster.ballooning_enabled] * [cluster.cpu.architecture] + * [cluster.display.proxy] * </pre> * * @param correlationId diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Clusters.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Clusters.java index 98915c2..82fff65 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Clusters.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Clusters.java @@ -161,6 +161,7 @@ * [cluster.trusted_service] * [cluster.ballooning_enabled] * [cluster.cpu.architecture] + * [cluster.display.proxy] * </pre> * * @return @@ -213,6 +214,7 @@ * [cluster.trusted_service] * [cluster.ballooning_enabled] * [cluster.cpu.architecture] + * [cluster.display.proxy] * </pre> * * @param expect diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenterCluster.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenterCluster.java index 73a8826..354993a 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenterCluster.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenterCluster.java @@ -155,6 +155,7 @@ * [cluster.trusted_service] * [cluster.ballooning_enabled] * [cluster.cpu.architecture] + * [cluster.display.proxy] * </pre> * * @return @@ -208,6 +209,7 @@ * [cluster.trusted_service] * [cluster.ballooning_enabled] * [cluster.cpu.architecture] + * [cluster.display.proxy] * </pre> * * @param correlationId diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenterClusters.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenterClusters.java index 07a0891..8000d14 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenterClusters.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenterClusters.java @@ -153,6 +153,7 @@ * [cluster.tunnel_migration] * [cluster.ballooning_enabled] * [cluster.cpu.architecture] + * [cluster.display.proxy] * </pre> * * @return @@ -202,6 +203,7 @@ * [cluster.tunnel_migration] * [cluster.ballooning_enabled] * [cluster.cpu.architecture] + * [cluster.display.proxy] * </pre> * * @param expect diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VmPool.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VmPool.java index 7d53ed3..c85df2e 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VmPool.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VmPool.java @@ -91,6 +91,7 @@ * [vmpool.comment] * [vmpool.size] * [vmpool.max_user_vms] + * [vmpool.display.proxy] * </pre> * * @return @@ -131,6 +132,7 @@ * [vmpool.comment] * [vmpool.size] * [vmpool.max_user_vms] + * [vmpool.display.proxy] * </pre> * * @param correlationId diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VmPools.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VmPools.java index ffceabd..60536eb 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VmPools.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VmPools.java @@ -146,6 +146,7 @@ * [vmpool.comment] * [vmpool.size] * [vmpool.max_user_vms] + * [vmpool.display.proxy] * </pre> * * @return @@ -183,6 +184,7 @@ * [vmpool.comment] * [vmpool.size] * [vmpool.max_user_vms] + * [vmpool.display.proxy] * </pre> * * @param expect diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Cluster.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Cluster.java index aacc330..a82ee17 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Cluster.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Cluster.java @@ -50,6 +50,7 @@ * <element name="tunnel_migration" type="{http://www.w3.org/2001/XMLSchema}boolean"; minOccurs="0"/> * <element name="trusted_service" type="{http://www.w3.org/2001/XMLSchema}boolean"; minOccurs="0"/> * <element name="ballooning_enabled" type="{http://www.w3.org/2001/XMLSchema}boolean"; minOccurs="0"/> + * <element ref="{}display" minOccurs="0"/> * </sequence> * </extension> * </complexContent> @@ -72,7 +73,8 @@ "threadsAsCores", "tunnelMigration", "trustedService", - "ballooningEnabled" + "ballooningEnabled", + "display" }) public class Cluster extends BaseResource @@ -102,6 +104,7 @@ protected Boolean trustedService; @XmlElement(name = "ballooning_enabled") protected Boolean ballooningEnabled; + protected Display display; /** * Gets the value of the cpu property. @@ -467,4 +470,32 @@ return (this.ballooningEnabled!= null); } + /** + * Gets the value of the display property. + * + * @return + * possible object is + * {@link Display } + * + */ + public Display getDisplay() { + return display; + } + + /** + * Sets the value of the display property. + * + * @param value + * allowed object is + * {@link Display } + * + */ + public void setDisplay(Display value) { + this.display = value; + } + + public boolean isSetDisplay() { + return (this.display!= null); + } + } diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Display.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Display.java index 77962c3..dd2d811 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Display.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Display.java @@ -48,6 +48,7 @@ * <element ref="{}certificate" minOccurs="0"/> * <element name="smartcard_enabled" type="{http://www.w3.org/2001/XMLSchema}boolean"; minOccurs="0"/> * <element name="keyboard_layout" type="{http://www.w3.org/2001/XMLSchema}string"; minOccurs="0"/> + * <element name="proxy" type="{http://www.w3.org/2001/XMLSchema}string"; minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -67,7 +68,8 @@ "allowOverride", "certificate", "smartcardEnabled", - "keyboardLayout" + "keyboardLayout", + "proxy" }) public class Display { @@ -88,6 +90,7 @@ protected Boolean smartcardEnabled; @XmlElement(name = "keyboard_layout") protected String keyboardLayout; + protected String proxy; /** * Gets the value of the type property. @@ -369,5 +372,33 @@ return (this.keyboardLayout!= null); } + /** + * Gets the value of the proxy property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getProxy() { + return proxy; + } + + /** + * Sets the value of the proxy property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setProxy(String value) { + this.proxy = value; + } + + public boolean isSetProxy() { + return (this.proxy!= null); + } + } diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Payload.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Payload.java index 21c51c0..9cb83aa 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Payload.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Payload.java @@ -39,7 +39,7 @@ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> * <sequence> * <element ref="{}files"/> - * <element name="volume_id" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="volume_id" type="{http://www.w3.org/2001/XMLSchema}string"; minOccurs="0"/> * </sequence> * <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string"; /> * </restriction> @@ -58,7 +58,7 @@ @XmlElement(required = true) protected Files files; - @XmlElement(name = "volume_id", required = true) + @XmlElement(name = "volume_id") protected String volumeId; @XmlAttribute(name = "type") protected String type; diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/VmPool.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/VmPool.java index 6e77adc..2344356 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/VmPool.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/VmPool.java @@ -42,6 +42,7 @@ * <element ref="{}template" minOccurs="0"/> * <element name="prestarted_vms" type="{http://www.w3.org/2001/XMLSchema}int"; minOccurs="0"/> * <element name="max_user_vms" type="{http://www.w3.org/2001/XMLSchema}int"; minOccurs="0"/> + * <element ref="{}display" minOccurs="0"/> * </sequence> * </extension> * </complexContent> @@ -56,7 +57,8 @@ "cluster", "template", "prestartedVms", - "maxUserVms" + "maxUserVms", + "display" }) public class VmPool extends BaseResource @@ -69,6 +71,7 @@ protected Integer prestartedVms; @XmlElement(name = "max_user_vms") protected Integer maxUserVms; + protected Display display; /** * Gets the value of the size property. @@ -210,4 +213,32 @@ return (this.maxUserVms!= null); } + /** + * Gets the value of the display property. + * + * @return + * possible object is + * {@link Display } + * + */ + public Display getDisplay() { + return display; + } + + /** + * Sets the value of the display property. + * + * @param value + * allowed object is + * {@link Display } + * + */ + public void setDisplay(Display value) { + this.display = value; + } + + public boolean isSetDisplay() { + return (this.display!= null); + } + } -- To view, visit http://gerrit.ovirt.org/22995 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05de53959eb2730d6180bb10f2e86d0012359f13 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-sdk-java Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
