Juan Hernandez has uploaded a new change for review.
Change subject: sdk: Regenerate against the latest API
......................................................................
sdk: Regenerate against the latest API
This patch regenerates the SDK using the latest API obtained from the
engine built from commit 9a2e2b3, tag ovirt-engine-3.6.0_alpha3.
Change-Id: I1ac343c41d2c7a997234f982fb07aaeb6a1d1b65
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M Makefile
M generator/src/main/resources/api.xsd
M generator/src/main/resources/rsdl.xml
M setup.py
M src/ovirtsdk/infrastructure/brokers.py
M src/ovirtsdk/xml/params.py
6 files changed, 378 insertions(+), 24 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk refs/changes/10/41210/1
diff --git a/Makefile b/Makefile
index 38d0213..7f823f1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
version=3.6.0.0
rpmversion=$(version)
rpmdist=$(shell rpm --eval '%dist')
-rpmrelease:=0.13$(rpmsuffix)$(rpmdist)
+rpmrelease:=0.14$(rpmsuffix)$(rpmdist)
RPMTOP=$(PWD)/rpmtop
NAME=ovirt-engine-sdk-python
diff --git a/generator/src/main/resources/api.xsd
b/generator/src/main/resources/api.xsd
index 16cf751..96fa365 100644
--- a/generator/src/main/resources/api.xsd
+++ b/generator/src/main/resources/api.xsd
@@ -1962,6 +1962,7 @@
<xs:element name="live_snapshot_support" type="xs:boolean"
minOccurs="0" maxOccurs="1" />
<xs:element ref="katello_errata" minOccurs="0" maxOccurs="1"/>
<xs:element ref="external_host_provider" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="update_available" type="xs:boolean" minOccurs="0"
maxOccurs="1" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -3345,6 +3346,8 @@
<xs:element name="next_run_configuration_exists" type="xs:boolean"
minOccurs="0" maxOccurs="1"/>
<xs:element name="numa_tune_mode" type="xs:string" minOccurs="0"
maxOccurs="1"/>
<xs:element ref="permissions" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="external_host_provider" minOccurs="0"
maxOccurs="1"/>
+ <xs:element ref="katello_errata" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -4276,6 +4279,8 @@
<xs:element ref="transport_types" minOccurs="0" maxOccurs="1"/>
<xs:element name="replica_count" type="xs:unsignedShort"
minOccurs="0" maxOccurs="1"/>
<xs:element name="stripe_count" type="xs:unsignedShort"
minOccurs="0" maxOccurs="1"/>
+ <xs:element name="disperse_count" type="xs:unsignedShort"
minOccurs="0" maxOccurs="1"/>
+ <xs:element name="redundancy_count" type="xs:unsignedShort"
minOccurs="0" maxOccurs="1"/>
<xs:element ref="bricks" minOccurs="0" maxOccurs="1"/>
<xs:element ref="options" minOccurs="0" maxOccurs="1"/>
<xs:element ref="status" minOccurs="0" maxOccurs="1"/>
@@ -5548,6 +5553,7 @@
<xs:element name="summary" type="xs:string" minOccurs="0"
maxOccurs="1"/>
<xs:element ref="packages" minOccurs="0" maxOccurs="1"/>
<xs:element ref="host" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="vm" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
diff --git a/generator/src/main/resources/rsdl.xml
b/generator/src/main/resources/rsdl.xml
index dc1ef6f..807e731 100644
--- a/generator/src/main/resources/rsdl.xml
+++ b/generator/src/main/resources/rsdl.xml
@@ -5997,6 +5997,9 @@
<parameter required="true" type="xs:string">
<name>action.storage_domain.id|name</name>
</parameter>
+ <parameter required="false" type="xs:string">
+ <name>action.disk.name|alias</name>
+ </parameter>
<parameter required="false" type="xs:boolean">
<name>action.async</name>
</parameter>
@@ -6482,9 +6485,6 @@
<parameter required="false" type="xs:string">
<name>external_host_provider.password</name>
</parameter>
- <parameter required="false" type="xs:string">
-
<name>external_host_provider.authentication_url</name>
- </parameter>
</parameters_set>
</body>
</request>
@@ -6589,9 +6589,6 @@
</parameter>
<parameter required="false" type="xs:string">
<name>external_host_provider.password</name>
- </parameter>
- <parameter required="false" type="xs:string">
-
<name>external_host_provider.authentication_url</name>
</parameter>
</parameters_set>
</body>
@@ -9310,7 +9307,7 @@
</response>
</link>
<link href="hosts/{host:id}/unregisteredstoragedomainsdiscover"
rel="unregisteredstoragedomainsdiscover">
- <description>Discover the Storage Domains which are candidiates to
be imported to the setup</description>
+ <description>Discover the block Storage Domains which are
candidates to be imported to the setup. For FCP no arguments are
needed.</description>
<request>
<http_method>POST</http_method>
<headers>
@@ -9334,12 +9331,53 @@
<body>
<type>Action</type>
<parameters_set>
- <description>Discover the Storage Domains which are
candidiates to be imported to the setup</description>
+ <description>Discover the block Storage Domains which
are candidates to be imported to the setup. For FCP no arguments are
needed.</description>
<parameter required="false" type="xs:string">
<name>action.iscsi.address</name>
</parameter>
<parameter required="false" type="xs:string">
<name>action.iscsi_target</name>
+ </parameter>
+ <parameter required="false" type="xs:boolean">
+ <name>action.async</name>
+ </parameter>
+ <parameter required="false" type="xs:long">
+ <name>action.grace_period.expiry</name>
+ </parameter>
+ </parameters_set>
+ </body>
+ </request>
+ <response>
+ <type>Action</type>
+ </response>
+ </link>
+ <link href="hosts/{host:id}/upgrade" rel="upgrade">
+ <description>upgrade vdsm and other packages of the specified host
in the system</description>
+ <request>
+ <http_method>POST</http_method>
+ <headers>
+ <header required="false">
+ <name>Correlation-Id</name>
+ <value>any string</value>
+ </header>
+ <header required="true">
+ <name>Content-Type</name>
+ <value>application/xml|json</value>
+ </header>
+ </headers>
+ <url>
+ <parameters_set>
+ <parameter required="false" type="xs:boolean"
context="matrix">
+ <name>async</name>
+ <value>true|false</value>
+ </parameter>
+ </parameters_set>
+ </url>
+ <body>
+ <type>Action</type>
+ <parameters_set>
+ <parameter required="false" type="xs:string">
+ <name>action.image</name>
</parameter>
<parameter required="false" type="xs:boolean">
<name>action.async</name>
@@ -10722,6 +10760,9 @@
<parameter required="false" type="xs:string">
<name>openstack_image_provider.password</name>
</parameter>
+ <parameter required="false" type="xs:string">
+
<name>openstack_image_provider.authentication_url</name>
+ </parameter>
<parameter required="false" type="collection">
<name>openstack_image_provider.properties.property</name>
<parameters_set>
@@ -10837,6 +10878,9 @@
</parameter>
<parameter required="false" type="xs:string">
<name>openstack_image_provider.password</name>
+ </parameter>
+ <parameter required="false" type="xs:string">
+
<name>openstack_image_provider.authentication_url</name>
</parameter>
<parameter required="false" type="collection">
<name>openstack_image_provider.properties.property</name>
@@ -11081,6 +11125,9 @@
<parameter required="false" type="xs:string">
<name>openstack_network_provider.password</name>
</parameter>
+ <parameter required="false" type="xs:string">
+
<name>openstack_network_provider.authentication_url</name>
+ </parameter>
<parameter required="false" type="collection">
<name>openstack_network_provider.properties.property</name>
<parameters_set>
@@ -11196,6 +11243,9 @@
</parameter>
<parameter required="false" type="xs:string">
<name>openstack_network_provider.password</name>
+ </parameter>
+ <parameter required="false" type="xs:string">
+
<name>openstack_network_provider.authentication_url</name>
</parameter>
<parameter required="false" type="collection">
<name>openstack_network_provider.properties.property</name>
@@ -11385,14 +11435,14 @@
<parameter required="true" type="xs:string">
<name>openstack_volume_provider.name</name>
</parameter>
- <parameter required="true" type="xs:string,">
-
<name>openstack_volume_provider.data_center.id|name</name>
- </parameter>
<parameter required="false" type="xs:string">
<name>openstack_volume_provider.description</name>
</parameter>
<parameter required="false" type="xs:string">
<name>openstack_volume_provider.url</name>
+ </parameter>
+ <parameter required="false" type="xs:string">
+
<name>openstack_volume_provider.data_center.id|name</name>
</parameter>
<parameter required="false" type="xs:boolean">
<name>openstack_volume_provider.requires_authentication</name>
@@ -17808,6 +17858,9 @@
<parameter required="false" type="xs:string">
<name>vm.migration.compressed</name>
</parameter>
+ <parameter required="false" type="xs:string">
+ <name>vm.external_host_provider.id</name>
+ </parameter>
</parameters_set>
</body>
</request>
@@ -18721,6 +18774,33 @@
<type>Action</type>
</response>
</link>
+ <link href="vms/{vm:id}/katelloerrata" rel="get">
+ <description>get the list of errata available for the
vm</description>
+ <request>
+ <http_method>GET</http_method>
+ <url>
+ <parameters_set>
+ <parameter required="false" type="xs:int"
context="matrix">
+ <name>max</name>
+ <value>max results</value>
+ </parameter>
+ </parameters_set>
+ </url>
+ <body/>
+ </request>
+ <response>
+ <type>KatelloErrata</type>
+ </response>
+ </link>
+ <link href="vms/{vm:id}/katelloerrata/{katelloerrata:id}" rel="get">
+ <request>
+ <http_method>GET</http_method>
+ <body/>
+ </request>
+ <response>
+ <type>KatelloErratum</type>
+ </response>
+ </link>
<link href="vms/{vm:id}/logon" rel="logon">
<description>Perform automatic logon on the VM using the guest
agent.</description>
<request>
diff --git a/setup.py b/setup.py
index fe49566..1f3a20d 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
version_info = {
'name': 'ovirt-engine-sdk-python',
- 'version': '3.6.0.0preview13',
+ 'version': '3.6.0.0preview14',
'description': 'A SDK interface to oVirt Virtualization',
'author': 'Michael Pasternak',
'author_email': 'mpast...@redhat.com',
diff --git a/src/ovirtsdk/infrastructure/brokers.py
b/src/ovirtsdk/infrastructure/brokers.py
index aea6f04..7752883 100644
--- a/src/ovirtsdk/infrastructure/brokers.py
+++ b/src/ovirtsdk/infrastructure/brokers.py
@@ -19,7 +19,7 @@
############ GENERATED CODE ############
########################################
-'''Generated at: 2015-05-12 10:03:28.000330'''
+'''Generated at: 2015-05-20 15:09:43.000296'''
from ovirtsdk.xml import params
@@ -9836,6 +9836,7 @@
@type Action:
@param action.storage_domain.id|name: string
+ [@param action.disk.name|alias: string]
[@param action.async: boolean]
[@param action.grace_period.expiry: long]
[@param correlation_id: any string]
@@ -11281,7 +11282,6 @@
[@param external_host_provider.requires_authentication: boolean]
[@param external_host_provider.username: string]
[@param external_host_provider.password: string]
- [@param external_host_provider.authentication_url: string]
[@param correlation_id: any string]
[@param expect: 202-accepted]
@@ -12030,7 +12030,6 @@
[@param external_host_provider.requires_authentication: boolean]
[@param external_host_provider.username: string]
[@param external_host_provider.password: string]
- [@param external_host_provider.authentication_url: string]
[@param correlation_id: any string]
[@param expect: 201-created]
@@ -13436,6 +13435,34 @@
'''
url = '/hosts/{host:id}/unregisteredstoragedomainsdiscover'
+
+ result = self.__getProxy().request(
+ method='POST',
+ url=UrlHelper.replace(
+ url,
+ {
+ '{host:id}': self.get_id(),
+ }
+ ),
+ body=ParseHelper.toXml(action),
+ headers={"Correlation-Id":correlation_id}
+ )
+
+ return result
+
+ def upgrade(self, action=params.Action(), correlation_id=None):
+ '''
+ @type Action:
+
+ [@param action.image: string]
+ [@param action.async: boolean]
+ [@param action.grace_period.expiry: long]
+ [@param correlation_id: any string]
+
+ @return Action:
+ '''
+
+ url = '/hosts/{host:id}/upgrade'
result = self.__getProxy().request(
method='POST',
@@ -18071,6 +18098,7 @@
[@param openstack_image_provider.requires_authentication: boolean]
[@param openstack_image_provider.username: string]
[@param openstack_image_provider.password: string]
+ [@param openstack_image_provider.authentication_url: string]
[@param openstack_image_provider.properties.property: collection]
{
[@ivar property.name: string]
@@ -18467,6 +18495,7 @@
[@param openstack_image_provider.requires_authentication: boolean]
[@param openstack_image_provider.username: string]
[@param openstack_image_provider.password: string]
+ [@param openstack_image_provider.authentication_url: string]
[@param openstack_image_provider.properties.property: collection]
{
[@ivar property.name: string]
@@ -18602,6 +18631,7 @@
[@param openstack_network_provider.requires_authentication: boolean]
[@param openstack_network_provider.username: string]
[@param openstack_network_provider.password: string]
+ [@param openstack_network_provider.authentication_url: string]
[@param openstack_network_provider.properties.property: collection]
{
[@ivar property.name: string]
@@ -19146,6 +19176,7 @@
[@param openstack_network_provider.requires_authentication: boolean]
[@param openstack_network_provider.username: string]
[@param openstack_network_provider.password: string]
+ [@param openstack_network_provider.authentication_url: string]
[@param openstack_network_provider.properties.property: collection]
{
[@ivar property.name: string]
@@ -19635,9 +19666,9 @@
@type OpenStackVolumeProvider:
@param openstack_volume_provider.name: string
- @param openstack_volume_provider.data_center.id|name: string,
[@param openstack_volume_provider.description: string]
[@param openstack_volume_provider.url: string]
+ [@param openstack_volume_provider.data_center.id|name: string]
[@param openstack_volume_provider.requires_authentication: boolean]
[@param openstack_volume_provider.username: string]
[@param openstack_volume_provider.password: string]
@@ -26602,6 +26633,7 @@
self.applications = VMApplications(self, context)
self.cdroms = VMCdRoms(self, context)
self.disks = VMDisks(self, context)
+ self.katelloerrata = VMKatelloErrata(self, context)
self.nics = VMNICs(self, context)
self.numanodes = VMVirtualNumaNodes(self, context)
self.permissions = VMPermissions(self, context)
@@ -26742,6 +26774,7 @@
[@param vm.cpu_profile.id: string]
[@param vm.migration.auto_converge: string]
[@param vm.migration.compressed: string]
+ [@param vm.external_host_provider.id: string]
[@param correlation_id: any string]
[@param expect: 202-accepted]
@@ -28345,6 +28378,136 @@
context=self.context
)
+class VMKatelloErrata(Base):
+
+ def __init__(self, vm , context):
+ Base.__init__(self, context)
+ self.parentclass = vm
+
+ def __getProxy(self):
+ proxy = context.manager[self.context].get('proxy')
+ if proxy:
+ return proxy
+ #This may happen only if sdk was explicitly disconnected
+ #using .disconnect() method, but resource instance ref. is
+ #still available at client's code.
+ raise DisconnectedError
+
+ def get(self, name=None, id=None):
+
+ '''
+ [@param id : string (the id of the entity)]
+ [@param name: string (the name of the entity)]
+
+ @return KatelloErrata:
+ '''
+
+ url = '/vms/{vm:id}/katelloerrata'
+
+ if id:
+ try :
+ result = self.__getProxy().get(
+ url=UrlHelper.append(
+ UrlHelper.replace(
+ url,
+ {
+ '{vm:id}': self.parentclass.get_id(),
+ }
+ ),
+ id
+ ),
+ headers={}
+ )
+
+ return VMKatelloErratum(
+ self.parentclass,
+ result,
+ self.context
+ )
+ except RequestError, err:
+ if err.status and err.status == 404:
+ return None
+ raise err
+ elif name:
+ result = self.__getProxy().get(
+ url=UrlHelper.replace(
+ url,
+ {
+ '{vm:id}': self.parentclass.get_id(),
+ }
+ ),
+ headers={}
+ ).get_katello_erratum()
+
+ return VMKatelloErratum(
+ self.parentclass,
+ FilterHelper.getItem(
+ FilterHelper.filter(
+ result,
+ {'name':name}
+ ),
+ query="name=" + name
+ ),
+ self.context
+ )
+ else:
+ raise MissingParametersError(['id', 'name'])
+
+ def list(self, max=None, **kwargs):
+ '''
+ [@param **kwargs: dict (property based filtering)"]
+ [@param max: int (max results)]
+
+ @return KatelloErrata:
+ '''
+
+ url = '/vms/{vm:id}/katelloerrata'
+
+ result = self.__getProxy().get(
+ url=SearchHelper.appendQuery(
+ url=UrlHelper.replace(
+ url=url,
+ args={
+ '{vm:id}': self.parentclass.get_id(),
+ }
+ ),
+ qargs={'max:matrix':max}
+ ),
+ headers={}
+ ).get_katello_erratum()
+
+ return ParseHelper.toSubCollection(
+ VMKatelloErratum,
+ self.parentclass,
+ FilterHelper.filter(
+ result,
+ kwargs
+ ),
+ context=self.context
+ )
+
+class VMKatelloErratum(params.KatelloErratum, Base):
+ def __init__(self, vm, katelloerratum, context):
+ Base.__init__(self, context)
+ self.parentclass = vm
+ self.superclass = katelloerratum
+
+ #SUB_COLLECTIONS
+ def __new__(cls, vm, katelloerratum, context):
+ if katelloerratum is None: return None
+ obj = object.__new__(cls)
+ obj.__init__(vm, katelloerratum, context)
+ return obj
+
+ def __getProxy(self):
+ proxy = context.manager[self.context].get('proxy')
+ if proxy:
+ return proxy
+ #This may happen only if sdk was explicitly disconnected
+ #using .disconnect() method, but resource instance ref. is
+ #still available at client's code.
+ raise DisconnectedError
+
class VMNIC(params.NIC, Base):
def __init__(self, vm, nic, context):
Base.__init__(self, context)
diff --git a/src/ovirtsdk/xml/params.py b/src/ovirtsdk/xml/params.py
index 323dd91..21d0f2d 100644
--- a/src/ovirtsdk/xml/params.py
+++ b/src/ovirtsdk/xml/params.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
#
-# Generated Tue May 12 10:03:27 2015 by generateDS.py version 2.12a.
+# Generated Wed May 20 15:09:42 2015 by generateDS.py version 2.12a.
#
import sys
@@ -11291,7 +11291,7 @@
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, 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, katello_errata=None, external_host_provider=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, katello_errata=None, external_host_provider=None,
update_available=None):
super(Host, self).__init__(actions, href, id, name, description,
comment, creation_status, link, )
self.address = address
self.certificate = certificate
@@ -11329,6 +11329,7 @@
self.live_snapshot_support = live_snapshot_support
self.katello_errata = katello_errata
self.external_host_provider = external_host_provider
+ self.update_available = update_available
def factory(*args_, **kwargs_):
if Host.subclass:
return Host.subclass(*args_, **kwargs_)
@@ -11407,6 +11408,8 @@
def set_katello_errata(self, katello_errata): self.katello_errata =
katello_errata
def get_external_host_provider(self): return self.external_host_provider
def set_external_host_provider(self, external_host_provider):
self.external_host_provider = external_host_provider
+ def get_update_available(self): return self.update_available
+ def set_update_available(self, update_available): self.update_available =
update_available
def hasContent_(self):
if (
self.address is not None or
@@ -11445,6 +11448,7 @@
self.live_snapshot_support is not None or
self.katello_errata is not None or
self.external_host_provider is not None or
+ self.update_available is not None or
super(Host, self).hasContent_()
):
return True
@@ -11559,6 +11563,9 @@
self.katello_errata.export_(outfile, level, namespace_,
name_='katello_errata', pretty_print=pretty_print)
if self.external_host_provider is not None:
self.external_host_provider.export_(outfile, level, namespace_,
name_='external_host_provider', pretty_print=pretty_print)
+ if self.update_available is not None:
+ showIndent(outfile, level, pretty_print)
+ outfile.write('<%supdate_available>%s</%supdate_available>%s' %
(namespace_, self.gds_format_boolean(self.update_available,
input_name='update_available'), namespace_, eol_))
def exportLiteral(self, outfile, level, name_='Host'):
level += 1
already_processed = set()
@@ -11746,6 +11753,9 @@
self.external_host_provider.exportLiteral(outfile, level)
showIndent(outfile, level)
outfile.write('),\n')
+ if self.update_available is not None:
+ showIndent(outfile, level)
+ outfile.write('update_available=%s,\n' % self.update_available)
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -11938,6 +11948,16 @@
obj_ = ExternalHostProvider.factory()
obj_.build(child_)
self.external_host_provider = obj_
+ elif nodeName_ == 'update_available':
+ sval_ = child_.text
+ if sval_ in ('true', '1'):
+ ival_ = True
+ elif sval_ in ('false', '0'):
+ ival_ = False
+ else:
+ raise_parse_error(child_, 'requires boolean')
+ ival_ = self.gds_validate_boolean(ival_, node, 'update_available')
+ self.update_available = ival_
super(Host, self).buildChildren(child_, node, nodeName_, True)
# end class Host
@@ -22653,7 +22673,7 @@
class VM(VmBase):
subclass = None
superclass = VmBase
- def __init__(self, actions=None, href=None, id=None, name=None,
description=None, comment=None, creation_status=None, link=None, type_=None,
status=None, memory=None, cpu=None, cpu_shares=None, bios=None, os=None,
cluster=None, storage_domain=None, creation_time=None, origin=None,
stateless=None, delete_protected=None, high_availability=None, display=None,
sso=None, rng_device=None, console=None, timezone=None, domain=None, usb=None,
soundcard_enabled=None, tunnel_migration=None, migration_downtime=None,
virtio_scsi=None, serial_number=None, start_paused=None, cpu_profile=None,
migration=None, custom_properties=None, custom_emulated_machine=None,
custom_cpu_model=None, stop_reason=None, host=None, template=None,
instance_type=None, start_time=None, stop_time=None, run_once=None,
payloads=None, statistics=None, disks=None, initialization=None, nics=None,
tags=None, snapshots=None, placement_policy=None, memory_policy=None,
guest_info=None, quota=None, vmpool=None, cdroms!
=None, floppies=None, reported_devices=None, watchdogs=None,
use_latest_template_version=None, next_run_configuration_exists=None,
numa_tune_mode=None, permissions=None, extensiontype_=None):
+ def __init__(self, actions=None, href=None, id=None, name=None,
description=None, comment=None, creation_status=None, link=None, type_=None,
status=None, memory=None, cpu=None, cpu_shares=None, bios=None, os=None,
cluster=None, storage_domain=None, creation_time=None, origin=None,
stateless=None, delete_protected=None, high_availability=None, display=None,
sso=None, rng_device=None, console=None, timezone=None, domain=None, usb=None,
soundcard_enabled=None, tunnel_migration=None, migration_downtime=None,
virtio_scsi=None, serial_number=None, start_paused=None, cpu_profile=None,
migration=None, custom_properties=None, custom_emulated_machine=None,
custom_cpu_model=None, stop_reason=None, host=None, template=None,
instance_type=None, start_time=None, stop_time=None, run_once=None,
payloads=None, statistics=None, disks=None, initialization=None, nics=None,
tags=None, snapshots=None, placement_policy=None, memory_policy=None,
guest_info=None, quota=None, vmpool=None, cdroms!
=None, floppies=None, reported_devices=None, watchdogs=None,
use_latest_template_version=None, next_run_configuration_exists=None,
numa_tune_mode=None, permissions=None, external_host_provider=None,
katello_errata=None, extensiontype_=None):
super(VM, self).__init__(actions, href, id, name, description,
comment, creation_status, link, type_, status, memory, cpu, cpu_shares, bios,
os, cluster, storage_domain, creation_time, origin, stateless,
delete_protected, high_availability, display, sso, rng_device, console,
timezone, domain, usb, soundcard_enabled, tunnel_migration, migration_downtime,
virtio_scsi, serial_number, start_paused, cpu_profile, migration,
custom_properties, custom_emulated_machine, custom_cpu_model, extensiontype_, )
self.stop_reason = stop_reason
self.host = host
@@ -22690,6 +22710,8 @@
self.next_run_configuration_exists = next_run_configuration_exists
self.numa_tune_mode = numa_tune_mode
self.permissions = permissions
+ self.external_host_provider = external_host_provider
+ self.katello_errata = katello_errata
self.extensiontype_ = extensiontype_
def factory(*args_, **kwargs_):
if VM.subclass:
@@ -22751,6 +22773,10 @@
def set_numa_tune_mode(self, numa_tune_mode): self.numa_tune_mode =
numa_tune_mode
def get_permissions(self): return self.permissions
def set_permissions(self, permissions): self.permissions = permissions
+ def get_external_host_provider(self): return self.external_host_provider
+ def set_external_host_provider(self, external_host_provider):
self.external_host_provider = external_host_provider
+ def get_katello_errata(self): return self.katello_errata
+ def set_katello_errata(self, katello_errata): self.katello_errata =
katello_errata
def get_extensiontype_(self): return self.extensiontype_
def set_extensiontype_(self, extensiontype_): self.extensiontype_ =
extensiontype_
def hasContent_(self):
@@ -22782,6 +22808,8 @@
self.next_run_configuration_exists is not None or
self.numa_tune_mode is not None or
self.permissions is not None or
+ self.external_host_provider is not None or
+ self.katello_errata is not None or
super(VM, self).hasContent_()
):
return True
@@ -22876,6 +22904,10 @@
outfile.write('<%snuma_tune_mode>%s</%snuma_tune_mode>%s' %
(namespace_,
self.gds_format_string(quote_xml(self.numa_tune_mode).encode(ExternalEncoding),
input_name='numa_tune_mode'), namespace_, eol_))
if self.permissions is not None:
self.permissions.export_(outfile, level, namespace_,
name_='permissions', pretty_print=pretty_print)
+ if self.external_host_provider is not None:
+ self.external_host_provider.export_(outfile, level, namespace_,
name_='external_host_provider', pretty_print=pretty_print)
+ if self.katello_errata is not None:
+ self.katello_errata.export_(outfile, level, namespace_,
name_='katello_errata', pretty_print=pretty_print)
def exportLiteral(self, outfile, level, name_='VM'):
level += 1
already_processed = set()
@@ -23027,6 +23059,18 @@
self.permissions.exportLiteral(outfile, level)
showIndent(outfile, level)
outfile.write('),\n')
+ if self.external_host_provider is not None:
+ showIndent(outfile, level)
+
outfile.write('external_host_provider=model_.external_host_provider(\n')
+ self.external_host_provider.exportLiteral(outfile, level)
+ showIndent(outfile, level)
+ outfile.write('),\n')
+ if self.katello_errata is not None:
+ showIndent(outfile, level)
+ outfile.write('katello_errata=model_.katello_errata(\n')
+ self.katello_errata.exportLiteral(outfile, level)
+ showIndent(outfile, level)
+ outfile.write('),\n')
def build(self, node):
already_processed = set()
self.buildAttributes(node, node.attrib, already_processed)
@@ -23168,6 +23212,14 @@
obj_ = Permissions.factory()
obj_.build(child_)
self.permissions = obj_
+ elif nodeName_ == 'external_host_provider':
+ obj_ = ExternalHostProvider.factory()
+ obj_.build(child_)
+ self.external_host_provider = obj_
+ elif nodeName_ == 'katello_errata':
+ obj_ = KatelloErrata.factory()
+ obj_.build(child_)
+ self.katello_errata = obj_
super(VM, self).buildChildren(child_, node, nodeName_, True)
# end class VM
@@ -26494,8 +26546,8 @@
class Snapshot(VM):
subclass = None
superclass = VM
- def __init__(self, actions=None, href=None, id=None, name=None,
description=None, comment=None, creation_status=None, link=None, type_=None,
status=None, memory=None, cpu=None, cpu_shares=None, bios=None, os=None,
cluster=None, storage_domain=None, creation_time=None, origin=None,
stateless=None, delete_protected=None, high_availability=None, display=None,
sso=None, rng_device=None, console=None, timezone=None, domain=None, usb=None,
soundcard_enabled=None, tunnel_migration=None, migration_downtime=None,
virtio_scsi=None, serial_number=None, start_paused=None, cpu_profile=None,
migration=None, custom_properties=None, custom_emulated_machine=None,
custom_cpu_model=None, stop_reason=None, host=None, template=None,
instance_type=None, start_time=None, stop_time=None, run_once=None,
payloads=None, statistics=None, disks=None, initialization=None, nics=None,
tags=None, snapshots=None, placement_policy=None, memory_policy=None,
guest_info=None, quota=None, vmpool=None, cdroms!
=None, floppies=None, reported_devices=None, watchdogs=None,
use_latest_template_version=None, next_run_configuration_exists=None,
numa_tune_mode=None, permissions=None, vm=None, date=None,
snapshot_status=None, persist_memorystate=None):
- super(Snapshot, self).__init__(actions, href, id, name, description,
comment, creation_status, link, type_, status, memory, cpu, cpu_shares, bios,
os, cluster, storage_domain, creation_time, origin, stateless,
delete_protected, high_availability, display, sso, rng_device, console,
timezone, domain, usb, soundcard_enabled, tunnel_migration, migration_downtime,
virtio_scsi, serial_number, start_paused, cpu_profile, migration,
custom_properties, custom_emulated_machine, custom_cpu_model, stop_reason,
host, template, instance_type, start_time, stop_time, run_once, payloads,
statistics, disks, initialization, nics, tags, snapshots, placement_policy,
memory_policy, guest_info, quota, vmpool, cdroms, floppies, reported_devices,
watchdogs, use_latest_template_version, next_run_configuration_exists,
numa_tune_mode, permissions, )
+ def __init__(self, actions=None, href=None, id=None, name=None,
description=None, comment=None, creation_status=None, link=None, type_=None,
status=None, memory=None, cpu=None, cpu_shares=None, bios=None, os=None,
cluster=None, storage_domain=None, creation_time=None, origin=None,
stateless=None, delete_protected=None, high_availability=None, display=None,
sso=None, rng_device=None, console=None, timezone=None, domain=None, usb=None,
soundcard_enabled=None, tunnel_migration=None, migration_downtime=None,
virtio_scsi=None, serial_number=None, start_paused=None, cpu_profile=None,
migration=None, custom_properties=None, custom_emulated_machine=None,
custom_cpu_model=None, stop_reason=None, host=None, template=None,
instance_type=None, start_time=None, stop_time=None, run_once=None,
payloads=None, statistics=None, disks=None, initialization=None, nics=None,
tags=None, snapshots=None, placement_policy=None, memory_policy=None,
guest_info=None, quota=None, vmpool=None, cdroms!
=None, floppies=None, reported_devices=None, watchdogs=None,
use_latest_template_version=None, next_run_configuration_exists=None,
numa_tune_mode=None, permissions=None, external_host_provider=None,
katello_errata=None, vm=None, date=None, snapshot_status=None,
persist_memorystate=None):
+ super(Snapshot, self).__init__(actions, href, id, name, description,
comment, creation_status, link, type_, status, memory, cpu, cpu_shares, bios,
os, cluster, storage_domain, creation_time, origin, stateless,
delete_protected, high_availability, display, sso, rng_device, console,
timezone, domain, usb, soundcard_enabled, tunnel_migration, migration_downtime,
virtio_scsi, serial_number, start_paused, cpu_profile, migration,
custom_properties, custom_emulated_machine, custom_cpu_model, stop_reason,
host, template, instance_type, start_time, stop_time, run_once, payloads,
statistics, disks, initialization, nics, tags, snapshots, placement_policy,
memory_policy, guest_info, quota, vmpool, cdroms, floppies, reported_devices,
watchdogs, use_latest_template_version, next_run_configuration_exists,
numa_tune_mode, permissions, external_host_provider, katello_errata, )
self.vm = vm
if isinstance(date, basestring):
initvalue_ = datetime_.datetime.strptime(date, '%Y-%m-%dT%H:%M:%S')
@@ -29762,13 +29814,15 @@
class GlusterVolume(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, cluster=None,
volume_type=None, transport_types=None, replica_count=None, stripe_count=None,
bricks=None, options=None, status=None):
+ def __init__(self, actions=None, href=None, id=None, name=None,
description=None, comment=None, creation_status=None, link=None, cluster=None,
volume_type=None, transport_types=None, replica_count=None, stripe_count=None,
disperse_count=None, redundancy_count=None, bricks=None, options=None,
status=None):
super(GlusterVolume, self).__init__(actions, href, id, name,
description, comment, creation_status, link, )
self.cluster = cluster
self.volume_type = volume_type
self.transport_types = transport_types
self.replica_count = replica_count
self.stripe_count = stripe_count
+ self.disperse_count = disperse_count
+ self.redundancy_count = redundancy_count
self.bricks = bricks
self.options = options
self.status = status
@@ -29788,6 +29842,10 @@
def set_replica_count(self, replica_count): self.replica_count =
replica_count
def get_stripe_count(self): return self.stripe_count
def set_stripe_count(self, stripe_count): self.stripe_count = stripe_count
+ def get_disperse_count(self): return self.disperse_count
+ def set_disperse_count(self, disperse_count): self.disperse_count =
disperse_count
+ def get_redundancy_count(self): return self.redundancy_count
+ def set_redundancy_count(self, redundancy_count): self.redundancy_count =
redundancy_count
def get_bricks(self): return self.bricks
def set_bricks(self, bricks): self.bricks = bricks
def get_options(self): return self.options
@@ -29801,6 +29859,8 @@
self.transport_types is not None or
self.replica_count is not None or
self.stripe_count is not None or
+ self.disperse_count is not None or
+ self.redundancy_count is not None or
self.bricks is not None or
self.options is not None or
self.status is not None or
@@ -29846,6 +29906,12 @@
if self.stripe_count is not None:
showIndent(outfile, level, pretty_print)
outfile.write('<%sstripe_count>%s</%sstripe_count>%s' %
(namespace_, self.gds_format_integer(self.stripe_count,
input_name='stripe_count'), namespace_, eol_))
+ if self.disperse_count is not None:
+ showIndent(outfile, level, pretty_print)
+ outfile.write('<%sdisperse_count>%s</%sdisperse_count>%s' %
(namespace_, self.gds_format_integer(self.disperse_count,
input_name='disperse_count'), namespace_, eol_))
+ if self.redundancy_count is not None:
+ showIndent(outfile, level, pretty_print)
+ outfile.write('<%sredundancy_count>%s</%sredundancy_count>%s' %
(namespace_, self.gds_format_integer(self.redundancy_count,
input_name='redundancy_count'), namespace_, eol_))
if self.bricks is not None:
self.bricks.export_(outfile, level, namespace_, name_='bricks',
pretty_print=pretty_print)
if self.options is not None:
@@ -29883,6 +29949,12 @@
if self.stripe_count is not None:
showIndent(outfile, level)
outfile.write('stripe_count=%d,\n' % self.stripe_count)
+ if self.disperse_count is not None:
+ showIndent(outfile, level)
+ outfile.write('disperse_count=%d,\n' % self.disperse_count)
+ if self.redundancy_count is not None:
+ showIndent(outfile, level)
+ outfile.write('redundancy_count=%d,\n' % self.redundancy_count)
if self.bricks is not None:
showIndent(outfile, level)
outfile.write('bricks=model_.bricks(\n')
@@ -29939,6 +30011,22 @@
raise_parse_error(child_, 'requires integer: %s' % exp)
ival_ = self.gds_validate_integer(ival_, node, 'stripe_count')
self.stripe_count = ival_
+ elif nodeName_ == 'disperse_count':
+ 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, 'disperse_count')
+ self.disperse_count = ival_
+ elif nodeName_ == 'redundancy_count':
+ 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, 'redundancy_count')
+ self.redundancy_count = ival_
elif nodeName_ == 'bricks':
obj_ = GlusterBricks.factory()
obj_.build(child_)
@@ -38925,7 +39013,7 @@
class KatelloErratum(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, title=None,
type_=None, issued=None, severity=None, solution=None, summary=None,
packages=None, host=None):
+ def __init__(self, actions=None, href=None, id=None, name=None,
description=None, comment=None, creation_status=None, link=None, title=None,
type_=None, issued=None, severity=None, solution=None, summary=None,
packages=None, host=None, vm=None):
super(KatelloErratum, self).__init__(actions, href, id, name,
description, comment, creation_status, link, )
self.title = title
self.type_ = type_
@@ -38939,6 +39027,7 @@
self.summary = summary
self.packages = packages
self.host = host
+ self.vm = vm
def factory(*args_, **kwargs_):
if KatelloErratum.subclass:
return KatelloErratum.subclass(*args_, **kwargs_)
@@ -38961,6 +39050,8 @@
def set_packages(self, packages): self.packages = packages
def get_host(self): return self.host
def set_host(self, host): self.host = host
+ def get_vm(self): return self.vm
+ def set_vm(self, vm): self.vm = vm
def hasContent_(self):
if (
self.title is not None or
@@ -38971,6 +39062,7 @@
self.summary is not None or
self.packages is not None or
self.host is not None or
+ self.vm is not None or
super(KatelloErratum, self).hasContent_()
):
return True
@@ -39022,6 +39114,8 @@
self.packages.export_(outfile, level, namespace_,
name_='packages', pretty_print=pretty_print)
if self.host is not None:
self.host.export_(outfile, level, namespace_, name_='host',
pretty_print=pretty_print)
+ if self.vm is not None:
+ self.vm.export_(outfile, level, namespace_, name_='vm',
pretty_print=pretty_print)
def exportLiteral(self, outfile, level, name_='KatelloErratum'):
level += 1
already_processed = set()
@@ -39060,6 +39154,12 @@
showIndent(outfile, level)
outfile.write('host=model_.host(\n')
self.host.exportLiteral(outfile, level)
+ showIndent(outfile, level)
+ outfile.write('),\n')
+ if self.vm is not None:
+ showIndent(outfile, level)
+ outfile.write('vm=model_.vm(\n')
+ self.vm.exportLiteral(outfile, level)
showIndent(outfile, level)
outfile.write('),\n')
def build(self, node):
@@ -39104,6 +39204,11 @@
obj_ = Host.factory()
obj_.build(child_)
self.host = obj_
+ elif nodeName_ == 'vm':
+ class_obj_ = self.get_class_obj_(child_, VM)
+ obj_ = class_obj_.factory()
+ obj_.build(child_)
+ self.vm = obj_
super(KatelloErratum, self).buildChildren(child_, node, nodeName_,
True)
# end class KatelloErratum
--
To view, visit https://gerrit.ovirt.org/41210
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ac343c41d2c7a997234f982fb07aaeb6a1d1b65
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine-sdk
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
