Attachment 944188 Details for Bug 1149106 – Proposed patch to fix the issue

[patch] Proposed patch to fix the issue

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

(hide)

Description:

Filename:

MIME Type:

Creator: Juan Hernández

Created: 2014-10-06 09:04:38 UTC

Size: 33.09 KB

patch

obsolete

>From 95cb98ed57ae5b07ac4dcdaab16436fa156f258a Mon Sep 17 00:00:00 2001
>From: Juan Hernandez <juan.hernandez@redhat.com>
>Date: Mon, 6 Oct 2014 10:57:58 +0200
>Subject: [PATCH] Regenerate against latest API
>
>This change adds a patch that regenerates the SDK using the latest API
>obtained from engine built from commit e00fbdb, build vt5.
>
>Resolves: rhbz#1149106
>Signed-off-by: Juan Hernandez <juan.hernandez@redhat.com>
>---
> 0002-Regenerate-against-the-latest-API.patch | 601 +++++++++++++++++++++++++++
> rhevm-sdk-python.spec                        |   9 +-
> 2 files changed, 609 insertions(+), 1 deletion(-)
> create mode 100644 0002-Regenerate-against-the-latest-API.patch
>
>diff --git a/0002-Regenerate-against-the-latest-API.patch b/0002-Regenerate-against-the-latest-API.patch
>new file mode 100644
>index 0000000..e1b5644
>--- /dev/null
>+++ b/0002-Regenerate-against-the-latest-API.patch
>@@ -0,0 +1,601 @@
>+From cf8b3b6b2a3053cc47c083e900fe1867cefbe9d0 Mon Sep 17 00:00:00 2001
>+From: Juan Hernandez <juan.hernandez@redhat.com>
>+Date: Mon, 6 Oct 2014 10:48:22 +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.
>+
>+Change-Id: I2c5e72cb44138964ee068f3913c47b8e05fe2790
>+Signed-off-by: Juan Hernandez <juan.hernandez@redhat.com>
>+---
>+ generator/src/main/resources/api.rsdl  |   8 +-
>+ generator/src/main/resources/api.xsd   |  30 +++++
>+ src/ovirtsdk/api.py                    |   2 +-
>+ src/ovirtsdk/infrastructure/brokers.py |  10 +-
>+ src/ovirtsdk/xml/params.py             | 229 ++++++++++++++++++++++++++++++++-
>+ 5 files changed, 265 insertions(+), 14 deletions(-)
>+
>+diff --git a/generator/src/main/resources/api.rsdl b/generator/src/main/resources/api.rsdl
>+index b0ba6fd..6eab335 100644
>+--- a/generator/src/main/resources/api.rsdl
>++++ b/generator/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/generator/src/main/resources/api.xsd b/generator/src/main/resources/api.xsd
>+index 1973439..036f673 100644
>+--- a/generator/src/main/resources/api.xsd
>++++ b/generator/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/src/ovirtsdk/api.py b/src/ovirtsdk/api.py
>+index 27d8746..bc532b3 100644
>+--- a/src/ovirtsdk/api.py
>++++ b/src/ovirtsdk/api.py
>+@@ -20,7 +20,7 @@
>+ ############ GENERATED CODE ############
>+ ########################################
>+ 
>+-'''Generated at: 2014-09-10 14:16:23.000109'''
>++'''Generated at: 2014-10-06 10:46:26.000887'''
>+ 
>+ import types
>+ import urlparse
>+diff --git a/src/ovirtsdk/infrastructure/brokers.py b/src/ovirtsdk/infrastructure/brokers.py
>+index 2edd773..5bb052f 100644
>+--- a/src/ovirtsdk/infrastructure/brokers.py
>++++ b/src/ovirtsdk/infrastructure/brokers.py
>+@@ -19,7 +19,7 @@
>+ ############ GENERATED CODE ############
>+ ########################################
>+ 
>+-'''Generated at: 2014-09-10 14:16:22.000940'''
>++'''Generated at: 2014-10-06 10:46:26.000728'''
>+ 
>+ 
>+ from ovirtsdk.xml import params
>+@@ -11216,7 +11216,7 @@ class Host(params.Host, Base):
>+           [@param host.display.address: string]
>+           [@param host.cluster.id|name: string]
>+           [@param host.port: int]
>+-          [@param host.storage_manager.priority: int]
>++          [@param host.spm.priority: int]
>+           [@param host.power_management.type: string]
>+           [@param host.power_management.enabled: boolean]
>+           [@param host.power_management.address: string]
>+@@ -11255,7 +11255,7 @@ class Host(params.Host, Base):
>+           [@param host.display.address: string]
>+           [@param host.cluster.id|name: string]
>+           [@param host.port: int]
>+-          [@param host.storage_manager.priority: int]
>++          [@param host.spm.priority: int]
>+           [@param host.power_management.type: string]
>+           [@param host.power_management.automatic_pm_enabled: boolean]
>+           [@param host.power_management.enabled: boolean]
>+@@ -13164,7 +13164,7 @@ class Hosts(Base):
>+           [@param host.comment: string]
>+           [@param host.port: int]
>+           [@param host.display.address: string]
>+-          [@param host.storage_manager.priority: int]
>++          [@param host.spm.priority: int]
>+           [@param host.power_management.type: string]
>+           [@param host.power_management.enabled: boolean]
>+           [@param host.power_management.address: string]
>+@@ -13208,7 +13208,7 @@ class Hosts(Base):
>+           [@param host.ssh.user.password: string]
>+           [@param host.port: int]
>+           [@param host.display.address: string]
>+-          [@param host.storage_manager.priority: int]
>++          [@param host.spm.priority: int]
>+           [@param host.power_management.type: string]
>+           [@param host.power_management.automatic_pm_enabled: boolean]
>+           [@param host.power_management.enabled: boolean]
>+diff --git a/src/ovirtsdk/xml/params.py b/src/ovirtsdk/xml/params.py
>+index f3f465b..df37b05 100644
>+--- a/src/ovirtsdk/xml/params.py
>++++ b/src/ovirtsdk/xml/params.py
>+@@ -2,7 +2,7 @@
>+ # -*- coding: utf-8 -*-
>+ 
>+ #
>+-# Generated Wed Sep 10 14:16:20 2014 by generateDS.py version 2.12a.
>++# Generated Mon Oct  6 10:46:24 2014 by generateDS.py version 2.12a.
>+ #
>+ 
>+ import sys
>+@@ -5442,6 +5442,92 @@ class KdumpStates(GeneratedsSuper):
>+ # end class KdumpStates
>+ 
>+ 
>++class SpmStates(GeneratedsSuper):
>++    subclass = None
>++    superclass = None
>++    def __init__(self, spm_state=None):
>++        if spm_state is None:
>++            self.spm_state = []
>++        else:
>++            self.spm_state = spm_state
>++    def factory(*args_, **kwargs_):
>++        if SpmStates.subclass:
>++            return SpmStates.subclass(*args_, **kwargs_)
>++        else:
>++            return SpmStates(*args_, **kwargs_)
>++    factory = staticmethod(factory)
>++    def get_spm_state(self): return self.spm_state
>++    def set_spm_state(self, spm_state): self.spm_state = spm_state
>++    def add_spm_state(self, value): self.spm_state.append(value)
>++    def insert_spm_state(self, index, value): self.spm_state[index] = value
>++    def hasContent_(self):
>++        if (
>++            self.spm_state
>++        ):
>++            return True
>++        else:
>++            return False
>++    def export(self, outfile, level, namespace_='', name_='SpmStates', namespacedef_='', pretty_print=True):
>++        if pretty_print:
>++            eol_ = '\n'
>++        else:
>++            eol_ = ''
>++        showIndent(outfile, level, pretty_print)
>++        outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
>++        already_processed = set()
>++        self.exportAttributes(outfile, level, already_processed, namespace_, name_='SpmStates')
>++        if self.hasContent_():
>++            outfile.write('>%s' % (eol_, ))
>++            self.exportChildren(outfile, level + 1, namespace_, name_, pretty_print=pretty_print)
>++            showIndent(outfile, level, pretty_print)
>++            outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
>++        else:
>++            outfile.write('/>%s' % (eol_, ))
>++    def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='SpmStates'):
>++        pass
>++    def exportChildren(self, outfile, level, namespace_='', name_='SpmStates', fromsubclass_=False, pretty_print=True):
>++        if pretty_print:
>++            eol_ = '\n'
>++        else:
>++            eol_ = ''
>++        for spm_state_ in self.spm_state:
>++            showIndent(outfile, level, pretty_print)
>++            outfile.write('<%sspm_state>%s</%sspm_state>%s' % (namespace_, self.gds_format_string(quote_xml(spm_state_).encode(ExternalEncoding), input_name='spm_state'), namespace_, eol_))
>++    def exportLiteral(self, outfile, level, name_='SpmStates'):
>++        level += 1
>++        already_processed = set()
>++        self.exportLiteralAttributes(outfile, level, already_processed, name_)
>++        if self.hasContent_():
>++            self.exportLiteralChildren(outfile, level, name_)
>++    def exportLiteralAttributes(self, outfile, level, already_processed, name_):
>++        pass
>++    def exportLiteralChildren(self, outfile, level, name_):
>++        showIndent(outfile, level)
>++        outfile.write('spm_state=[\n')
>++        level += 1
>++        for spm_state_ in self.spm_state:
>++            showIndent(outfile, level)
>++            outfile.write('%s,\n' % quote_python(spm_state_).encode(ExternalEncoding))
>++        level -= 1
>++        showIndent(outfile, level)
>++        outfile.write('],\n')
>++    def build(self, node):
>++        already_processed = set()
>++        self.buildAttributes(node, node.attrib, already_processed)
>++        for child in node:
>++            nodeName_ = Tag_pattern_.match(child.tag).groups()[-1]
>++            self.buildChildren(child, node, nodeName_)
>++        return self
>++    def buildAttributes(self, node, attrs, already_processed):
>++        pass
>++    def buildChildren(self, child_, node, nodeName_, fromsubclass_=False):
>++        if nodeName_ == 'spm_state':
>++            spm_state_ = child_.text
>++            spm_state_ = self.gds_validate_string(spm_state_, node, 'spm_state')
>++            self.spm_state.append(spm_state_)
>++# end class SpmStates
>++
>++
>+ class ArchitectureCapability(GeneratedsSuper):
>+     subclass = None
>+     superclass = None
>+@@ -9895,7 +9981,7 @@ class SELinux(GeneratedsSuper):
>+ class Host(BaseResource):
>+     subclass = None
>+     superclass = BaseResource
>+-    def __init__(self, actions=None, href=None, id=None, name=None, description=None, comment=None, creation_status=None, link=None, address=None, certificate=None, status=None, cluster=None, port=None, type_=None, storage_manager=None, version=None, hardware_information=None, power_management=None, ksm=None, transparent_hugepages=None, iscsi=None, root_password=None, ssh=None, statistics=None, cpu=None, memory=None, max_scheduling_memory=None, summary=None, override_iptables=None, protocol=None, reboot_after_installation=None, os=None, hooks=None, libvirt_version=None, display=None, hosted_engine=None, kdump_status=None, selinux=None, auto_numa_status=None, numa_supported=None, live_snapshot_support=None):
>++    def __init__(self, actions=None, href=None, id=None, name=None, description=None, comment=None, creation_status=None, link=None, address=None, certificate=None, status=None, cluster=None, port=None, type_=None, storage_manager=None, spm=None, version=None, hardware_information=None, power_management=None, ksm=None, transparent_hugepages=None, iscsi=None, root_password=None, ssh=None, statistics=None, cpu=None, memory=None, max_scheduling_memory=None, summary=None, override_iptables=None, protocol=None, reboot_after_installation=None, os=None, hooks=None, libvirt_version=None, display=None, hosted_engine=None, kdump_status=None, selinux=None, auto_numa_status=None, numa_supported=None, live_snapshot_support=None):
>+         super(Host, self).__init__(actions, href, id, name, description, comment, creation_status, link, )
>+         self.address = address
>+         self.certificate = certificate
>+@@ -9904,6 +9990,7 @@ class Host(BaseResource):
>+         self.port = port
>+         self.type_ = type_
>+         self.storage_manager = storage_manager
>++        self.spm = spm
>+         self.version = version
>+         self.hardware_information = hardware_information
>+         self.power_management = power_management
>+@@ -9950,6 +10037,8 @@ class Host(BaseResource):
>+     def set_type(self, type_): self.type_ = type_
>+     def get_storage_manager(self): return self.storage_manager
>+     def set_storage_manager(self, storage_manager): self.storage_manager = storage_manager
>++    def get_spm(self): return self.spm
>++    def set_spm(self, spm): self.spm = spm
>+     def get_version(self): return self.version
>+     def set_version(self, version): self.version = version
>+     def get_hardware_information(self): return self.hardware_information
>+@@ -10011,6 +10100,7 @@ class Host(BaseResource):
>+             self.port is not None or
>+             self.type_ is not None or
>+             self.storage_manager is not None or
>++            self.spm is not None or
>+             self.version is not None or
>+             self.hardware_information is not None or
>+             self.power_management is not None or
>+@@ -10083,6 +10173,8 @@ class Host(BaseResource):
>+             outfile.write('<%stype>%s</%stype>%s' % (namespace_, self.gds_format_string(quote_xml(self.type_).encode(ExternalEncoding), input_name='type'), namespace_, eol_))
>+         if self.storage_manager is not None:
>+             self.storage_manager.export(outfile, level, namespace_, name_='storage_manager', pretty_print=pretty_print)
>++        if self.spm is not None:
>++            self.spm.export(outfile, level, namespace_, name_='spm', pretty_print=pretty_print)
>+         if self.version is not None:
>+             self.version.export(outfile, level, namespace_, name_='version', pretty_print=pretty_print)
>+         if self.hardware_information is not None:
>+@@ -10188,6 +10280,12 @@ class Host(BaseResource):
>+             self.storage_manager.exportLiteral(outfile, level, name_='storage_manager')
>+             showIndent(outfile, level)
>+             outfile.write('),\n')
>++        if self.spm is not None:
>++            showIndent(outfile, level)
>++            outfile.write('spm=model_.SPM(\n')
>++            self.spm.exportLiteral(outfile, level, name_='spm')
>++            showIndent(outfile, level)
>++            outfile.write('),\n')
>+         if self.version is not None:
>+             showIndent(outfile, level)
>+             outfile.write('version=model_.Version(\n')
>+@@ -10356,6 +10454,10 @@ class Host(BaseResource):
>+             obj_ = StorageManager.factory()
>+             obj_.build(child_)
>+             self.storage_manager = obj_
>++        elif nodeName_ == 'spm':
>++            obj_ = SPM.factory()
>++            obj_.build(child_)
>++            self.spm = obj_
>+         elif nodeName_ == 'version':
>+             class_obj_ = self.get_class_obj_(child_, Version)
>+             obj_ = class_obj_.factory()
>+@@ -10579,6 +10681,101 @@ class StorageManager(GeneratedsSuper):
>+ # end class StorageManager
>+ 
>+ 
>++class SPM(GeneratedsSuper):
>++    subclass = None
>++    superclass = None
>++    def __init__(self, priority=None, status=None):
>++        self.priority = priority
>++        self.status = status
>++    def factory(*args_, **kwargs_):
>++        if SPM.subclass:
>++            return SPM.subclass(*args_, **kwargs_)
>++        else:
>++            return SPM(*args_, **kwargs_)
>++    factory = staticmethod(factory)
>++    def get_priority(self): return self.priority
>++    def set_priority(self, priority): self.priority = priority
>++    def get_status(self): return self.status
>++    def set_status(self, status): self.status = status
>++    def hasContent_(self):
>++        if (
>++            self.priority is not None or
>++            self.status is not None
>++        ):
>++            return True
>++        else:
>++            return False
>++    def export(self, outfile, level, namespace_='', name_='SPM', namespacedef_='', pretty_print=True):
>++        if pretty_print:
>++            eol_ = '\n'
>++        else:
>++            eol_ = ''
>++        showIndent(outfile, level, pretty_print)
>++        outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
>++        already_processed = set()
>++        self.exportAttributes(outfile, level, already_processed, namespace_, name_='SPM')
>++        if self.hasContent_():
>++            outfile.write('>%s' % (eol_, ))
>++            self.exportChildren(outfile, level + 1, namespace_, name_, pretty_print=pretty_print)
>++            showIndent(outfile, level, pretty_print)
>++            outfile.write('</%s%s>%s' % (namespace_, name_, eol_))
>++        else:
>++            outfile.write('/>%s' % (eol_, ))
>++    def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='SPM'):
>++        pass
>++    def exportChildren(self, outfile, level, namespace_='', name_='SPM', fromsubclass_=False, pretty_print=True):
>++        if pretty_print:
>++            eol_ = '\n'
>++        else:
>++            eol_ = ''
>++        if self.priority is not None:
>++            showIndent(outfile, level, pretty_print)
>++            outfile.write('<%spriority>%s</%spriority>%s' % (namespace_, self.gds_format_integer(self.priority, input_name='priority'), namespace_, eol_))
>++        if self.status is not None:
>++            self.status.export(outfile, level, namespace_, name_='status', pretty_print=pretty_print)
>++    def exportLiteral(self, outfile, level, name_='SPM'):
>++        level += 1
>++        already_processed = set()
>++        self.exportLiteralAttributes(outfile, level, already_processed, name_)
>++        if self.hasContent_():
>++            self.exportLiteralChildren(outfile, level, name_)
>++    def exportLiteralAttributes(self, outfile, level, already_processed, name_):
>++        pass
>++    def exportLiteralChildren(self, outfile, level, name_):
>++        if self.priority is not None:
>++            showIndent(outfile, level)
>++            outfile.write('priority=%d,\n' % self.priority)
>++        if self.status is not None:
>++            showIndent(outfile, level)
>++            outfile.write('status=model_.status(\n')
>++            self.status.exportLiteral(outfile, level)
>++            showIndent(outfile, level)
>++            outfile.write('),\n')
>++    def build(self, node):
>++        already_processed = set()
>++        self.buildAttributes(node, node.attrib, already_processed)
>++        for child in node:
>++            nodeName_ = Tag_pattern_.match(child.tag).groups()[-1]
>++            self.buildChildren(child, node, nodeName_)
>++        return self
>++    def buildAttributes(self, node, attrs, already_processed):
>++        pass
>++    def buildChildren(self, child_, node, nodeName_, fromsubclass_=False):
>++        if nodeName_ == 'priority':
>++            sval_ = child_.text
>++            try:
>++                ival_ = int(sval_)
>++            except (TypeError, ValueError), exp:
>++                raise_parse_error(child_, 'requires integer: %s' % exp)
>++            ival_ = self.gds_validate_integer(ival_, node, 'priority')
>++            self.priority = ival_
>++        elif nodeName_ == 'status':
>++            obj_ = Status.factory()
>++            obj_.build(child_)
>++            self.status = obj_
>++# end class SPM
>++
>++
>+ class HostedEngine(GeneratedsSuper):
>+     subclass = None
>+     superclass = None
>+@@ -37148,7 +37345,7 @@ class GeneralMetadata(DetailedLink):
>+ class VersionCaps(Version):
>+     subclass = None
>+     superclass = Version
>+-    def __init__(self, actions=None, href=None, id=None, name=None, description=None, comment=None, creation_status=None, link=None, major=None, full_version=None, build_=None, minor=None, revision=None, current=None, features=None, cpus=None, power_managers=None, fence_types=None, storage_types=None, configuration_types=None, storage_domain_types=None, vm_types=None, boot_devices=None, display_types=None, nic_interfaces=None, os_types=None, disk_formats=None, disk_interfaces=None, vm_affinities=None, custom_properties=None, boot_protocols=None, error_handling=None, storage_formats=None, creation_states=None, power_management_states=None, host_states=None, host_non_operational_details=None, network_states=None, storage_domain_states=None, template_states=None, vm_states=None, vm_pause_details=None, disk_states=None, host_nic_states=None, data_center_states=None, vm_device_types=None, permits=None, scheduling_policies=None, usages=None, nfs_versions=None, pm_proxy_types=None, cpu_modes=None, sgio_options=None, watchdog_models=None, watchdog_actions=None, authentication_methods=None, kdump_states=None, step_types=None, payload_encodings=None, gluster_volume_types=None, transport_types=None, gluster_volume_states=None, brick_states=None, reported_device_types=None, ip_versions=None, snapshot_statuses=None, content_types=None, hook_states=None, stages=None, sso_methods=None, architecture_capabilities=None, serial_number_policies=None, selinux_modes=None, rng_sources=None, scheduling_policy_unit_types=None, qos_types=None):
>++    def __init__(self, actions=None, href=None, id=None, name=None, description=None, comment=None, creation_status=None, link=None, major=None, full_version=None, build_=None, minor=None, revision=None, current=None, features=None, cpus=None, power_managers=None, fence_types=None, storage_types=None, configuration_types=None, storage_domain_types=None, vm_types=None, boot_devices=None, display_types=None, nic_interfaces=None, os_types=None, disk_formats=None, disk_interfaces=None, vm_affinities=None, custom_properties=None, boot_protocols=None, error_handling=None, storage_formats=None, creation_states=None, power_management_states=None, host_states=None, host_non_operational_details=None, network_states=None, storage_domain_states=None, template_states=None, vm_states=None, vm_pause_details=None, disk_states=None, host_nic_states=None, data_center_states=None, vm_device_types=None, permits=None, scheduling_policies=None, usages=None, nfs_versions=None, pm_proxy_types=None, cpu_modes=None, sgio_options=None, watchdog_models=None, watchdog_actions=None, authentication_methods=None, kdump_states=None, spm_states=None, step_types=None, payload_encodings=None, gluster_volume_types=None, transport_types=None, gluster_volume_states=None, brick_states=None, reported_device_types=None, ip_versions=None, snapshot_statuses=None, content_types=None, hook_states=None, stages=None, sso_methods=None, architecture_capabilities=None, serial_number_policies=None, selinux_modes=None, rng_sources=None, scheduling_policy_unit_types=None, qos_types=None):
>+         super(VersionCaps, self).__init__(actions, href, id, name, description, comment, creation_status, link, major, full_version, build_, minor, revision, )
>+         self.current = current
>+         self.features = features
>+@@ -37194,6 +37391,7 @@ class VersionCaps(Version):
>+         self.watchdog_actions = watchdog_actions
>+         self.authentication_methods = authentication_methods
>+         self.kdump_states = kdump_states
>++        self.spm_states = spm_states
>+         self.step_types = step_types
>+         self.payload_encodings = payload_encodings
>+         self.gluster_volume_types = gluster_volume_types
>+@@ -37307,6 +37505,8 @@ class VersionCaps(Version):
>+     def set_authentication_methods(self, authentication_methods): self.authentication_methods = authentication_methods
>+     def get_kdump_states(self): return self.kdump_states
>+     def set_kdump_states(self, kdump_states): self.kdump_states = kdump_states
>++    def get_spm_states(self): return self.spm_states
>++    def set_spm_states(self, spm_states): self.spm_states = spm_states
>+     def get_step_types(self): return self.step_types
>+     def set_step_types(self, step_types): self.step_types = step_types
>+     def get_payload_encodings(self): return self.payload_encodings
>+@@ -37391,6 +37591,7 @@ class VersionCaps(Version):
>+             self.watchdog_actions is not None or
>+             self.authentication_methods is not None or
>+             self.kdump_states is not None or
>++            self.spm_states is not None or
>+             self.step_types is not None or
>+             self.payload_encodings is not None or
>+             self.gluster_volume_types is not None or
>+@@ -37528,6 +37729,8 @@ class VersionCaps(Version):
>+             self.authentication_methods.export(outfile, level, namespace_, name_='authentication_methods', pretty_print=pretty_print)
>+         if self.kdump_states is not None:
>+             self.kdump_states.export(outfile, level, namespace_, name_='kdump_states', pretty_print=pretty_print)
>++        if self.spm_states is not None:
>++            self.spm_states.export(outfile, level, namespace_, name_='spm_states', pretty_print=pretty_print)
>+         if self.step_types is not None:
>+             self.step_types.export(outfile, level, namespace_, name_='step_types', pretty_print=pretty_print)
>+         if self.payload_encodings is not None:
>+@@ -37837,6 +38040,12 @@ class VersionCaps(Version):
>+             self.kdump_states.exportLiteral(outfile, level)
>+             showIndent(outfile, level)
>+             outfile.write('),\n')
>++        if self.spm_states is not None:
>++            showIndent(outfile, level)
>++            outfile.write('spm_states=model_.spm_states(\n')
>++            self.spm_states.exportLiteral(outfile, level)
>++            showIndent(outfile, level)
>++            outfile.write('),\n')
>+         if self.step_types is not None:
>+             showIndent(outfile, level)
>+             outfile.write('step_types=model_.step_types(\n')
>+@@ -38143,6 +38352,10 @@ class VersionCaps(Version):
>+             obj_ = KdumpStates.factory()
>+             obj_.build(child_)
>+             self.kdump_states = obj_
>++        elif nodeName_ == 'spm_states':
>++            obj_ = SpmStates.factory()
>++            obj_.build(child_)
>++            self.spm_states = obj_
>+         elif nodeName_ == 'step_types':
>+             obj_ = StepTypes.factory()
>+             obj_.build(child_)
>+@@ -38227,6 +38440,7 @@ GDSClassesMapping = {
>+     'qos': QoS,
>+     'memory_pool': GlusterMemoryPool,
>+     'boot_menu': BootMenu,
>++    'gluster_volume_types': GlusterVolumeTypes,
>+     'selinux': SELinux,
>+     'thresholds': SchedulingPolicyThresholds,
>+     'labels': Labels,
>+@@ -38438,7 +38652,7 @@ GDSClassesMapping = {
>+     'storage_domain_types': StorageDomainTypes,
>+     'disk_profiles': DiskProfiles,
>+     'vmpool': VmPool,
>+-    'gluster_volume_types': GlusterVolumeTypes,
>++    'spm_states': SpmStates,
>+     'scheduling_policy_units': SchedulingPolicyUnits,
>+     'roles': Roles,
>+     'architecture_capabilities': ArchitectureCapabilities,
>+@@ -38469,6 +38683,7 @@ GDSClassesMapping = {
>+     'transport_types': TransportTypes,
>+     'tag': Tag,
>+     'brick_states': GlusterStates,
>++    'spm': SPM,
>+     'file': File,
>+     'data_center': DataCenter,
>+     'lun_storage': Storage,
>+@@ -38863,6 +39078,7 @@ __all__ = [
>+     "Roles",
>+     "SELinux",
>+     "SELinuxModes",
>++    "SPM",
>+     "SSH",
>+     "SchedulingPolicies",
>+     "SchedulingPolicy",
>+@@ -38881,6 +39097,7 @@ __all__ = [
>+     "SnapshotStatuses",
>+     "Snapshots",
>+     "SpecialObjects",
>++    "SpmStates",
>+     "Sso",
>+     "SsoMethods",
>+     "Stages",
>+@@ -39188,6 +39405,8 @@ _rootClassMap = {
>+                     "snapshot_statuses"             : SnapshotStatuses,
>+                     "snapshots"                     : Snapshots,
>+                     "special_objects"               : SpecialObjects,
>++                    "spm"                           : SPM,
>++                    "spm_states"                    : SpmStates,
>+                     "ssh"                           : SSH,
>+                     "sso"                           : Sso,
>+                     "sso_methods"                   : SsoMethods,
>+@@ -39453,6 +39672,7 @@ _tag_for_type = {
>+     Roles: "roles",
>+     SELinux: "selinux",
>+     SELinuxModes: "selinux_modes",
>++    SPM: "spm",
>+     SSH: "ssh",
>+     SchedulingPolicies: "scheduling_policies",
>+     SchedulingPolicy: "scheduling_policy",
>+@@ -39470,6 +39690,7 @@ _tag_for_type = {
>+     SnapshotStatuses: "snapshot_statuses",
>+     Snapshots: "snapshots",
>+     SpecialObjects: "special_objects",
>++    SpmStates: "spm_states",
>+     Sso: "sso",
>+     SsoMethods: "sso_methods",
>+     Stages: "stages",
>+-- 
>+1.9.3
>+
>diff --git a/rhevm-sdk-python.spec b/rhevm-sdk-python.spec
>index 1a7c191..9610b8d 100644
>--- a/rhevm-sdk-python.spec
>+++ b/rhevm-sdk-python.spec
>@@ -1,6 +1,6 @@
> Name: rhevm-sdk-python
> Version: 3.5.0.7
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> Summary: RHEV-M Software Development Kit
> Group: Development/Libraries
> License: ASL 2.0
>@@ -28,6 +28,9 @@ Conflicts: ovirt-engine-sdk
> # This patch changes the branding from oVirt to RHEV:
> Patch0: 0001-Branding.patch
> 
>+# Regenerate against latest version of the API:
>+Patch1: 0002-Regenerate-against-the-latest-API.patch
>+
> %description
> This package contains The RHEV-M Software Development Kit.
> With this package, custom software can be built for RHEV-M.
>@@ -39,6 +42,7 @@ With this package, custom software can be built for RHEV-M.
> 
> # Aplly the patches:
> %patch0 -p1
>+%patch1 -p1
> 
> %build
> %{__python} -c 'import setuptools; execfile("setup.py")' build
>@@ -54,6 +58,9 @@ With this package, custom software can be built for RHEV-M.
> %doc LICENSE.md
> 
> %changelog
>+* Mon Oct 6 2014 Juan Hernandez <juan.hernandez@redhat.com> - 3.5.0.7-2
>+- Replace storage_manager with spm #1146457.
>+
> * Wed Sep 10 2014 Juan Hernandez <juan.hernandez@redhat.com> - 3.5.0.7-1
> - Update to upstream 3.5.0.7.
> - Added support for watchdog action and model #1129840.
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1149106: 944188