Attachment 944191 Details for Bug 1149107 – Proposed patch to fix the issue

[patch] Proposed patch to fix the issue

0001-Regenerate-against-latest-API.patch (text/plain), 29.61 KB, created by Juan Hernández on 2014-10-06 09:19:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Juan Hernández

Created: 2014-10-06 09:19:44 UTC

Size: 29.61 KB

patch

obsolete

>From dea5b2fe13d874bf1558e7bb49e83e217d60bd6e Mon Sep 17 00:00:00 2001
>From: Juan Hernandez <juan.hernandez@redhat.com>
>Date: Mon, 6 Oct 2014 11:11:32 +0200
>Subject: [PATCH] Regenerate against latest API
>
>This patch regenerates the SDK using the latest API obtained from
>the engine built from commit e00fbdb, build vt5.
>
>Resolves: rhbz#1149107
>Signed-off-by: Juan Hernandez <juan.hernandez@redhat.com>
>---
> 0003-Regenerate-against-the-latest-API.patch | 725 +++++++++++++++++++++++++++
> rhevm-sdk-java.spec | 9 +-
> 2 files changed, 733 insertions(+), 1 deletion(-)
> create mode 100644 0003-Regenerate-against-the-latest-API.patch
>
>diff --git a/0003-Regenerate-against-the-latest-API.patch b/0003-Regenerate-against-the-latest-API.patch
>new file mode 100644
>index 0000000..b9a00c1
>--- /dev/null
>+++ b/0003-Regenerate-against-the-latest-API.patch
>@@ -0,0 +1,725 @@
>+From 1775746011ff7d2f4c469941362f8a61b64be769 Mon Sep 17 00:00:00 2001
>+From: Juan Hernandez <juan.hernandez@redhat.com>
>+Date: Mon, 6 Oct 2014 11:08:26 +0200
>+Subject: [PATCH] sdk: Regenerate against the latest API
>+
>+This patch regenerates the SDK using the latest API obtained from the
>+engine built from commit e00fbdb, build vt5.
>+
>+Change-Id: Ie33661115581ad55782009f7a26ee849ead7d6df
>+Signed-off-by: Juan Hernandez <juan.hernandez@redhat.com>
>+---
>+ .../src/main/resources/api.rsdl | 8 +-
>+ .../src/main/resources/api.xsd | 30 ++++++
>+ .../java/org/ovirt/engine/sdk/decorators/Host.java | 12 +--
>+ .../org/ovirt/engine/sdk/decorators/Hosts.java | 12 +--
>+ .../java/org/ovirt/engine/sdk/entities/Host.java | 31 ++++++
>+ .../org/ovirt/engine/sdk/entities/JobOwner.java | 21 ++++
>+ .../ovirt/engine/sdk/entities/ObjectFactory.java | 36 +++++++
>+ .../java/org/ovirt/engine/sdk/entities/SPM.java | 116 +++++++++++++++++++++
>+ .../org/ovirt/engine/sdk/entities/SpmStates.java | 98 +++++++++++++++++
>+ .../org/ovirt/engine/sdk/entities/VersionCaps.java | 32 ++++++
>+ 10 files changed, 380 insertions(+), 16 deletions(-)
>+ create mode 100644 ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/SPM.java
>+ create mode 100644 ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/SpmStates.java
>+
>+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 b0ba6fd..6eab335 100644
>+--- a/ovirt-engine-sdk-java-codegen/src/main/resources/api.rsdl
>++++ b/ovirt-engine-sdk-java-codegen/src/main/resources/api.rsdl
>+@@ -5700,7 +5700,7 @@ or less indicates that the session should never timeout</description>
>+ <name>host.display.address</name>
>+ </parameter>
>+ <parameter required="false" type="xs:int">
>+- <name>host.storage_manager.priority</name>
>++ <name>host.spm.priority</name>
>+ </parameter>
>+ <parameter required="false" type="xs:string">
>+ <name>host.power_management.type</name>
>+@@ -5816,7 +5816,7 @@ or less indicates that the session should never timeout</description>
>+ <name>host.display.address</name>
>+ </parameter>
>+ <parameter required="false" type="xs:int">
>+- <name>host.storage_manager.priority</name>
>++ <name>host.spm.priority</name>
>+ </parameter>
>+ <parameter required="false" type="xs:string">
>+ <name>host.power_management.type</name>
>+@@ -6046,7 +6046,7 @@ or less indicates that the session should never timeout</description>
>+ <name>host.port</name>
>+ </parameter>
>+ <parameter required="false" type="xs:int">
>+- <name>host.storage_manager.priority</name>
>++ <name>host.spm.priority</name>
>+ </parameter>
>+ <parameter required="false" type="xs:string">
>+ <name>host.power_management.type</name>
>+@@ -6147,7 +6147,7 @@ or less indicates that the session should never timeout</description>
>+ <name>host.port</name>
>+ </parameter>
>+ <parameter required="false" type="xs:int">
>+- <name>host.storage_manager.priority</name>
>++ <name>host.spm.priority</name>
>+ </parameter>
>+ <parameter required="false" type="xs:string">
>+ <name>host.power_management.type</name>
>+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 1973439..036f673 100644
>+--- a/ovirt-engine-sdk-java-codegen/src/main/resources/api.xsd
>++++ b/ovirt-engine-sdk-java-codegen/src/main/resources/api.xsd
>+@@ -634,6 +634,7 @@
>+ <xs:element ref="watchdog_actions" minOccurs="0"/>
>+ <xs:element ref="authentication_methods" minOccurs="0"/>
>+ <xs:element ref="kdump_states" minOccurs="0"/>
>++ <xs:element ref="spm_states" minOccurs="0"/>
>+ 
>+ <xs:element ref="step_types" minOccurs="0"/>
>+ <xs:element ref="payload_encodings" minOccurs="0"/>
>+@@ -1089,6 +1090,20 @@
>+ </xs:sequence>
>+ </xs:complexType>
>+ 
>++ <xs:element name="spm_states" type="SpmStates"/>
>++
>++ <xs:complexType name="SpmStates">
>++ <xs:sequence>
>++ <xs:element name="spm_state" type="xs:string" minOccurs="0" maxOccurs="unbounded">
>++ <xs:annotation>
>++ <xs:appinfo>
>++ <jaxb:property name="SpmStates"/>
>++ </xs:appinfo>
>++ </xs:annotation>
>++ </xs:element>
>++ </xs:sequence>
>++ </xs:complexType>
>++
>+ 
>+ 
>+ <xs:element name="architecture_capability" type="ArchitectureCapability"/>
>+@@ -1711,7 +1726,10 @@
>+ e.g. the standard VDSM port 54321 -->
>+ <xs:element name="port" type="xs:unsignedShort" minOccurs="0"/>
>+ <xs:element name="type" type="xs:string" minOccurs="0"/>
>++ 
>+ <xs:element name="storage_manager" type="StorageManager" minOccurs="0"/>
>++ <xs:element name="spm" type="SPM" minOccurs="0"/>
>+ <xs:element name="version" type="Version" minOccurs="0"/>
>+ <xs:element ref="hardware_information" minOccurs="0"/>
>+ <xs:element ref="power_management" minOccurs="0"/>
>+@@ -1747,6 +1765,8 @@
>+ </xs:complexContent>
>+ </xs:complexType>
>+ 
>++ 
>+ <xs:element name="storage_manager" type="StorageManager"/>
>+ 
>+ <xs:complexType name="StorageManager">
>+@@ -1763,6 +1783,16 @@
>+ </xs:simpleContent>
>+ </xs:complexType>
>+ 
>++ <xs:element name="spm" type="SPM"/>
>++
>++ <xs:complexType name="SPM">
>++ <xs:sequence>
>++ <xs:element name="priority" type="xs:int" minOccurs="0" maxOccurs="1"/>
>++
>++ <xs:element ref="status" minOccurs="0" maxOccurs="1"/>
>++ </xs:sequence>
>++ </xs:complexType>
>++
>+ <xs:element name="hosted_engine" type="HostedEngine"/>
>+ 
>+ <xs:complexType name="HostedEngine">
>+diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Host.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Host.java
>+index 98cc87c..dbaed62 100644
>+--- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Host.java
>++++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Host.java
>+@@ -376,7 +376,7 @@ public class Host extends
>+ * [host.display.address]
>+ * [host.cluster.id|name]
>+ * [host.port]
>+- * [host.storage_manager.priority]
>++ * [host.spm.priority]
>+ * [host.power_management.type]
>+ * [host.power_management.enabled]
>+ * [host.power_management.address]
>+@@ -401,7 +401,7 @@ public class Host extends
>+ * [host.display.address]
>+ * [host.cluster.id|name]
>+ * [host.port]
>+- * [host.storage_manager.priority]
>++ * [host.spm.priority]
>+ * [host.power_management.type]
>+ * [host.power_management.automatic_pm_enabled]
>+ * [host.power_management.enabled]
>+@@ -460,7 +460,7 @@ public class Host extends
>+ * [host.display.address]
>+ * [host.cluster.id|name]
>+ * [host.port]
>+- * [host.storage_manager.priority]
>++ * [host.spm.priority]
>+ * [host.power_management.type]
>+ * [host.power_management.enabled]
>+ * [host.power_management.address]
>+@@ -485,7 +485,7 @@ public class Host extends
>+ * [host.display.address]
>+ * [host.cluster.id|name]
>+ * [host.port]
>+- * [host.storage_manager.priority]
>++ * [host.spm.priority]
>+ * [host.power_management.type]
>+ * [host.power_management.automatic_pm_enabled]
>+ * [host.power_management.enabled]
>+@@ -552,7 +552,7 @@ public class Host extends
>+ * [host.display.address]
>+ * [host.cluster.id|name]
>+ * [host.port]
>+- * [host.storage_manager.priority]
>++ * [host.spm.priority]
>+ * [host.power_management.type]
>+ * [host.power_management.enabled]
>+ * [host.power_management.address]
>+@@ -577,7 +577,7 @@ public class Host extends
>+ * [host.display.address]
>+ * [host.cluster.id|name]
>+ * [host.port]
>+- * [host.storage_manager.priority]
>++ * [host.spm.priority]
>+ * [host.power_management.type]
>+ * [host.power_management.automatic_pm_enabled]
>+ * [host.power_management.enabled]
>+diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Hosts.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Hosts.java
>+index 7b8aad7..b607e03 100644
>+--- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Hosts.java
>++++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/decorators/Hosts.java
>+@@ -180,7 +180,7 @@ public class Hosts extends
>+ * [host.comment]
>+ * [host.port]
>+ * [host.display.address]
>+- * [host.storage_manager.priority]
>++ * [host.spm.priority]
>+ * [host.power_management.type]
>+ * [host.power_management.enabled]
>+ * [host.power_management.address]
>+@@ -212,7 +212,7 @@ public class Hosts extends
>+ * [host.ssh.user.password]
>+ * [host.port]
>+ * [host.display.address]
>+- * [host.storage_manager.priority]
>++ * [host.spm.priority]
>+ * [host.power_management.type]
>+ * [host.power_management.automatic_pm_enabled]
>+ * [host.power_management.enabled]
>+@@ -272,7 +272,7 @@ public class Hosts extends
>+ * [host.comment]
>+ * [host.port]
>+ * [host.display.address]
>+- * [host.storage_manager.priority]
>++ * [host.spm.priority]
>+ * [host.power_management.type]
>+ * [host.power_management.enabled]
>+ * [host.power_management.address]
>+@@ -304,7 +304,7 @@ public class Hosts extends
>+ * [host.ssh.user.password]
>+ * [host.port]
>+ * [host.display.address]
>+- * [host.storage_manager.priority]
>++ * [host.spm.priority]
>+ * [host.power_management.type]
>+ * [host.power_management.automatic_pm_enabled]
>+ * [host.power_management.enabled]
>+@@ -372,7 +372,7 @@ public class Hosts extends
>+ * [host.comment]
>+ * [host.port]
>+ * [host.display.address]
>+- * [host.storage_manager.priority]
>++ * [host.spm.priority]
>+ * [host.power_management.type]
>+ * [host.power_management.enabled]
>+ * [host.power_management.address]
>+@@ -404,7 +404,7 @@ public class Hosts extends
>+ * [host.ssh.user.password]
>+ * [host.port]
>+ * [host.display.address]
>+- * [host.storage_manager.priority]
>++ * [host.spm.priority]
>+ * [host.power_management.type]
>+ * [host.power_management.automatic_pm_enabled]
>+ * [host.power_management.enabled]
>+diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Host.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Host.java
>+index 8105ede..d46d2c5 100644
>+--- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Host.java
>++++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/Host.java
>+@@ -45,6 +45,7 @@ import javax.xml.bind.annotation.XmlType;
>+ * &lt;element name="port" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/>
>+ * &lt;element name="type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
>+ * &lt;element name="storage_manager" type="{}StorageManager" minOccurs="0"/>
>++ * &lt;element name="spm" type="{}SPM" minOccurs="0"/>
>+ * &lt;element name="version" type="{}Version" minOccurs="0"/>
>+ * &lt;element ref="{}hardware_information" minOccurs="0"/>
>+ * &lt;element ref="{}power_management" minOccurs="0"/>
>+@@ -88,6 +89,7 @@ import javax.xml.bind.annotation.XmlType;
>+ "port",
>+ "type",
>+ "storageManager",
>++ "spm",
>+ "version",
>+ "hardwareInformation",
>+ "powerManagement",
>+@@ -128,6 +130,7 @@ public class Host
>+ protected String type;
>+ @XmlElement(name = "storage_manager")
>+ protected StorageManager storageManager;
>++ protected SPM spm;
>+ protected Version version;
>+ @XmlElement(name = "hardware_information")
>+ protected HardwareInformation hardwareInformation;
>+@@ -365,6 +368,34 @@ public class Host
>+ }
>+ 
>+ /**
>++ * Gets the value of the spm property.
>++ *
>++ * @return
>++ * possible object is
>++ * {@link SPM }
>++ *
>++ */
>++ public SPM getSpm() {
>++ return spm;
>++ }
>++
>++ /**
>++ * Sets the value of the spm property.
>++ *
>++ * @param value
>++ * allowed object is
>++ * {@link SPM }
>++ *
>++ */
>++ public void setSpm(SPM value) {
>++ this.spm = value;
>++ }
>++
>++ public boolean isSetSpm() {
>++ return (this.spm!= null);
>++ }
>++
>++ /**
>+ * Gets the value of the version property.
>+ *
>+ * @return
>+diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/JobOwner.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/JobOwner.java
>+index 4b936ca..b06693b 100644
>+--- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/JobOwner.java
>++++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/JobOwner.java
>+@@ -58,6 +58,26 @@
>+ // ********************* GENERATED CODE - DO NOT MODIFY ****************
>+ // *********************************************************************
>+ 
>++//
>++// 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;
>+ 
>+@@ -93,3 +113,4 @@ public class JobOwner
>+ 
>+ 
>+ 
>++
>+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 eed9a32..ab7386f 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
>+@@ -188,6 +188,7 @@ public class ObjectFactory {
>+ private final static QName _Tag_QNAME = new QName("", "tag");
>+ private final static QName _Domains_QNAME = new QName("", "domains");
>+ private final static QName _Payload_QNAME = new QName("", "payload");
>++ private final static QName _Spm_QNAME = new QName("", "spm");
>+ private final static QName _ArchitectureCapability_QNAME = new QName("", "architecture_capability");
>+ private final static QName _HostStorage_QNAME = new QName("", "host_storage");
>+ private final static QName _HostNics_QNAME = new QName("", "host_nics");
>+@@ -236,6 +237,7 @@ public class ObjectFactory {
>+ private final static QName _Snapshot_QNAME = new QName("", "snapshot");
>+ private final static QName _WatchdogModels_QNAME = new QName("", "watchdog_models");
>+ private final static QName _GlusterVolumeTypes_QNAME = new QName("", "gluster_volume_types");
>++ private final static QName _SpmStates_QNAME = new QName("", "spm_states");
>+ private final static QName _PowerManagement_QNAME = new QName("", "power_management");
>+ private final static QName _Method_QNAME = new QName("", "method");
>+ private final static QName _Capabilities_QNAME = new QName("", "capabilities");
>+@@ -1464,6 +1466,14 @@ public class ObjectFactory {
>+ }
>+ 
>+ /**
>++ * Create an instance of {@link SPM }
>++ *
>++ */
>++ public SPM createSPM() {
>++ return new SPM();
>++ }
>++
>++ /**
>+ * Create an instance of {@link ArchitectureCapability }
>+ *
>+ */
>+@@ -1848,6 +1858,14 @@ public class ObjectFactory {
>+ }
>+ 
>+ /**
>++ * Create an instance of {@link SpmStates }
>++ *
>++ */
>++ public SpmStates createSpmStates() {
>++ return new SpmStates();
>++ }
>++
>++ /**
>+ * Create an instance of {@link PowerManagement }
>+ *
>+ */
>+@@ -4016,6 +4034,15 @@ public class ObjectFactory {
>+ }
>+ 
>+ /**
>++ * Create an instance of {@link JAXBElement }{@code <}{@link SPM }{@code >}}
>++ *
>++ */
>++ @XmlElementDecl(namespace = "", name = "spm")
>++ public JAXBElement<SPM> createSpm(SPM value) {
>++ return new JAXBElement<SPM>(_Spm_QNAME, SPM.class, null, value);
>++ }
>++
>++ /**
>+ * Create an instance of {@link JAXBElement }{@code <}{@link ArchitectureCapability }{@code >}}
>+ *
>+ */
>+@@ -4448,6 +4475,15 @@ public class ObjectFactory {
>+ }
>+ 
>+ /**
>++ * Create an instance of {@link JAXBElement }{@code <}{@link SpmStates }{@code >}}
>++ *
>++ */
>++ @XmlElementDecl(namespace = "", name = "spm_states")
>++ public JAXBElement<SpmStates> createSpmStates(SpmStates value) {
>++ return new JAXBElement<SpmStates>(_SpmStates_QNAME, SpmStates.class, null, value);
>++ }
>++
>++ /**
>+ * Create an instance of {@link JAXBElement }{@code <}{@link PowerManagement }{@code >}}
>+ *
>+ */
>+diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/SPM.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/SPM.java
>+new file mode 100644
>+index 0000000..471dc88
>+--- /dev/null
>++++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/SPM.java
>+@@ -0,0 +1,116 @@
>++//
>++// 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 javax.xml.bind.annotation.XmlAccessType;
>++import javax.xml.bind.annotation.XmlAccessorType;
>++import javax.xml.bind.annotation.XmlType;
>++
>++
>++/**
>++ * Java class for SPM complex type.
>++ *
>++ * The following schema fragment specifies the expected content contained within this class.
>++ *
>++ * <pre>
>++ * &lt;complexType name="SPM">
>++ * &lt;complexContent>
>++ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
>++ * &lt;sequence>
>++ * &lt;element name="priority" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
>++ * &lt;element ref="{}status" minOccurs="0"/>
>++ * &lt;/sequence>
>++ * &lt;/restriction>
>++ * &lt;/complexContent>
>++ * &lt;/complexType>
>++ * </pre>
>++ *
>++ *
>++ */
>++@XmlAccessorType(XmlAccessType.FIELD)
>++@XmlType(name = "SPM", propOrder = {
>++ "priority",
>++ "status"
>++})
>++public class SPM {
>++
>++ protected Integer priority;
>++ protected Status status;
>++
>++ /**
>++ * Gets the value of the priority property.
>++ *
>++ * @return
>++ * possible object is
>++ * {@link Integer }
>++ *
>++ */
>++ public Integer getPriority() {
>++ return priority;
>++ }
>++
>++ /**
>++ * Sets the value of the priority property.
>++ *
>++ * @param value
>++ * allowed object is
>++ * {@link Integer }
>++ *
>++ */
>++ public void setPriority(Integer value) {
>++ this.priority = value;
>++ }
>++
>++ public boolean isSetPriority() {
>++ return (this.priority!= null);
>++ }
>++
>++ /**
>++ * Gets the value of the status property.
>++ *
>++ * @return
>++ * possible object is
>++ * {@link Status }
>++ *
>++ */
>++ public Status getStatus() {
>++ return status;
>++ }
>++
>++ /**
>++ * Sets the value of the status property.
>++ *
>++ * @param value
>++ * allowed object is
>++ * {@link Status }
>++ *
>++ */
>++ public void setStatus(Status value) {
>++ this.status = value;
>++ }
>++
>++ public boolean isSetStatus() {
>++ return (this.status!= null);
>++ }
>++
>++}
>++
>+diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/SpmStates.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/SpmStates.java
>+new file mode 100644
>+index 0000000..46d9a47
>+--- /dev/null
>++++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/entities/SpmStates.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;
>++
>++
>++/**
>++ * Java class for SpmStates complex type.
>++ *
>++ * The following schema fragment specifies the expected content contained within this class.
>++ *
>++ * <pre>
>++ * &lt;complexType name="SpmStates">
>++ * &lt;complexContent>
>++ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
>++ * &lt;sequence>
>++ * &lt;element name="spm_state" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
>++ * &lt;/sequence>
>++ * &lt;/restriction>
>++ * &lt;/complexContent>
>++ * &lt;/complexType>
>++ * </pre>
>++ *
>++ *
>++ */
>++@XmlAccessorType(XmlAccessType.FIELD)
>++@XmlType(name = "SpmStates", propOrder = {
>++ "spmStates"
>++})
>++public class SpmStates {
>++
>++ @XmlElement(name = "spm_state")
>++ protected List<String> spmStates;
>++
>++ /**
>++ * Gets the value of the spmStates property.
>++ *
>++ * 
>++ * 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 spmStates property.
>++ *
>++ * 
>++ * For example, to add a new item, do as follows:
>++ * <pre>
>++ * getSpmStates().add(newItem);
>++ * </pre>
>++ *
>++ *
>++ * 
>++ * Objects of the following type(s) are allowed in the list
>++ * {@link String }
>++ *
>++ *
>++ */
>++ public List<String> getSpmStates() {
>++ if (spmStates == null) {
>++ spmStates = new ArrayList<String>();
>++ }
>++ return this.spmStates;
>++ }
>++
>++ public boolean isSetSpmStates() {
>++ return ((this.spmStates!= null)&&(!this.spmStates.isEmpty()));
>++ }
>++
>++ public void unsetSpmStates() {
>++ this.spmStates = 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 2e88b1a..34f76d8 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
>+@@ -81,6 +81,7 @@ import javax.xml.bind.annotation.XmlType;
>+ * &lt;element ref="{}watchdog_actions" minOccurs="0"/>
>+ * &lt;element ref="{}authentication_methods" minOccurs="0"/>
>+ * &lt;element ref="{}kdump_states" minOccurs="0"/>
>++ * &lt;element ref="{}spm_states" minOccurs="0"/>
>+ * &lt;element ref="{}step_types" minOccurs="0"/>
>+ * &lt;element ref="{}payload_encodings" minOccurs="0"/>
>+ * &lt;element ref="{}gluster_volume_types" minOccurs="0"/>
>+@@ -154,6 +155,7 @@ import javax.xml.bind.annotation.XmlType;
>+ "watchdogActions",
>+ "authenticationMethods",
>+ "kdumpStates",
>++ "spmStates",
>+ "stepTypes",
>+ "payloadEncodings",
>+ "glusterVolumeTypes",
>+@@ -261,6 +263,8 @@ public class VersionCaps
>+ protected AuthenticationMethod authenticationMethods;
>+ @XmlElement(name = "kdump_states")
>+ protected KdumpStates kdumpStates;
>++ @XmlElement(name = "spm_states")
>++ protected SpmStates spmStates;
>+ @XmlElement(name = "step_types")
>+ protected StepTypes stepTypes;
>+ @XmlElement(name = "payload_encodings")
>+@@ -1532,6 +1536,34 @@ public class VersionCaps
>+ }
>+ 
>+ /**
>++ * Gets the value of the spmStates property.
>++ *
>++ * @return
>++ * possible object is
>++ * {@link SpmStates }
>++ *
>++ */
>++ public SpmStates getSpmStates() {
>++ return spmStates;
>++ }
>++
>++ /**
>++ * Sets the value of the spmStates property.
>++ *
>++ * @param value
>++ * allowed object is
>++ * {@link SpmStates }
>++ *
>++ */
>++ public void setSpmStates(SpmStates value) {
>++ this.spmStates = value;
>++ }
>++
>++ public boolean isSetSpmStates() {
>++ return (this.spmStates!= null);
>++ }
>++
>++ /**
>+ * Gets the value of the stepTypes property.
>+ *
>+ * @return
>+-- 
>+1.9.3
>+
>diff --git a/rhevm-sdk-java.spec b/rhevm-sdk-java.spec
>index 3ebd236..02feec8 100644
>--- a/rhevm-sdk-java.spec
>+++ b/rhevm-sdk-java.spec
>@@ -1,6 +1,6 @@
> Name: rhevm-sdk-java
> Version: 3.5.0.5
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> Summary: RHEVM Engine Java Software Development Kit
> Group: Development/Libraries
> License: ASL 2.0
>@@ -20,6 +20,9 @@ Source1: build.xml
> Patch0: 0001-Revert-sdk-implement-AutoCloseable.patch
> Patch1: 0002-Revert-sdk-maven-compile-with-jdk-1.7.patch
> 
>+# Regenerate against the latest API:
>+Patch2: 0003-Regenerate-against-the-latest-API.patch
>+
> BuildArch: noarch
> 
> BuildRequires: ant >= 1.7
>@@ -61,6 +64,7 @@ This package contains the API documentation for %{name}.
> # Apply the patches:
> %patch0 -p1
> %patch1 -p1
>+%patch2 -p1
> 
> %build
> 
>@@ -109,6 +113,9 @@ ln -s %{name}-%{version}-javadoc.jar %{buildroot}%{_javadocdir}/%{name}/%{name}-
> %{_javadocdir}/%{name}
> 
> %changelog
>+* Mon Oct 6 2014 Juan Hernandez <juan.hernandez@redhat.com> - 3.5.0.5-2
>+- Replace storage_manager with spm #1146457.
>+
> * Wed Sep 10 2014 Juan Hernandez <juan.hernandez@redhat.com> - 3.5.0.5-1
> - Update to upstream 3.5.0.5.
> - Added support for watchdog action and model #1129840.
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1149107: 944191