[libvirt] [PATCH] python: Actually implement list*Interfaces

[Daniel Veillard]

On Thu, Nov 19, 2009 at 01:27:25PM -0500, Cole Robinson wrote:
> These have never worked. Would be nice to get this in the pending release!
> 
> Signed-off-by: Cole Robinson <crobinso at redhat.com>
> ---
>  python/generator.py             |    4 +-
>  python/libvirt-override-api.xml |   10 ++++
>  python/libvirt-override.c       |  102 +++++++++++++++++++++++++++++++++++++++
>  3 files changed, 114 insertions(+), 2 deletions(-)
> 
> diff --git a/python/generator.py b/python/generator.py
> index 0b32116..3fd7f90 100755
> --- a/python/generator.py
> +++ b/python/generator.py
> @@ -260,13 +260,13 @@ skip_impl = (
>      'virConnectListDefinedDomains',
>      'virConnectListNetworks',
>      'virConnectListDefinedNetworks',
> -    'virConnectListInterfaces',
> -    'virConnectListDefinedInterfaces',
>      'virConnectListSecrets',
> +    'virConnectListInterfaces',
>      'virConnectListStoragePools',
>      'virConnectListDefinedStoragePools',
>      'virConnectListStorageVols',
>      'virConnectListDefinedStorageVols',
> +    'virConnectListDefinedInterfaces',
>      'virConnGetLastError',
>      'virGetLastError',
>      'virDomainGetInfo',
> diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml
> index 4e55182..96958b5 100644
> --- a/python/libvirt-override-api.xml
> +++ b/python/libvirt-override-api.xml
> @@ -211,5 +211,15 @@
>        <return type='char *' info='the UUID string or None in case of error'/>
>        <arg name='secret' type='virSecretPtr' info='a secret object'/>
>      </function>
> +    <function name='virConnectListInterfaces' file='python'>
> +      <info>list the running interfaces, stores the pointers to the names in @names</info>
> +      <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/>
> +      <return type='str *' info='the list of Names of None in case of error'/>
> +    </function>
> +    <function name='virConnectListDefinedInterfaces' file='python'>
> +      <info>list the defined interfaces, stores the pointers to the names in @names</info>
> +      <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/>
> +      <return type='str *' info='the list of Names of None in case of error'/>
> +    </function>
>    </symbols>
>  </api>
> diff --git a/python/libvirt-override.c b/python/libvirt-override.c
> index 20037ef..b885190 100644
> --- a/python/libvirt-override.c
> +++ b/python/libvirt-override.c
> @@ -1761,6 +1761,106 @@ libvirt_virSecretSetValue(PyObject *self ATTRIBUTE_UNUSED,
>      return py_retval;
>  }
>  
> +static PyObject *
> +libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED,
> +                                 PyObject *args) {
> +    PyObject *py_retval;
> +    char **names = NULL;
> +    int c_retval, i;
> +    virConnectPtr conn;
> +    PyObject *pyobj_conn;
> +
> +
> +    if (!PyArg_ParseTuple(args, (char *)"O:virConnectListInterfaces", &pyobj_conn))
> +        return(NULL);
> +    conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
> +
> +    c_retval = virConnectNumOfInterfaces(conn);
> +    if (c_retval < 0)
> +        return VIR_PY_NONE;
> +
> +    if (c_retval) {
> +        names = malloc(sizeof(*names) * c_retval);
> +        if (!names)
> +            return VIR_PY_NONE;
> +        c_retval = virConnectListInterfaces(conn, names, c_retval);
> +        if (c_retval < 0) {
> +            free(names);
> +            return VIR_PY_NONE;
> +        }
> +    }
> +    py_retval = PyList_New(c_retval);
> +    if (py_retval == NULL) {
> +        if (names) {
> +            for (i = 0;i < c_retval;i++)
> +                free(names[i]);
> +            free(names);
> +        }
> +        return VIR_PY_NONE;
> +    }
> +
> +    if (names) {
> +        for (i = 0;i < c_retval;i++) {
> +            PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i]));
> +            free(names[i]);
> +        }
> +        free(names);
> +    }
> +
> +    return(py_retval);
> +}
> +
> +
> +static PyObject *
> +libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED,
> +                                        PyObject *args) {
> +    PyObject *py_retval;
> +    char **names = NULL;
> +    int c_retval, i;
> +    virConnectPtr conn;
> +    PyObject *pyobj_conn;
> +
> +
> +    if (!PyArg_ParseTuple(args, (char *)"O:virConnectListDefinedInterfaces",
> +                          &pyobj_conn))
> +        return(NULL);
> +    conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
> +
> +    c_retval = virConnectNumOfDefinedInterfaces(conn);
> +    if (c_retval < 0)
> +        return VIR_PY_NONE;
> +
> +    if (c_retval) {
> +        names = malloc(sizeof(*names) * c_retval);
> +        if (!names)
> +            return VIR_PY_NONE;
> +        c_retval = virConnectListDefinedInterfaces(conn, names, c_retval);
> +        if (c_retval < 0) {
> +            free(names);
> +            return VIR_PY_NONE;
> +        }
> +    }
> +    py_retval = PyList_New(c_retval);
> +    if (py_retval == NULL) {
> +        if (names) {
> +            for (i = 0;i < c_retval;i++)
> +                free(names[i]);
> +            free(names);
> +        }
> +        return VIR_PY_NONE;
> +    }
> +
> +    if (names) {
> +        for (i = 0;i < c_retval;i++) {
> +            PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i]));
> +            free(names[i]);
> +        }
> +        free(names);
> +    }
> +
> +    return(py_retval);
> +}
> +
>  /*******************************************
>   * Helper functions to avoid importing modules
>   * for every callback
> @@ -2472,6 +2572,8 @@ static PyMethodDef libvirtMethods[] = {
>      {(char *) "virConnectListSecrets", libvirt_virConnectListSecrets, METH_VARARGS, NULL},
>      {(char *) "virSecretGetValue", libvirt_virSecretGetValue, METH_VARARGS, NULL},
>      {(char *) "virSecretSetValue", libvirt_virSecretSetValue, METH_VARARGS, NULL},
> +    {(char *) "virConnectListInterfaces", libvirt_virConnectListInterfaces, METH_VARARGS, NULL},
> +    {(char *) "virConnectListDefinedInterfaces", libvirt_virConnectListDefinedInterfaces, METH_VARARGS, NULL},
>      {NULL, NULL, 0, NULL}
>  };

  Argh ... right ! Looks fine, and should not break anything, so pushed.

   thanks !

Daniel

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel at veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/