[libvirt] [PATCHv2 4/8] python: Don't generate conflicting conn.createXML functions.

[Daniel P. Berrange]

On Fri, Oct 02, 2009 at 01:46:49PM -0400, Cole Robinson wrote:
> A special case in the generator wasn't doing its job, and duplicate
> conn.createXML functions were being generated. The bindings diff is:
> 
> @@ -1079,14 +1079,6 @@ class virConnect:
>          return __tmp
> 
>      def createXML(self, xmlDesc, flags):
> -        """Create a new device on the VM host machine, for example,
> -           virtual HBAs created using vport_create. """
> -        ret = libvirtmod.virNodeDeviceCreateXML(self._o, xmlDesc, flags)
> -        if ret is None:raise libvirtError('virNodeDeviceCreateXML() failed', conn=self)
> -        __tmp = virNodeDevice(self, _obj=ret)
> -        return __tmp
> -
> -    def createXML(self, xmlDesc, flags):
>          """Launch a new guest domain, based on an XML description
>            similar to the one returned by virDomainGetXMLDesc() This
>            function may requires privileged access to the hypervisor.
> @@ -1327,6 +1319,14 @@ class virConnect:
>          __tmp = virNetwork(self, _obj=ret)
>          return __tmp
> 
> +    def nodeDeviceCreateXML(self, xmlDesc, flags):
> +        """Create a new device on the VM host machine, for example,
> +           virtual HBAs created using vport_create. """
> +        ret = libvirtmod.virNodeDeviceCreateXML(self._o, xmlDesc, flags)
> +        if ret is None:raise libvirtError('virNodeDeviceCreateXML() failed', conn=self)
> +        __tmp = virNodeDevice(self, _obj=ret)
> +        return __tmp
> +
>      def nodeDeviceLookupByName(self, name):
>          """Lookup a node device by its name. """
>          ret = libvirtmod.virNodeDeviceLookupByName(self._o, name)
> 
> Signed-off-by: Cole Robinson <crobinso at redhat.com>
> ---
>  python/generator.py |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/python/generator.py b/python/generator.py
> index 9ec91d8..758914e 100755
> --- a/python/generator.py
> +++ b/python/generator.py
> @@ -767,7 +767,7 @@ def nameFixup(name, classe, type, file):
>      elif name[0:13] == "virNodeDevice":
>          if name[13:16] == "Get":
>              func = string.lower(name[16]) + name[17:]
> -        elif name[13:19] == "Lookup" or name[13:] == "Create":
> +        elif name[13:19] == "Lookup" or name[13:19] == "Create":
>              func = string.lower(name[3]) + name[4:]
>          else:
>              func = string.lower(name[13]) + name[14:]

ACK


Daniel
-- 
|: Red Hat, Engineering, London   -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org  -o-  http://virt-manager.org  -o-  http://ovirt.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-  F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|