NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-11 16:05:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

* python/libvir.c: fixed a bug in the new wrapper

Browse Source 
* python/tests/Makefile.am python/tests/node.py: added a new test for
  the new API
* python/tests/create.py: remove a debug
Daniel
This commit is contained in:
Daniel Veillard 2006-03-29 13:33:37 +00:00
parent 212eaea323
commit 880f4e9ae2
5 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Mar 29 13:34:25 EST 2006 Daniel Veillard <veillard@redhat.com>
* python/libvir.c: fixed a bug in the new wrapper
* python/tests/Makefile.am python/tests/node.py: added a new test for
the new API
* python/tests/create.py: remove a debug
Wed Mar 29 14:43:56 CEST 2006 Daniel Veillard <veillard@redhat.com> Wed Mar 29 14:43:56 CEST 2006 Daniel Veillard <veillard@redhat.com>
* include/libvirt.h[.in] include/virterror.h src/driver.h * include/libvirt.h[.in] include/virterror.h src/driver.h

4
python/libvir.c
View File

@ -215,8 +215,8 @@ libvirt_virNodeGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
return(Py_None); return(Py_None);
} }
py_retval = PyList_New(8); py_retval = PyList_New(8);
PyList_SetItem(py_retval, 0, libvirt_charPtrWrap(&info.model[0])); PyList_SetItem(py_retval, 0, libvirt_constcharPtrWrap(&info.model[0]));
PyList_SetItem(py_retval, 1, libvirt_longWrap((long) info.memory)); PyList_SetItem(py_retval, 1, libvirt_longWrap((long) info.memory >> 10));
PyList_SetItem(py_retval, 2, libvirt_intWrap((int) info.cpus)); PyList_SetItem(py_retval, 2, libvirt_intWrap((int) info.cpus));
PyList_SetItem(py_retval, 3, libvirt_intWrap((int) info.mhz)); PyList_SetItem(py_retval, 3, libvirt_intWrap((int) info.mhz));
PyList_SetItem(py_retval, 4, libvirt_intWrap((int) info.nodes)); PyList_SetItem(py_retval, 4, libvirt_intWrap((int) info.nodes));

3
python/tests/Makefile.am
View File

@ -4,7 +4,8 @@ PYTESTS= \
basic.py \ basic.py \
create.py \ create.py \
uuid.py \ uuid.py \
error.py error.py \
node.py
EXTRA_DIST = $(PYTESTS) EXTRA_DIST = $(PYTESTS)

3
python/tests/create.py
View File

@ -12,6 +12,7 @@ if not os.access("/proc/xen", os.R_OK):
# Try to provide default OS images paths here, of course non standard # Try to provide default OS images paths here, of course non standard
# #
osroots = [ osroots = [
"/u/fc4-2.img",
"/u/fc4.img", "/u/fc4.img",
"/xen/fc4.img", "/xen/fc4.img",
] ]
@ -84,7 +85,7 @@ if dom == None:
print 'Failed to create a test domain' print 'Failed to create a test domain'
sys.exit(1) sys.exit(1)
print dom # print dom
print "Domain: id %d running %s" % (dom.ID(), dom.OSType()) print "Domain: id %d running %s" % (dom.ID(), dom.OSType())

34
python/tests/node.py Executable file
View File

@ -0,0 +1,34 @@
#!/usr/bin/python -u
import libvirt
import sys
import os
if not os.access("/proc/xen", os.R_OK):
print 'System is not running a Xen kernel'
sys.exit(1)
conn = libvirt.openReadOnly(None)
if conn == None:
print 'Failed to open connection to the hypervisor'
sys.exit(1)
try:
(model, memory, cpus, mhz, nodes, socket, cores, threads) = conn.getInfo()
except:
print 'Failed to extract the current node informations'
sys.exit(1)
print "Xen running on %d %s processors at %d MHz, %d MBytes of memory" % (
cpus, model, mhz, memory)
if cpus > nodes * socket * cores * threads:
print "Erroneous CPU informations"
sys.exit(1)
if cpus < nodes * socket * cores * threads:
print "Strange, running in degrated mode, some CPU are not available"
del conn
print "OK"
sys.exit(0)