shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-30 17:18:21 +03:00
Code Releases Activity

python: python 3 compat patch for lvm2

Browse Source 
As provided by rhbz: 1136366
This commit is contained in:
bkabrda@redhat.com 2014-09-02 15:42:01 +02:00 committed by Zdenek Kabelac
parent 4946c64092
commit 5d8b31ffad
4 changed files with 89 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.119 -
==================================
Make python bindings usable with python3 (and compatible with 2.6 & 2.7).
Add lvmconfig -l|--list as shortcut for lvmconfig --type list --withsummary.
Add lvmconfig --type list to display plain list of configuration settings.
Introduce lvmconfig as the preferred form of 'lvm dumpconfig'.

18
python/example.py
View File

@ -27,7 +27,7 @@ import lvm
#Dump information about PV
def print_pv(pv):
print 'PV name: ', pv.getName(), ' ID: ', pv.getUuid(), 'Size: ', pv.getSize()
print('PV name: ', pv.getName(), ' ID: ', pv.getUuid(), 'Size: ', pv.getSize())
#Dump some information about a specific volume group
@ -35,7 +35,7 @@ def print_vg(vg_name):
#Open read only
vg = lvm.vgOpen(vg_name, 'r')
print 'Volume group:', vg_name, 'Size: ', vg.getSize()
print('Volume group:', vg_name, 'Size: ', vg.getSize())
#Retrieve a list of Physical volumes for this volume group
pv_list = vg.listPVs()
@ -48,9 +48,9 @@ def print_vg(vg_name):
lv_list = vg.listLVs()
if len(lv_list):
for l in lv_list:
print 'LV name: ', l.getName(), ' ID: ', l.getUuid()
print('LV name: ', l.getName(), ' ID: ', l.getUuid())
else:
print 'No logical volumes present!'
print('No logical volumes present!')
vg.close()
@ -75,14 +75,14 @@ def find_vg_with_free_space():
def create_delete_logical_volume():
vg_name = find_vg_with_free_space()
print 'Using volume group ', vg_name, ' for example'
print('Using volume group ', vg_name, ' for example')
if vg_name:
vg = lvm.vgOpen(vg_name, 'w')
lv = vg.createLvLinear('python_lvm_ok_to_delete', vg.getFreeSize())
if lv:
print 'New lv, id= ', lv.getUuid()
print('New lv, id= ', lv.getUuid())
#Create a tag
lv.addTag('Demo_tag')
@ -97,16 +97,16 @@ def create_delete_logical_volume():
#Try to rename
lv.rename("python_lvm_renamed")
print 'LV name= ', lv.getName()
print('LV name= ', lv.getName())
lv.remove()
vg.close()
else:
print 'No free space available to create demo lv!'
print('No free space available to create demo lv!')
if __name__ == '__main__':
#What version
print 'lvm version=', lvm.getVersion()
print('lvm version=', lvm.getVersion())
#Get a list of volume group names
vg_names = lvm.listVgNames()

103
python/liblvm.c
View File

@ -25,6 +25,23 @@
#include "lvm2app.h"
#include "defaults.h"
#if PY_MAJOR_VERSION >= 3
#define IS_PY3K
#define PYINTTYPE_CHECK PyLong_Check
#define PYINTTYPE_ASLONG PyLong_AsLong
#define PYINTTYPE_FROMLONG PyLong_FromLong
#define PYSTRYPE_CHECK PyUnicode_Check
#define PYSTRTYPE_ASSTRING PyUnicode_AsUTF8
#define PYSTRTYPE_FROMSTRING PyUnicode_FromString
#else
#define PYINTTYPE_CHECK PyInt_Check
#define PYINTTYPE_ASLONG PyInt_AsLong
#define PYINTTYPE_FROMLONG PyInt_FromLong
#define PYSTRYPE_CHECK PyString_Check
#define PYSTRTYPE_ASSTRING PyString_AsString
#define PYSTRTYPE_FROMSTRING PyString_FromString
#endif
static lvm_t _libh;
@ -148,10 +165,10 @@ static PyObject *_liblvm_get_last_error(void)
if (!(info = PyTuple_New(2)))
return NULL;
PyTuple_SetItem(info, 0, PyInt_FromLong((long) lvm_errno(_libh)));
PyTuple_SetItem(info, 0, PYINTTYPE_FROMLONG((long) lvm_errno(_libh)));
msg = lvm_errmsg(_libh);
PyTuple_SetItem(info, 1, ((msg) ? PyString_FromString(msg) :
PyString_FromString("Memory error while retrieving error message")));
PyTuple_SetItem(info, 1, ((msg) ? PYSTRTYPE_FROMSTRING(msg) :
PYSTRTYPE_FROMSTRING("Memory error while retrieving error message")));
return info;
}
@ -199,7 +216,7 @@ static PyObject *_liblvm_lvm_list_vg_names(void)
return NULL;
dm_list_iterate_items(strl, vgnames) {
PyTuple_SET_ITEM(pytuple, i, PyString_FromString(strl->str));
PyTuple_SET_ITEM(pytuple, i, PYSTRTYPE_FROMSTRING(strl->str));
i++;
}
@ -224,7 +241,7 @@ static PyObject *_liblvm_lvm_list_vg_uuids(void)
return NULL;
dm_list_iterate_items(strl, uuids) {
PyTuple_SET_ITEM(pytuple, i, PyString_FromString(strl->str));
PyTuple_SET_ITEM(pytuple, i, PYSTRTYPE_FROMSTRING(strl->str));
i++;
}
@ -856,7 +873,7 @@ static PyObject *get_property(struct lvm_property_value *prop)
if (prop->is_integer)
PyTuple_SET_ITEM(pytuple, 0, Py_BuildValue("K", prop->value.integer));
else
PyTuple_SET_ITEM(pytuple, 0, PyString_FromString(prop->value.string));
PyTuple_SET_ITEM(pytuple, 0, PYSTRTYPE_FROMSTRING(prop->value.string));
if (prop->is_settable)
setable = Py_True;
@ -904,14 +921,14 @@ static PyObject *_liblvm_lvm_vg_set_property(vgobject *self, PyObject *args)
if (!lvm_property.is_valid)
goto lvmerror;
if (PyObject_IsInstance(variant_type_arg, (PyObject*)&PyString_Type)) {
if (PYSTRYPE_CHECK(variant_type_arg)) {
if (!lvm_property.is_string) {
PyErr_Format(PyExc_ValueError, "Property requires string value");
goto bail;
}
if (!(string_value = PyString_AsString(variant_type_arg))) {
if (!(string_value = PYSTRTYPE_ASSTRING(variant_type_arg))) {
PyErr_NoMemory();
goto bail;
}
@ -924,8 +941,8 @@ static PyObject *_liblvm_lvm_vg_set_property(vgobject *self, PyObject *args)
goto bail;
}
if (PyObject_IsInstance(variant_type_arg, (PyObject*)&PyInt_Type)) {
temp_py_int = PyInt_AsLong(variant_type_arg);
if (PYINTTYPE_CHECK(variant_type_arg)) {
temp_py_int = PYINTTYPE_ASLONG(variant_type_arg);
/* -1 could be valid, need to see if an exception was gen. */
if (temp_py_int == -1 && PyErr_Occurred())
@ -1056,7 +1073,7 @@ static PyObject *_liblvm_lvm_vg_get_tags(vgobject *self)
return NULL;
dm_list_iterate_items(strl, tagsl) {
PyTuple_SET_ITEM(pytuple, i, PyString_FromString(strl->str));
PyTuple_SET_ITEM(pytuple, i, PYSTRTYPE_FROMSTRING(strl->str));
i++;
}
@ -1499,7 +1516,7 @@ static PyObject *_liblvm_lvm_lv_get_tags(lvobject *self)
return NULL;
dm_list_iterate_items(strl, tagsl) {
PyTuple_SET_ITEM(pytuple, i, PyString_FromString(strl->str));
PyTuple_SET_ITEM(pytuple, i, PYSTRTYPE_FROMSTRING(strl->str));
i++;
}
@ -1923,7 +1940,7 @@ static PyMethodDef _liblvm_pvseg_methods[] = {
};
static PyTypeObject _LibLVMvgType = {
PyObject_HEAD_INIT(&PyType_Type)
PyVarObject_HEAD_INIT(&PyType_Type, 0)
.tp_name = "lvm.Liblvm_vg",
.tp_basicsize = sizeof(vgobject),
.tp_new = PyType_GenericNew,
@ -1934,7 +1951,7 @@ static PyTypeObject _LibLVMvgType = {
};
static PyTypeObject _LibLVMlvType = {
PyObject_HEAD_INIT(&PyType_Type)
PyVarObject_HEAD_INIT(&PyType_Type, 0)
.tp_name = "lvm.Liblvm_lv",
.tp_basicsize = sizeof(lvobject),
.tp_new = PyType_GenericNew,
@ -1945,7 +1962,7 @@ static PyTypeObject _LibLVMlvType = {
};
static PyTypeObject _LibLVMpvlistType = {
PyObject_HEAD_INIT(&PyType_Type)
PyVarObject_HEAD_INIT(&PyType_Type, 0)
.tp_name = "lvm.Liblvm_pvlist",
.tp_basicsize = sizeof(pvslistobject),
.tp_new = PyType_GenericNew,
@ -1956,7 +1973,7 @@ static PyTypeObject _LibLVMpvlistType = {
};
static PyTypeObject _LibLVMpvType = {
PyObject_HEAD_INIT(&PyType_Type)
PyVarObject_HEAD_INIT(&PyType_Type, 0)
.tp_name = "lvm.Liblvm_pv",
.tp_basicsize = sizeof(pvobject),
.tp_new = PyType_GenericNew,
@ -1967,7 +1984,7 @@ static PyTypeObject _LibLVMpvType = {
};
static PyTypeObject _LibLVMlvsegType = {
PyObject_HEAD_INIT(&PyType_Type)
PyVarObject_HEAD_INIT(&PyType_Type, 0)
.tp_name = "lvm.Liblvm_lvseg",
.tp_basicsize = sizeof(lvsegobject),
.tp_new = PyType_GenericNew,
@ -1978,7 +1995,7 @@ static PyTypeObject _LibLVMlvsegType = {
};
static PyTypeObject _LibLVMpvsegType = {
PyObject_HEAD_INIT(&PyType_Type)
PyVarObject_HEAD_INIT(&PyType_Type, 0)
.tp_name = "lvm.Liblvm_pvseg",
.tp_basicsize = sizeof(pvsegobject),
.tp_new = PyType_GenericNew,
@ -1996,40 +2013,65 @@ static void _liblvm_cleanup(void)
}
}
#ifdef IS_PY3K
static struct PyModuleDef moduledef = {
PyModuleDef_HEAD_INIT,
"lvm",
"Liblvm module",
-1,
_Liblvm_methods,
NULL,
NULL,
NULL,
NULL
};
#define MODINITERROR return NULL
PyObject *
PyInit_lvm(void)
#else
#define MODINITERROR return
PyMODINIT_FUNC initlvm(void);
PyMODINIT_FUNC initlvm(void)
#endif
{
PyObject *m;
_libh = lvm_init(NULL);
if (PyType_Ready(&_LibLVMvgType) < 0)
return;
MODINITERROR;
if (PyType_Ready(&_LibLVMlvType) < 0)
return;
MODINITERROR;
if (PyType_Ready(&_LibLVMpvType) < 0)
return;
MODINITERROR;
if (PyType_Ready(&_LibLVMlvsegType) < 0)
return;
MODINITERROR;
if (PyType_Ready(&_LibLVMpvsegType) < 0)
return;
MODINITERROR;
if (PyType_Ready(&_LibLVMpvlistType) < 0)
return;
MODINITERROR;
if (!(m = Py_InitModule3("lvm", _Liblvm_methods, "Liblvm module")))
return;
#ifdef IS_PY3K
m = PyModule_Create(&moduledef);
#else
m = Py_InitModule3("lvm", _Liblvm_methods, "Liblvm module");
#endif
if (m == NULL)
MODINITERROR;
if (PyModule_AddIntConstant(m, "THIN_DISCARDS_IGNORE",
LVM_THIN_DISCARDS_IGNORE) < 0)
return;
MODINITERROR;
if (PyModule_AddIntConstant(m, "THIN_DISCARDS_NO_PASSDOWN",
LVM_THIN_DISCARDS_NO_PASSDOWN) < 0)
return;
MODINITERROR;
if (PyModule_AddIntConstant(m, "THIN_DISCARDS_PASSDOWN",
LVM_THIN_DISCARDS_PASSDOWN) < 0)
return;
MODINITERROR;
if ((_LibLVMError = PyErr_NewException((char*)"lvm.LibLVMError", NULL, NULL))) {
/* Each call to PyModule_AddObject decrefs it; compensate: */
@ -2040,4 +2082,7 @@ PyMODINIT_FUNC initlvm(void)
}
Py_AtExit(_liblvm_cleanup);
#ifdef IS_PY3K
return m;
#endif
}

18
test/api/python_lvm_unit.py
View File

@ -18,6 +18,10 @@ import string
import lvm
import os
import itertools
import sys
if sys.version_info[0] > 2:
long = int
# Set of basic unit tests for the python bindings.
#
@ -56,18 +60,6 @@ def _get_allowed_devices():
return rc
def compare_pv(right, left):
r_name = right.getName()
l_name = left.getName()
if r_name > l_name:
return 1
elif r_name == l_name:
return 0
else:
return -1
class AllowedPVS(object):
"""
We are only allowed to muck with certain PV, filter to only
@ -92,7 +84,7 @@ class AllowedPVS(object):
rc.append(p)
#Sort them consistently
rc.sort(compare_pv)
rc.sort(key=lambda x: x.getName())
return rc
def __exit__(self, t_type, value, traceback):