summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@redhat.com>2006-03-29 13:33:37 +0000
committerDaniel Veillard <veillard@redhat.com>2006-03-29 13:33:37 +0000
commit506fb7d8868efb4eb24b003b42cce14f9a0b8847 (patch)
tree4aabd4da6e9e3503943fca4386be4677031eddaa
parent300aa2d3f92c981cd8df9ccc0546b93251d796cf (diff)
downloadlibvirt-python-v6-506fb7d8868efb4eb24b003b42cce14f9a0b8847.tar.gz
libvirt-python-v6-506fb7d8868efb4eb24b003b42cce14f9a0b8847.tar.xz
libvirt-python-v6-506fb7d8868efb4eb24b003b42cce14f9a0b8847.zip
* python/libvir.c: fixed a bug in the new wrapperv0.1.1v0.1.0LIBVIRT_0_1_1LIBVIRT_0_1_0
* python/tests/Makefile.am python/tests/node.py: added a new test for the new API * python/tests/create.py: remove a debug Daniel
-rw-r--r--libvir.c4
-rw-r--r--tests/Makefile.am3
-rwxr-xr-xtests/create.py3
-rwxr-xr-xtests/node.py34
4 files changed, 40 insertions, 4 deletions
diff --git a/libvir.c b/libvir.c
index ede3949..786d47a 100644
--- a/libvir.c
+++ b/libvir.c
@@ -215,8 +215,8 @@ libvirt_virNodeGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
return(Py_None);
}
py_retval = PyList_New(8);
- PyList_SetItem(py_retval, 0, libvirt_charPtrWrap(&info.model[0]));
- PyList_SetItem(py_retval, 1, libvirt_longWrap((long) info.memory));
+ PyList_SetItem(py_retval, 0, libvirt_constcharPtrWrap(&info.model[0]));
+ 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, 3, libvirt_intWrap((int) info.mhz));
PyList_SetItem(py_retval, 4, libvirt_intWrap((int) info.nodes));
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5860190..dfa52e4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,8 @@ PYTESTS= \
basic.py \
create.py \
uuid.py \
- error.py
+ error.py \
+ node.py
EXTRA_DIST = $(PYTESTS)
diff --git a/tests/create.py b/tests/create.py
index b717db1..cd62928 100755
--- a/tests/create.py
+++ b/tests/create.py
@@ -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
#
osroots = [
+ "/u/fc4-2.img",
"/u/fc4.img",
"/xen/fc4.img",
]
@@ -84,7 +85,7 @@ if dom == None:
print 'Failed to create a test domain'
sys.exit(1)
-print dom
+# print dom
print "Domain: id %d running %s" % (dom.ID(), dom.OSType())
diff --git a/tests/node.py b/tests/node.py
new file mode 100755
index 0000000..2e33fb7
--- /dev/null
+++ b/tests/node.py
@@ -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)