diff --git a/examples/event-test.py b/examples/event-test.py index f5a6475..fc4718f 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -664,6 +664,10 @@ def myNetworkEventLifecycleCallback(conn: libvirt.virConnect, net: libvirt.virNe print("myNetworkEventLifecycleCallback: Network %s %s %s" % ( net.name(), NET_EVENTS[event], NET_EVENTS[event][detail])) +def myNetworkEventMetadataChangeCallback(conn: libvirt.virConnect, dom: libvirt.virNetwork, mtype: int, nsuri: str, opaque: _T) -> None: + print("myNetworkEventMetadataChangeCallback: Network %s(%s) changed metadata mtype=%d nsuri=%s" % ( + dom.name(), dom.ID(), mtype, nsuri)) + ########################################################################## # Storage pool events @@ -806,6 +810,7 @@ def main() -> None: netcallbacks = [ vc.networkEventRegisterAny(None, libvirt.VIR_NETWORK_EVENT_ID_LIFECYCLE, myNetworkEventLifecycleCallback, None), + vc.networkEventRegisterAny(None, libvirt.VIR_NETWORK_EVENT_ID_METADATA_CHANGE, myNetworkEventMetadataChangeCallback, None), ] poolcallbacks = [ diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 5fc2ee3..3031b49 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -299,6 +299,15 @@ cb(self, virNetwork(self, _obj=net), event, detail, opaque) return 0 + def _dispatchNetworkEventMetadataChangeCallback(self, dom: 'virNetwork', mtype: int, nsuri: str, cbData: Dict[str, Any]) -> int: + """Dispatches event to python user network metadata change event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virNetwork(self, _obj=dom), mtype, nsuri, opaque) + return 0 + def networkEventDeregisterAny(self, callbackID: int) -> None: """Removes a Network Event Callback. De-registering for a network callback will disable delivery of this event type""" diff --git a/libvirt-override.c b/libvirt-override.c index 8a86174..2d496a6 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7649,6 +7649,59 @@ libvirt_virConnectNetworkEventLifecycleCallback(virConnectPtr conn ATTRIBUTE_UNU return ret; } +#ifdef VIR_NETWORK_EVENT_ID_METADATA_CHANGE +static int +libvirt_virConnectNetworkEventMetadataChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virNetworkPtr dom, + int type, + const char *nsuri, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_dom; + PyObject *pyobj_ret = NULL; + PyObject *pyobj_conn; + PyObject *dictKey; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + + if (!(dictKey = libvirt_constcharPtrWrap("conn"))) + goto cleanup; + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Create a python instance of this virNetworkPtr */ + virNetworkRef(dom); + if (!(pyobj_dom = libvirt_virNetworkPtrWrap(dom))) { + virNetworkFree(dom); + goto cleanup; + } + Py_INCREF(pyobj_cbData); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchNetworkEventMetadataChangeCallback", + (char*)"OisO", + pyobj_dom, type, nsuri, pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_dom); + + cleanup: + if (!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; +} +#endif /* VIR_NETWORK_EVENT_ID_METADATA_CHANGE */ + static PyObject * libvirt_virConnectNetworkEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -7680,6 +7733,12 @@ libvirt_virConnectNetworkEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, cb = VIR_NETWORK_EVENT_CALLBACK(libvirt_virConnectNetworkEventLifecycleCallback); break; +#ifdef VIR_NETWORK_EVENT_ID_METADATA_CHANGE + case VIR_NETWORK_EVENT_ID_METADATA_CHANGE: + cb = VIR_NETWORK_EVENT_CALLBACK(libvirt_virConnectNetworkEventMetadataChangeCallback); + break; +#endif /* VIR_NETWORK_EVENT_ID_METADATA_CHANGE */ + case VIR_NETWORK_EVENT_ID_LAST: break; }