Ravi Nori 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 91efe3b, corresponding to tag ovirt-engine-3.5.0.3 Change-Id: I472bfd19ca99f4f3a6e6e8d2526aa783ea8f8a89 Signed-off-by: Ravi Nori <[email protected]> --- M generator/src/main/resources/api.xsd M src/ovirtsdk/api.py M src/ovirtsdk/infrastructure/brokers.py M src/ovirtsdk/xml/params.py 4 files changed, 165 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk refs/changes/05/31405/1 diff --git a/generator/src/main/resources/api.xsd b/generator/src/main/resources/api.xsd index adbe8fd..9303a36 100644 --- a/generator/src/main/resources/api.xsd +++ b/generator/src/main/resources/api.xsd @@ -1923,6 +1923,13 @@ </xs:complexContent> </xs:complexType> + <xs:complexType name="JobOwner"> + <xs:complexContent> + <xs:extension base="User"> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="Users"> <xs:complexContent> <xs:extension base="BaseResources"> @@ -4459,7 +4466,7 @@ <xs:extension base="BaseResource"> <xs:sequence> <xs:element ref="status" minOccurs="0" maxOccurs="1"/> - <xs:element name="owner" type="User" minOccurs="0" maxOccurs="1"/> + <xs:element name="owner" type="JobOwner" minOccurs="0" maxOccurs="1"/> <xs:element name="start_time" type="xs:dateTime" minOccurs="0" maxOccurs="1"/> <xs:element name="end_time" type="xs:dateTime" minOccurs="0" maxOccurs="1"/> <xs:element name="last_updated" type="xs:dateTime" minOccurs="0" maxOccurs="1"/> diff --git a/src/ovirtsdk/api.py b/src/ovirtsdk/api.py index 8cd6c7d..659ff33 100644 --- a/src/ovirtsdk/api.py +++ b/src/ovirtsdk/api.py @@ -20,7 +20,7 @@ ############ GENERATED CODE ############ ######################################## -'''Generated at: 2014-07-09 12:07:23.980741''' +'''Generated at: 2014-08-12 09:31:39.000729''' import types import urlparse @@ -330,3 +330,4 @@ if entry_point: return entry_point.product_info raise DisconnectedError + diff --git a/src/ovirtsdk/infrastructure/brokers.py b/src/ovirtsdk/infrastructure/brokers.py index 3278d71..cbf7e14 100644 --- a/src/ovirtsdk/infrastructure/brokers.py +++ b/src/ovirtsdk/infrastructure/brokers.py @@ -1,4 +1,3 @@ - # # Copyright (c) 2010 Red Hat, Inc. # @@ -20,7 +19,7 @@ ############ GENERATED CODE ############ ######################################## -'''Generated at: 2014-07-18 11:56:19.245554''' +'''Generated at: 2014-08-12 09:31:39.000466''' from ovirtsdk.xml import params @@ -7541,7 +7540,7 @@ {'{domain:id}': self.parentclass.get_id()} ), headers={} - ).get_owner() + ).get_user() return DomainUser( self.parentclass, @@ -7578,7 +7577,7 @@ qargs={'search:query':query,'case_sensitive:matrix':case_sensitive,'max:matrix':max} ), headers={} - ).get_owner() + ).get_user() return ParseHelper.toSubCollection( DomainUser, @@ -18741,7 +18740,7 @@ result = self.__getProxy().get( url=SearchHelper.appendQuery(url, {'search:query':'name='+name}), headers={} - ).get_owner() + ).get_user() return User( FilterHelper.getItem( @@ -18768,7 +18767,7 @@ result = self.__getProxy().get( url=SearchHelper.appendQuery(url, {'search:query':query,'case_sensitive:matrix':case_sensitive,'max:matrix':max}), headers={} - ).get_owner() + ).get_user() return ParseHelper.toCollection( User, @@ -23713,3 +23712,4 @@ context=self.context ) + diff --git a/src/ovirtsdk/xml/params.py b/src/ovirtsdk/xml/params.py index 8591603..aabf899 100644 --- a/src/ovirtsdk/xml/params.py +++ b/src/ovirtsdk/xml/params.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -# Generated Wed Jul 9 12:07:21 2014 by generateDS.py version 2.12a. +# Generated Tue Aug 12 09:31:37 2014 by generateDS.py version 2.12a. # import sys @@ -358,6 +358,54 @@ def gds_reverse_node_mapping(cls, mapping): return dict(((v, k) for k, v in mapping.iteritems())) # Begin NOT_GENERATED + def __setattr__(self, item, value): + if (value is not None and + not isinstance(value, list) and + ReflectionHelper.isModuleMember( + sys.modules['ovirtsdk.infrastructure.brokers'], + type(value)) and + not ReflectionHelper.isModuleMember(sys.modules[__name__], + type(value)) and + value.__dict__.has_key('superclass') and + value.superclass is not None and + value.superclass != BaseResource): + if (ReflectionHelper.isModuleMember( + sys.modules['ovirtsdk.infrastructure.brokers'], + type(self)) and + self.__dict__.has_key('superclass') and + self.superclass is not None): + object.__setattr__(self.superclass, item, value.superclass) + else: + object.__setattr__(self, item, value.superclass) + elif (not isinstance(value, list) and + ReflectionHelper.isModuleMember( + sys.modules['ovirtsdk.infrastructure.brokers'], + type(self)) and + self.__dict__.has_key('superclass') and + self.superclass is not None and + not ReflectionHelper.isModuleMember( + sys.modules['ovirtsdk.infrastructure.brokers'], + type(value)) and + item is not 'superclass' and + item is not 'parentclass'): + object.__setattr__(self.superclass, item, value) + elif isinstance(value, list): + parsed_list = [] + for obj in value: + if (ReflectionHelper.isModuleMember( + sys.modules['ovirtsdk.infrastructure.brokers'], + type(obj)) and + obj.__dict__.has_key('superclass') and + obj.superclass is not None and + item is not 'superclass' and + item is not 'parentclass'): + parsed_list.append(obj.superclass) + else: + parsed_list.append(obj) + object.__setattr__(self, item, parsed_list) + else: + object.__setattr__(self, item, value) + def __eq__(self, other): return Comparator.compare(self, other) @@ -11392,7 +11440,8 @@ ival_ = self.gds_validate_boolean(ival_, node, 'administrative') self.administrative = ival_ elif nodeName_ == 'user': - obj_ = User.factory() + class_obj_ = self.get_class_obj_(child_, User) + obj_ = class_obj_.factory() obj_.build(child_) self.user = obj_ elif nodeName_ == 'permits': @@ -11499,8 +11548,8 @@ class User(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, domain=None, domain_entry_id=None, department=None, logged_in=None, namespace=None, last_name=None, user_name=None, password=None, email=None, roles=None, groups=None): - super(User, self).__init__(actions, href, id, name, description, comment, creation_status, link, ) + def __init__(self, actions=None, href=None, id=None, name=None, description=None, comment=None, creation_status=None, link=None, domain=None, domain_entry_id=None, department=None, logged_in=None, namespace=None, last_name=None, user_name=None, password=None, email=None, roles=None, groups=None, extensiontype_=None): + super(User, self).__init__(actions, href, id, name, description, comment, creation_status, link, extensiontype_, ) self.domain = domain self.domain_entry_id = domain_entry_id self.department = department @@ -11512,6 +11561,7 @@ self.email = email self.roles = roles self.groups = groups + self.extensiontype_ = extensiontype_ def factory(*args_, **kwargs_): if User.subclass: return User.subclass(*args_, **kwargs_) @@ -11540,6 +11590,8 @@ def set_roles(self, roles): self.roles = roles def get_groups(self): return self.groups def set_groups(self, groups): self.groups = groups + def get_extensiontype_(self): return self.extensiontype_ + def set_extensiontype_(self, extensiontype_): self.extensiontype_ = extensiontype_ def hasContent_(self): if ( self.domain is not None or @@ -11576,6 +11628,10 @@ outfile.write('/>%s' % (eol_, )) def exportAttributes(self, outfile, level, already_processed, namespace_='', name_='User'): super(User, self).exportAttributes(outfile, level, already_processed, namespace_, name_='User') + if self.extensiontype_ is not None and 'xsi:type' not in already_processed: + already_processed.add('xsi:type') + outfile.write(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";') + outfile.write(' xsi:type="%s"' % self.extensiontype_) def exportChildren(self, outfile, level, namespace_='', name_='User', fromsubclass_=False, pretty_print=True): super(User, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print) if pretty_print: @@ -11672,6 +11728,10 @@ self.buildChildren(child, node, nodeName_) return self def buildAttributes(self, node, attrs, already_processed): + value = find_attr_value_('xsi:type', node) + if value is not None and 'xsi:type' not in already_processed: + already_processed.add('xsi:type') + self.extensiontype_ = value super(User, self).buildAttributes(node, attrs, already_processed) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): if nodeName_ == 'domain': @@ -11726,6 +11786,70 @@ self.groups = obj_ super(User, self).buildChildren(child_, node, nodeName_, True) # end class User + + +class JobOwner(User): + subclass = None + superclass = User + def __init__(self, actions=None, href=None, id=None, name=None, description=None, comment=None, creation_status=None, link=None, domain=None, domain_entry_id=None, department=None, logged_in=None, namespace=None, last_name=None, user_name=None, password=None, email=None, roles=None, groups=None): + super(JobOwner, self).__init__(actions, href, id, name, description, comment, creation_status, link, domain, domain_entry_id, department, logged_in, namespace, last_name, user_name, password, email, roles, groups, ) + pass + def factory(*args_, **kwargs_): + if JobOwner.subclass: + return JobOwner.subclass(*args_, **kwargs_) + else: + return JobOwner(*args_, **kwargs_) + factory = staticmethod(factory) + def hasContent_(self): + if ( + super(JobOwner, self).hasContent_() + ): + return True + else: + return False + def export(self, outfile, level, namespace_='', name_='JobOwner', 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_='JobOwner') + 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_='JobOwner'): + super(JobOwner, self).exportAttributes(outfile, level, already_processed, namespace_, name_='JobOwner') + def exportChildren(self, outfile, level, namespace_='', name_='JobOwner', fromsubclass_=False, pretty_print=True): + super(JobOwner, self).exportChildren(outfile, level, namespace_, name_, True, pretty_print=pretty_print) + def exportLiteral(self, outfile, level, name_='JobOwner'): + 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_): + super(JobOwner, self).exportLiteralAttributes(outfile, level, already_processed, name_) + def exportLiteralChildren(self, outfile, level, name_): + super(JobOwner, self).exportLiteralChildren(outfile, level, name_) + 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): + super(JobOwner, self).buildAttributes(node, attrs, already_processed) + def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): + super(JobOwner, self).buildChildren(child_, node, nodeName_, True) + pass +# end class JobOwner class Users(BaseResources): @@ -11814,7 +11938,8 @@ super(Users, self).buildAttributes(node, attrs, already_processed) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): if nodeName_ == 'user': - obj_ = User.factory() + class_obj_ = self.get_class_obj_(child_, User) + obj_ = class_obj_.factory() obj_.build(child_) self.user.append(obj_) super(Users, self).buildChildren(child_, node, nodeName_, True) @@ -12028,7 +12153,8 @@ authentication_method_ = self.gds_validate_string(authentication_method_, node, 'authentication_method') self.authentication_method = authentication_method_ elif nodeName_ == 'user': - obj_ = User.factory() + class_obj_ = self.get_class_obj_(child_, User) + obj_ = class_obj_.factory() obj_.build(child_) self.user = obj_ super(SSH, self).buildChildren(child_, node, nodeName_, True) @@ -12453,7 +12579,8 @@ obj_.build(child_) self.role = obj_ elif nodeName_ == 'user': - obj_ = User.factory() + class_obj_ = self.get_class_obj_(child_, User) + obj_ = class_obj_.factory() obj_.build(child_) self.user = obj_ elif nodeName_ == 'group': @@ -12687,7 +12814,8 @@ super(Domain, self).buildAttributes(node, attrs, already_processed) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): if nodeName_ == 'user': - obj_ = User.factory() + class_obj_ = self.get_class_obj_(child_, User) + obj_ = class_obj_.factory() obj_.build(child_) self.user = obj_ super(Domain, self).buildChildren(child_, node, nodeName_, True) @@ -13038,7 +13166,8 @@ correlation_id_ = self.gds_validate_string(correlation_id_, node, 'correlation_id') self.correlation_id = correlation_id_ elif nodeName_ == 'user': - obj_ = User.factory() + class_obj_ = self.get_class_obj_(child_, User) + obj_ = class_obj_.factory() obj_.build(child_) self.user = obj_ elif nodeName_ == 'vm': @@ -20036,7 +20165,8 @@ super(AuthorizedKey, self).buildAttributes(node, attrs, already_processed) def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): if nodeName_ == 'user': - obj_ = User.factory() + class_obj_ = self.get_class_obj_(child_, User) + obj_ = class_obj_.factory() obj_.build(child_) self.user = obj_ elif nodeName_ == 'key': @@ -22411,7 +22541,8 @@ obj_.build(child_) self.ip = obj_ elif nodeName_ == 'user': - obj_ = User.factory() + class_obj_ = self.get_class_obj_(child_, User) + obj_ = class_obj_.factory() obj_.build(child_) self.user = obj_ elif nodeName_ == 'console_user': @@ -26496,7 +26627,8 @@ obj_.build(child_) self.template = obj_ elif nodeName_ == 'user': - obj_ = User.factory() + class_obj_ = self.get_class_obj_(child_, User) + obj_ = class_obj_.factory() obj_.build(child_) self.user = obj_ elif nodeName_ == 'group': @@ -31942,7 +32074,7 @@ outfile.write('),\n') if self.owner is not None: showIndent(outfile, level) - outfile.write('owner=model_.User(\n') + outfile.write('owner=model_.JobOwner(\n') self.owner.exportLiteral(outfile, level, name_='owner') showIndent(outfile, level) outfile.write('),\n') @@ -31976,7 +32108,7 @@ obj_.build(child_) self.status = obj_ elif nodeName_ == 'owner': - obj_ = User.factory() + obj_ = JobOwner.factory() obj_.build(child_) self.owner = obj_ elif nodeName_ == 'start_time': @@ -37000,7 +37132,7 @@ 'snapshots': Snapshots, 'group': Group, 'numa_node_pin': NumaNodePin, - 'owner': User, + 'owner': JobOwner, 'rate': Rate, 'brick_memoryinfo': GlusterBrickMemoryInfo, 'reported_device_types': ReportedDeviceTypes, @@ -37484,6 +37616,7 @@ "IpVersions", "IscsiDetails", "Job", + "JobOwner", "Jobs", "KSM", "KdumpStates", @@ -37806,7 +37939,7 @@ "os" : OperatingSystem, "os_types" : OsTypes, "overcommit" : MemoryOverCommit, - "owner" : User, + "owner" : JobOwner, "parameter" : Parameter, "parameters_set" : ParametersSet, "parent" : TagParent, -- To view, visit http://gerrit.ovirt.org/31405 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I472bfd19ca99f4f3a6e6e8d2526aa783ea8f8a89 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-sdk Gerrit-Branch: sdk_3.5 Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
