summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2010-04-22 16:31:05 +0100
committerDaniel P. Berrange <berrange@redhat.com>2010-04-22 17:15:48 +0100
commitde8ecb12cbab3c9aa5180d66185e3bf15b571285 (patch)
treea70cf4a809fc85d264ad97017b6c009d219429cd
parentportability fixes to tools/virt-pki-validate.in (diff)
downloadlibvirt-de8ecb12cbab3c9aa5180d66185e3bf15b571285.tar.gz
libvirt-de8ecb12cbab3c9aa5180d66185e3bf15b571285.tar.bz2
libvirt-de8ecb12cbab3c9aa5180d66185e3bf15b571285.zip
Fix printing of event detail in python events demo program
The events demo program is slightly misleading printing myDomainEventCallback1 EVENT: Domain f14i686(-1) Added which is not distinguishing Add vs Update events. It should have been doing myDomainEventCallback1 EVENT: Domain f14i686(-1) Defined Updated * examples/domain-events/events-python/event-test.py: Fully print event detail info string
-rw-r--r--examples/domain-events/events-python/event-test.py27
1 files changed, 20 insertions, 7 deletions
diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py
index 0c6e2f039..7c5af68cd 100644
--- a/examples/domain-events/events-python/event-test.py
+++ b/examples/domain-events/events-python/event-test.py
@@ -396,21 +396,34 @@ def virEventLoopPureStart():
# Everything that now follows is a simple demo of domain lifecycle events
##########################################################################
def eventToString(event):
- eventStrings = ( "Added",
- "Removed",
+ eventStrings = ( "Defined",
+ "Undefined",
"Started",
"Suspended",
"Resumed",
- "Stopped",
- "Saved",
- "Restored" );
+ "Stopped" );
return eventStrings[event];
+def detailToString(event, detail):
+ eventStrings = (
+ ( "Added", "Updated" ),
+ ( "Removed" ),
+ ( "Booted", "Migrated", "Restored", "Snapshot" ),
+ ( "Paused", "Migrated", "IOError", "Watchdog" ),
+ ( "Unpaused", "Migrated"),
+ ( "Shutdown", "Destroyed", "Crashed", "Migrated", "Saved", "Failed", "Snapshot")
+ )
+ return eventStrings[event][detail]
+
def myDomainEventCallback1 (conn, dom, event, detail, opaque):
- print "myDomainEventCallback1 EVENT: Domain %s(%s) %s %d" % (dom.name(), dom.ID(), eventToString(event), detail)
+ print "myDomainEventCallback1 EVENT: Domain %s(%s) %s %s" % (dom.name(), dom.ID(),
+ eventToString(event),
+ detailToString(event, detail))
def myDomainEventCallback2 (conn, dom, event, detail, opaque):
- print "myDomainEventCallback2 EVENT: Domain %s(%s) %s %d" % (dom.name(), dom.ID(), eventToString(event), detail)
+ print "myDomainEventCallback2 EVENT: Domain %s(%s) %s %s" % (dom.name(), dom.ID(),
+ eventToString(event),
+ detailToString(event, detail))
def myDomainEventRebootCallback(conn, dom, opaque):
print "myDomainEventRebootCallback: Domain %s(%s)" % (dom.name(), dom.ID())