Michael Pasternak has uploaded a new change for review. Change subject: sdk: regenerate against the latest api ......................................................................
sdk: regenerate against the latest api - to datacenter added new field [comment] - to disk added [sgio] field to enable|disable filtering for the ScsiGenericIo - to StorageDomain.delete() added storagedomain.host.id|name Change-Id: I08ed8b6ace9ca5da32a9e4d0b63879715ea3e1a5 Signed-off-by: Michael pasternak <[email protected]> --- M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenter.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenterStorageDomainDisks.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenters.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Disks.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/StorageDomain.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/StorageDomainDisks.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VMDisk.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VMDisks.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/BaseResource.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Disk.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/ObjectFactory.java A ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/ScsiGenericIoOptions.java M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/VersionCaps.java 13 files changed, 225 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk-java refs/changes/76/16076/1 diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenter.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenter.java index a45c263..6ab20c2 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenter.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenter.java @@ -120,10 +120,11 @@ * @param datacenter {@link org.ovirt.engine.sdk.entities.DataCenter} * <pre> * [datacenter.name] + * [datacenter.description] + * [datacenter.comment] * [datacenter.storage_type] * [datacenter.version.major] * [datacenter.version.minor] - * [datacenter.description] * [datacenter.storage_format] * </pre> * diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenterStorageDomainDisks.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenterStorageDomainDisks.java index e625d11..3208d67 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenterStorageDomainDisks.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenterStorageDomainDisks.java @@ -174,6 +174,7 @@ * [disk.shareable] * [disk.propagate_errors] * [disk.wipe_after_delete] + * [disk.sgio] * </pre> * * @return @@ -229,6 +230,7 @@ * [disk.shareable] * [disk.propagate_errors] * [disk.wipe_after_delete] + * [disk.sgio] * </pre> * * @param expect diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenters.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenters.java index 0fc339c..ed1b4eb 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenters.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/DataCenters.java @@ -145,6 +145,7 @@ * datacenter.version.major * datacenter.version.minor * [datacenter.description] + * [datacenter.comment] * [datacenter.storage_format] * </pre> * @@ -182,6 +183,7 @@ * datacenter.version.major * datacenter.version.minor * [datacenter.description] + * [datacenter.comment] * [datacenter.storage_format] * </pre> * diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Disks.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Disks.java index 52a9176..acbb40d 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Disks.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Disks.java @@ -165,6 +165,7 @@ * [disk.shareable] * [disk.propagate_errors] * [disk.wipe_after_delete] + * [disk.sgio] * [disk.storage_domains.storage_domain] * </pre> * @@ -222,6 +223,7 @@ * [disk.shareable] * [disk.propagate_errors] * [disk.wipe_after_delete] + * [disk.sgio] * [disk.storage_domains.storage_domain] * </pre> * diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/StorageDomain.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/StorageDomain.java index 9d2ae7a..4b5eec2 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/StorageDomain.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/StorageDomain.java @@ -136,6 +136,7 @@ * [storagedomain.name] * * Overload 2: + * storagedomain.host.id|name * storagedomain.storage.logical_unit * [storagedomain.name] * [storagedomain.storage.override_luns] diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/StorageDomainDisks.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/StorageDomainDisks.java index 45676d3..25e60d3 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/StorageDomainDisks.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/StorageDomainDisks.java @@ -174,6 +174,7 @@ * [disk.shareable] * [disk.propagate_errors] * [disk.wipe_after_delete] + * [disk.sgio] * </pre> * * @return @@ -229,6 +230,7 @@ * [disk.shareable] * [disk.propagate_errors] * [disk.wipe_after_delete] + * [disk.sgio] * </pre> * * @param expect diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VMDisk.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VMDisk.java index 2ab8361..a619fec 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VMDisk.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VMDisk.java @@ -160,6 +160,7 @@ * [disk.shareable] * [disk.propagate_errors] * [disk.wipe_after_delete] + * [disk.sgio] * </pre> * * @return diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VMDisks.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VMDisks.java index 23f9771..d9e930e 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VMDisks.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/VMDisks.java @@ -160,6 +160,7 @@ * [disk.shareable] * [disk.propagate_errors] * [disk.wipe_after_delete] + * [disk.sgio] * [disk.storage_domains.storage_domain] * * Overload 3: @@ -221,6 +222,7 @@ * [disk.shareable] * [disk.propagate_errors] * [disk.wipe_after_delete] + * [disk.sgio] * [disk.storage_domains.storage_domain] * * Overload 3: diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/BaseResource.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/BaseResource.java index 0a89dc8..c660da3 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/BaseResource.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/BaseResource.java @@ -43,6 +43,7 @@ * <sequence> * <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"; minOccurs="0"/> * <element name="description" type="{http://www.w3.org/2001/XMLSchema}string"; minOccurs="0"/> + * <element name="comment" type="{http://www.w3.org/2001/XMLSchema}string"; minOccurs="0"/> * <element name="creation_status" type="{}Status" minOccurs="0"/> * <element ref="{}link" maxOccurs="unbounded" minOccurs="0"/> * </sequence> @@ -59,6 +60,7 @@ @XmlType(name = "BaseResource", propOrder = { "name", "description", + "comment", "creationStatus", "links" }) @@ -106,6 +108,7 @@ protected String name; protected String description; + protected String comment; @XmlElement(name = "creation_status") protected Status creationStatus; @XmlElement(name = "link") @@ -172,6 +175,34 @@ } /** + * Gets the value of the comment property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getComment() { + return comment; + } + + /** + * Sets the value of the comment property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setComment(String value) { + this.comment = value; + } + + public boolean isSetComment() { + return (this.comment!= null); + } + + /** * Gets the value of the creationStatus property. * * @return diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Disk.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Disk.java index 7fcb379..f21fc76 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Disk.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Disk.java @@ -57,6 +57,7 @@ * <element name="active" type="{http://www.w3.org/2001/XMLSchema}boolean"; minOccurs="0"/> * <element ref="{}quota" minOccurs="0"/> * <element name="lun_storage" type="{}Storage" minOccurs="0"/> + * <element name="sgio" type="{http://www.w3.org/2001/XMLSchema}string"; minOccurs="0"/> * </sequence> * </extension> * </complexContent> @@ -86,7 +87,8 @@ "statistics", "active", "quota", - "lunStorage" + "lunStorage", + "sgio" }) public class Disk extends BaseDevice @@ -121,6 +123,7 @@ protected Quota quota; @XmlElement(name = "lun_storage") protected Storage lunStorage; + protected String sgio; /** * Gets the value of the alias property. @@ -682,4 +685,32 @@ return (this.lunStorage!= null); } + /** + * Gets the value of the sgio property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSgio() { + return sgio; + } + + /** + * Sets the value of the sgio property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSgio(String value) { + this.sgio = value; + } + + public boolean isSetSgio() { + return (this.sgio!= null); + } + } diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/ObjectFactory.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/ObjectFactory.java index 0c72ad9..f140dde 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/ObjectFactory.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/ObjectFactory.java @@ -203,6 +203,7 @@ private final static QName _ReportedDevice_QNAME = new QName("", "reported_device"); private final static QName _Ip_QNAME = new QName("", "ip"); private final static QName _VmTypes_QNAME = new QName("", "vm_types"); + private final static QName _SgioOptions_QNAME = new QName("", "sgio_options"); private final static QName _PmProxies_QNAME = new QName("", "pm_proxies"); private final static QName _Vlan_QNAME = new QName("", "vlan"); private final static QName _Cluster_QNAME = new QName("", "cluster"); @@ -1467,6 +1468,14 @@ */ public ReportedDevice createReportedDevice() { return new ReportedDevice(); + } + + /** + * Create an instance of {@link ScsiGenericIoOptions } + * + */ + public ScsiGenericIoOptions createScsiGenericIoOptions() { + return new ScsiGenericIoOptions(); } /** @@ -3197,6 +3206,15 @@ } /** + * Create an instance of {@link JAXBElement }{@code <}{@link ScsiGenericIoOptions }{@code >}} + * + */ + @XmlElementDecl(namespace = "", name = "sgio_options") + public JAXBElement<ScsiGenericIoOptions> createSgioOptions(ScsiGenericIoOptions value) { + return new JAXBElement<ScsiGenericIoOptions>(_SgioOptions_QNAME, ScsiGenericIoOptions.class, null, value); + } + + /** * Create an instance of {@link JAXBElement }{@code <}{@link PmProxies }{@code >}} * */ diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/ScsiGenericIoOptions.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/ScsiGenericIoOptions.java new file mode 100644 index 0000000..fa3195c --- /dev/null +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/ScsiGenericIoOptions.java @@ -0,0 +1,98 @@ +// +// 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.entities; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for ScsiGenericIoOptions complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ScsiGenericIoOptions"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> + * <sequence> + * <element name="sgio_options" type="{http://www.w3.org/2001/XMLSchema}string"; maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ScsiGenericIoOptions", propOrder = { + "scsiGenericIoOptions" +}) +public class ScsiGenericIoOptions { + + @XmlElement(name = "sgio_options") + protected List<String> scsiGenericIoOptions; + + /** + * Gets the value of the scsiGenericIoOptions property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the scsiGenericIoOptions property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getScsiGenericIoOptions().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List<String> getScsiGenericIoOptions() { + if (scsiGenericIoOptions == null) { + scsiGenericIoOptions = new ArrayList<String>(); + } + return this.scsiGenericIoOptions; + } + + public boolean isSetScsiGenericIoOptions() { + return ((this.scsiGenericIoOptions!= null)&&(!this.scsiGenericIoOptions.isEmpty())); + } + + public void unsetScsiGenericIoOptions() { + this.scsiGenericIoOptions = null; + } + +} + diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/VersionCaps.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/VersionCaps.java index c9c2d8f..a470718 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/VersionCaps.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/VersionCaps.java @@ -75,6 +75,7 @@ * <element ref="{}nfs_versions" minOccurs="0"/> * <element ref="{}pm_proxy_types" minOccurs="0"/> * <element ref="{}cpu_modes" minOccurs="0"/> + * <element ref="{}sgio_options" minOccurs="0"/> * <element ref="{}gluster_volume_types" minOccurs="0"/> * <element ref="{}transport_types" minOccurs="0"/> * <element ref="{}gluster_volume_states" minOccurs="0"/> @@ -129,6 +130,7 @@ "nfsVersions", "pmProxyTypes", "cpuModes", + "sgioOptions", "glusterVolumeTypes", "transportTypes", "glusterVolumeStates", @@ -211,6 +213,8 @@ protected PmProxyTypes pmProxyTypes; @XmlElement(name = "cpu_modes") protected CpuModes cpuModes; + @XmlElement(name = "sgio_options") + protected ScsiGenericIoOptions sgioOptions; @XmlElement(name = "gluster_volume_types") protected GlusterVolumeTypes glusterVolumeTypes; @XmlElement(name = "transport_types") @@ -1289,6 +1293,34 @@ } /** + * Gets the value of the sgioOptions property. + * + * @return + * possible object is + * {@link ScsiGenericIoOptions } + * + */ + public ScsiGenericIoOptions getSgioOptions() { + return sgioOptions; + } + + /** + * Sets the value of the sgioOptions property. + * + * @param value + * allowed object is + * {@link ScsiGenericIoOptions } + * + */ + public void setSgioOptions(ScsiGenericIoOptions value) { + this.sgioOptions = value; + } + + public boolean isSetSgioOptions() { + return (this.sgioOptions!= null); + } + + /** * Gets the value of the glusterVolumeTypes property. * * @return -- To view, visit http://gerrit.ovirt.org/16076 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08ed8b6ace9ca5da32a9e4d0b63879715ea3e1a5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-sdk-java Gerrit-Branch: master Gerrit-Owner: Michael Pasternak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
