Juan Hernandez has uploaded a new change for review. Change subject: sdk: Regenerate agains the latest API ......................................................................
sdk: Regenerate agains the latest API This patch regenerates the SDK using the latest API obtained from the engine built from commit 5723ef2. Change-Id: I228148e5316260c10c77f963f0895f17e16989da Signed-off-by: Juan Hernandez <[email protected]> --- M Makefile M src/ovirtsdk/api.py M src/ovirtsdk/infrastructure/brokers.py M src/ovirtsdk/xml/params.py 4 files changed, 129 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk refs/changes/62/30262/1 diff --git a/Makefile b/Makefile index c271bfd..5c717ef 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ all: rpm -rpmrelease:=0.1 +rpmrelease:=0.2 rpmversion=3.6.0.0 RPMTOP=$(shell bash -c "pwd -P")/rpmtop SPEC=ovirt-engine-sdk-python.spec diff --git a/src/ovirtsdk/api.py b/src/ovirtsdk/api.py index 2b3b37b..bd15f65 100644 --- a/src/ovirtsdk/api.py +++ b/src/ovirtsdk/api.py @@ -20,7 +20,7 @@ ############ GENERATED CODE ############ ######################################## -'''Generated at: 2014-07-04 12:03:46.372327''' +'''Generated at: 2014-07-18 11:08:57.367882''' import types import urlparse @@ -73,7 +73,7 @@ [@param ca_file: server ca_file for ssl enabled connection] [@param port: port to use (if not specified in url)] [@param timeout: request timeout] - [@param session_timeout: authentication session timeout (if persistent_auth is enabled)] + [@param session_timeout: authentication session timeout in minutes (if persistent_auth is enabled)] [@param persistent_auth: use persistent authentication (default is True)] [@param renew_session: automatically renew expired authentication session (default is False)] [@param insecure: signals to not demand site trustworthiness for ssl enabled connection (default is False)] @@ -98,7 +98,10 @@ # when detected instance of the SDK proxy with # ref-count == 0 if context.manager.has_key(self.__id): - self.disconnect() + try: + self.disconnect() + except DisconnectedError: + pass # Remove trailing slashes from the URL: url = url.rstrip('/') diff --git a/src/ovirtsdk/infrastructure/brokers.py b/src/ovirtsdk/infrastructure/brokers.py index 4afe2a5..cf59703 100644 --- a/src/ovirtsdk/infrastructure/brokers.py +++ b/src/ovirtsdk/infrastructure/brokers.py @@ -20,7 +20,7 @@ ############ GENERATED CODE ############ ######################################## -'''Generated at: 2014-07-04 12:03:46.371533''' +'''Generated at: 2014-07-18 11:08:57.366485''' from ovirtsdk.xml import params @@ -5443,6 +5443,19 @@ @type Network: @param network.id|name: string + [@param network.description: string] + [@param network.comment: string] + [@param network.vlan.id: string] + [@param network.ip.address: string] + [@param network.ip.gateway: string] + [@param network.ip.netmask: string] + [@param network.stp: boolean] + [@param network.mtu: int] + [@param network.profile_required: boolean] + [@param network.usages.usage: collection] + { + [@ivar usage: string] + } [@param expect: 201-created] [@param correlation_id: any string] @@ -6680,14 +6693,14 @@ ''' @type DataCenter: + @param datacenter.local: boolean @param datacenter.name: string - @param datacenter.version.major: int - @param datacenter.version.minor: int - [@param datacenter.storage_type: string] - [@param datacenter.local: boolean] - [@param datacenter.description: string] [@param datacenter.comment: string] + [@param datacenter.description: string] [@param datacenter.storage_format: string] + [@param datacenter.storage_type: string] + [@param datacenter.version.major: int] + [@param datacenter.version.minor: int] [@param expect: 201-created] [@param correlation_id: any string] @@ -8620,7 +8633,7 @@ self.numanodes = HostNumaNodes(self, context) self.permissions = HostPermissions(self, context) self.statistics = HostStatistics(self, context) - self.storage = HostStorage(self, context) + self.storage = HostStorages(self, context) self.tags = HostTags(self, context) def __new__(cls, host, context): @@ -10298,7 +10311,29 @@ context=self.context ) -class HostStorage(Base): +class HostStorage(params.HostStorage, Base): + def __init__(self, host, storage, context): + Base.__init__(self, context) + self.parentclass = host + self.superclass = storage + + #SUB_COLLECTIONS + def __new__(cls, host, storage, context): + if storage is None: return None + obj = object.__new__(cls) + obj.__init__(host, storage, 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 HostStorages(Base): def __init__(self, host , context): Base.__init__(self, context) @@ -12579,10 +12614,13 @@ [@param network.ip.address: string] [@param network.ip.gateway: string] [@param network.ip.netmask: string] - [@param network.display: boolean] [@param network.stp: boolean] [@param network.mtu: int] [@param network.profile_required: boolean] + [@param network.usages.usage: collection] + { + [@ivar usage: string] + } [@param expect: 201-created] [@param correlation_id: any string] @@ -13272,6 +13310,21 @@ #using .disconnect() method, but resource instance ref. is #still available at client's code. raise DisconnectedError + + def delete(self): + ''' + @return None: + ''' + + url = '/schedulingpolicies/{schedulingpolicie:id}' + + return self.__getProxy().delete( + url=UrlHelper.replace( + url, + {'{schedulingpolicy:id}': self.get_id()} + ), + headers={'Content-type':None} + ) def update(self): ''' @@ -16590,6 +16643,7 @@ [@param template.serial_number.policy: string] [@param template.serial_number.value: string] [@param template.bios.boot_menu.enabled: boolean] + [@param template.start_paused: boolean] [@param correlation_id: any string] @return Template: @@ -17824,6 +17878,9 @@ [@param template.serial_number.policy: string] [@param template.serial_number.value: string] [@param template.bios.boot_menu.enabled: boolean] + [@param template.cluster.id: string] + [@param template.cluster.name: string] + [@param template.start_paused: boolean] [@param expect: 201-created] [@param correlation_id: any string] @@ -18815,6 +18872,7 @@ [@param vm.cpu.topology.cores: int] [@param vm.cpu_shares: int] [@param vm.memory: long] + [@param vm.memory_policy.guaranteed: long] [@param vm.high_availability.priority: int] [@param vm.high_availability.enabled: boolean] [@param vm.domain.name: string] @@ -18858,6 +18916,7 @@ [@param vm.serial_number.value: string] [@param vm.bios.boot_menu.enabled: boolean] [@param vm.numa_tune_mode: string] + [@param vm.start_paused: boolean] [@param correlation_id: any string] @return VM: @@ -20960,7 +21019,7 @@ [@param id : string (the id of the entity)] [@param name: string (the name of the entity)] - @return NumaNodes: + @return VirtualNumaNodes: ''' url = '/vms/{vm:id}/numanodes' @@ -20994,7 +21053,7 @@ {'{vm:id}': self.parentclass.get_id()} ), headers={} - ).get_host_numa_node() + ).get_vm_numa_node() return VMNumaNode( self.parentclass, @@ -21015,7 +21074,7 @@ [@param **kwargs: dict (property based filtering)"] [@param max: int (max results)] - @return NumaNodes: + @return VirtualNumaNodes: ''' url = '/vms/{vm:id}/numanodes' @@ -21029,7 +21088,7 @@ qargs={'max:matrix':max} ), headers={} - ).get_host_numa_node() + ).get_vm_numa_node() return ParseHelper.toSubCollection( VMNumaNode, @@ -22668,6 +22727,7 @@ [@param vm.serial_number.value: string] [@param vm.bios.boot_menu.enabled: boolean] [@param vm.numa_tune_mode: string] + [@param vm.start_paused: boolean] Overload 2: @param vm.name: string @param vm.template.id|name: string @@ -22748,6 +22808,7 @@ [@param vm.serial_number.value: string] [@param vm.bios.boot_menu.enabled: boolean] [@param vm.numa_tune_mode: string] + [@param vm.start_paused: boolean] Overload 3: @param vm.initialization.configuration.type: string @param vm.initialization.configuration.data: string @@ -22826,6 +22887,7 @@ [@param vm.serial_number.value: string] [@param vm.bios.boot_menu.enabled: boolean] [@param vm.numa_tune_mode: string] + [@param vm.start_paused: boolean] [@param correlation_id: any string] [@param expect: 201-created] diff --git a/src/ovirtsdk/xml/params.py b/src/ovirtsdk/xml/params.py index 5bbcd82..38c3f75 100644 --- a/src/ovirtsdk/xml/params.py +++ b/src/ovirtsdk/xml/params.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -# Generated Fri Jul 4 12:03:45 2014 by generateDS.py version 2.12a. +# Generated Fri Jul 18 11:08:55 2014 by generateDS.py version 2.12a. # import sys @@ -16660,7 +16660,7 @@ class Template(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, vm=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, high_availability=None, display=None, stateless=None, delete_protected=None, sso=None, rng_device=None, console=None, timezone=None, domain=None, usb=None, tunnel_migration=None, migration_downtime=None, virtio_scsi=None, permissions=None, version=None, serial_number=None, extensiontype_=None): + def __init__(self, actions=None, href=None, id=None, name=None, description=None, comment=None, creation_status=None, link=None, vm=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, high_availability=None, display=None, stateless=None, delete_protected=None, sso=None, rng_device=None, console=None, timezone=None, domain=None, usb=None, tunnel_migration=None, migration_downtime=None, virtio_scsi=None, permissions=None, version=None, serial_number=None, start_paused=None, extensiontype_=None): super(Template, self).__init__(actions, href, id, name, description, comment, creation_status, link, extensiontype_, ) self.vm = vm self.type_ = type_ @@ -16694,6 +16694,7 @@ self.permissions = permissions self.version = version self.serial_number = serial_number + self.start_paused = start_paused self.extensiontype_ = extensiontype_ def factory(*args_, **kwargs_): if Template.subclass: @@ -16757,6 +16758,8 @@ def set_version(self, version): self.version = version def get_serial_number(self): return self.serial_number def set_serial_number(self, serial_number): self.serial_number = serial_number + def get_start_paused(self): return self.start_paused + def set_start_paused(self, start_paused): self.start_paused = start_paused def get_extensiontype_(self): return self.extensiontype_ def set_extensiontype_(self, extensiontype_): self.extensiontype_ = extensiontype_ def hasContent_(self): @@ -16789,6 +16792,7 @@ self.permissions is not None or self.version is not None or self.serial_number is not None or + self.start_paused is not None or super(Template, self).hasContent_() ): return True @@ -16888,6 +16892,9 @@ self.version.export(outfile, level, namespace_, name_='version', pretty_print=pretty_print) if self.serial_number is not None: self.serial_number.export(outfile, level, namespace_, name_='serial_number', pretty_print=pretty_print) + if self.start_paused is not None: + showIndent(outfile, level, pretty_print) + outfile.write('<%sstart_paused>%s</%sstart_paused>%s' % (namespace_, self.gds_format_boolean(self.start_paused, input_name='start_paused'), namespace_, eol_)) def exportLiteral(self, outfile, level, name_='Template'): level += 1 already_processed = set() @@ -17036,6 +17043,9 @@ self.serial_number.exportLiteral(outfile, level) showIndent(outfile, level) outfile.write('),\n') + if self.start_paused is not None: + showIndent(outfile, level) + outfile.write('start_paused=%s,\n' % self.start_paused) def build(self, node): already_processed = set() self.buildAttributes(node, node.attrib, already_processed) @@ -17193,6 +17203,16 @@ obj_ = SerialNumber.factory() obj_.build(child_) self.serial_number = obj_ + elif nodeName_ == 'start_paused': + 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, 'start_paused') + self.start_paused = ival_ super(Template, self).buildChildren(child_, node, nodeName_, True) # end class Template @@ -20682,7 +20702,7 @@ class VM(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, type_=None, status=None, stop_reason=None, memory=None, cpu=None, cpu_shares=None, bios=None, os=None, high_availability=None, display=None, host=None, cluster=None, template=None, instance_type=None, storage_domain=None, start_time=None, stop_time=None, creation_time=None, origin=None, stateless=None, delete_protected=None, sso=None, rng_device=None, console=None, timezone=None, domain=None, custom_properties=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, usb=None, tunnel_migration=None, migration_downtime=None, virtio_scsi=None, permissions=None, vmpool=None, cdroms=None, floppies=None, reported_devices=None, watchdogs=None, use_latest_template_version=None, serial_number=None, next_run_configuration_exists=No! ne, numa_tune_mode=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, stop_reason=None, memory=None, cpu=None, cpu_shares=None, bios=None, os=None, high_availability=None, display=None, host=None, cluster=None, template=None, instance_type=None, storage_domain=None, start_time=None, stop_time=None, creation_time=None, origin=None, stateless=None, delete_protected=None, sso=None, rng_device=None, console=None, timezone=None, domain=None, custom_properties=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, usb=None, tunnel_migration=None, migration_downtime=None, virtio_scsi=None, permissions=None, vmpool=None, cdroms=None, floppies=None, reported_devices=None, watchdogs=None, use_latest_template_version=None, serial_number=None, next_run_configuration_exists=No! ne, numa_tune_mode=None, start_paused=None, extensiontype_=None): super(VM, self).__init__(actions, href, id, name, description, comment, creation_status, link, extensiontype_, ) self.type_ = type_ self.status = status @@ -20748,6 +20768,7 @@ self.serial_number = serial_number self.next_run_configuration_exists = next_run_configuration_exists self.numa_tune_mode = numa_tune_mode + self.start_paused = start_paused self.extensiontype_ = extensiontype_ def factory(*args_, **kwargs_): if VM.subclass: @@ -20859,6 +20880,8 @@ def set_next_run_configuration_exists(self, next_run_configuration_exists): self.next_run_configuration_exists = next_run_configuration_exists def get_numa_tune_mode(self): return self.numa_tune_mode def set_numa_tune_mode(self, numa_tune_mode): self.numa_tune_mode = numa_tune_mode + def get_start_paused(self): return self.start_paused + def set_start_paused(self, start_paused): self.start_paused = start_paused def get_extensiontype_(self): return self.extensiontype_ def set_extensiontype_(self, extensiontype_): self.extensiontype_ = extensiontype_ def hasContent_(self): @@ -20915,6 +20938,7 @@ self.serial_number is not None or self.next_run_configuration_exists is not None or self.numa_tune_mode is not None or + self.start_paused is not None or super(VM, self).hasContent_() ): return True @@ -21068,6 +21092,9 @@ if self.numa_tune_mode is not None: showIndent(outfile, level, pretty_print) 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.start_paused is not None: + showIndent(outfile, level, pretty_print) + outfile.write('<%sstart_paused>%s</%sstart_paused>%s' % (namespace_, self.gds_format_boolean(self.start_paused, input_name='start_paused'), namespace_, eol_)) def exportLiteral(self, outfile, level, name_='VM'): level += 1 already_processed = set() @@ -21342,6 +21369,9 @@ if self.numa_tune_mode is not None: showIndent(outfile, level) outfile.write('numa_tune_mode=%s,\n' % quote_python(self.numa_tune_mode).encode(ExternalEncoding)) + if self.start_paused is not None: + showIndent(outfile, level) + outfile.write('start_paused=%s,\n' % self.start_paused) def build(self, node): already_processed = set() self.buildAttributes(node, node.attrib, already_processed) @@ -21607,6 +21637,16 @@ numa_tune_mode_ = child_.text numa_tune_mode_ = self.gds_validate_string(numa_tune_mode_, node, 'numa_tune_mode') self.numa_tune_mode = numa_tune_mode_ + elif nodeName_ == 'start_paused': + 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, 'start_paused') + self.start_paused = ival_ super(VM, self).buildChildren(child_, node, nodeName_, True) # end class VM @@ -24816,8 +24856,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, stop_reason=None, memory=None, cpu=None, cpu_shares=None, bios=None, os=None, high_availability=None, display=None, host=None, cluster=None, template=None, instance_type=None, storage_domain=None, start_time=None, stop_time=None, creation_time=None, origin=None, stateless=None, delete_protected=None, sso=None, rng_device=None, console=None, timezone=None, domain=None, custom_properties=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, usb=None, tunnel_migration=None, migration_downtime=None, virtio_scsi=None, permissions=None, vmpool=None, cdroms=None, floppies=None, reported_devices=None, watchdogs=None, use_latest_template_version=None, serial_number=None, next_run_configuration_exists=No! ne, numa_tune_mode=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, stop_reason, memory, cpu, cpu_shares, bios, os, high_availability, display, host, cluster, template, instance_type, storage_domain, start_time, stop_time, creation_time, origin, stateless, delete_protected, sso, rng_device, console, timezone, domain, custom_properties, payloads, statistics, disks, initialization, nics, tags, snapshots, placement_policy, memory_policy, guest_info, quota, usb, tunnel_migration, migration_downtime, virtio_scsi, permissions, vmpool, cdroms, floppies, reported_devices, watchdogs, use_latest_template_version, serial_number, next_run_configuration_exists, numa_tune_mode, ) + def __init__(self, actions=None, href=None, id=None, name=None, description=None, comment=None, creation_status=None, link=None, type_=None, status=None, stop_reason=None, memory=None, cpu=None, cpu_shares=None, bios=None, os=None, high_availability=None, display=None, host=None, cluster=None, template=None, instance_type=None, storage_domain=None, start_time=None, stop_time=None, creation_time=None, origin=None, stateless=None, delete_protected=None, sso=None, rng_device=None, console=None, timezone=None, domain=None, custom_properties=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, usb=None, tunnel_migration=None, migration_downtime=None, virtio_scsi=None, permissions=None, vmpool=None, cdroms=None, floppies=None, reported_devices=None, watchdogs=None, use_latest_template_version=None, serial_number=None, next_run_configuration_exists=No! ne, numa_tune_mode=None, start_paused=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, stop_reason, memory, cpu, cpu_shares, bios, os, high_availability, display, host, cluster, template, instance_type, storage_domain, start_time, stop_time, creation_time, origin, stateless, delete_protected, sso, rng_device, console, timezone, domain, custom_properties, payloads, statistics, disks, initialization, nics, tags, snapshots, placement_policy, memory_policy, guest_info, quota, usb, tunnel_migration, migration_downtime, virtio_scsi, permissions, vmpool, cdroms, floppies, reported_devices, watchdogs, use_latest_template_version, serial_number, next_run_configuration_exists, numa_tune_mode, start_paused, ) self.vm = vm if isinstance(date, basestring): initvalue_ = datetime_.datetime.strptime(date, '%Y-%m-%dT%H:%M:%S') @@ -33259,8 +33299,8 @@ class InstanceType(Template): subclass = None superclass = Template - def __init__(self, actions=None, href=None, id=None, name=None, description=None, comment=None, creation_status=None, link=None, vm=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, high_availability=None, display=None, stateless=None, delete_protected=None, sso=None, rng_device=None, console=None, timezone=None, domain=None, usb=None, tunnel_migration=None, migration_downtime=None, virtio_scsi=None, permissions=None, version=None, serial_number=None): - super(InstanceType, self).__init__(actions, href, id, name, description, comment, creation_status, link, vm, type_, status, memory, cpu, cpu_shares, bios, os, cluster, storage_domain, creation_time, origin, high_availability, display, stateless, delete_protected, sso, rng_device, console, timezone, domain, usb, tunnel_migration, migration_downtime, virtio_scsi, permissions, version, serial_number, ) + def __init__(self, actions=None, href=None, id=None, name=None, description=None, comment=None, creation_status=None, link=None, vm=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, high_availability=None, display=None, stateless=None, delete_protected=None, sso=None, rng_device=None, console=None, timezone=None, domain=None, usb=None, tunnel_migration=None, migration_downtime=None, virtio_scsi=None, permissions=None, version=None, serial_number=None, start_paused=None): + super(InstanceType, self).__init__(actions, href, id, name, description, comment, creation_status, link, vm, type_, status, memory, cpu, cpu_shares, bios, os, cluster, storage_domain, creation_time, origin, high_availability, display, stateless, delete_protected, sso, rng_device, console, timezone, domain, usb, tunnel_migration, migration_downtime, virtio_scsi, permissions, version, serial_number, start_paused, ) pass def factory(*args_, **kwargs_): if InstanceType.subclass: -- To view, visit http://gerrit.ovirt.org/30262 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I228148e5316260c10c77f963f0895f17e16989da Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-sdk Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
