valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #46957 from cbosdo/libvirt_events_uuids

Browse Source 
libvirt_events, harmonize object descriptions
This commit is contained in:
Nicole Thomas 2018-04-09 11:43:45 -04:00 committed by GitHub
commit 9cd07c5f0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
salt/engines/libvirt_events.py
View File

@ -214,7 +214,8 @@ def _salt_send_domain_event(opaque, conn, domain, event, event_data):
data = {
'domain': {
'name': domain.name(),
'id': domain.ID()
'id': domain.ID(),
'uuid': domain.UUIDString()
},
'event': event
}
@ -228,7 +229,8 @@ def _domain_event_lifecycle_cb(conn, domain, event, detail, opaque):
'''
event_str, detail_str = _get_domain_event_detail(event, detail)
_salt_send_domain_event(opaque, conn, domain, event_str, {
_salt_send_domain_event(opaque, conn, domain, opaque['event'], {
'event': event_str,
'detail': detail_str
})
@ -468,7 +470,10 @@ def _network_event_lifecycle_cb(conn, net, event, detail, opaque):
'''
_salt_send_event(opaque, conn, {
'network': net.name(),
'network': {
'name': net.name(),
'uuid': net.UUIDString()
},
'event': _get_libvirt_enum_string('VIR_NETWORK_EVENT_', event),
'detail': 'unknown' # currently unused
})
@ -479,7 +484,10 @@ def _pool_event_lifecycle_cb(conn, pool, event, detail, opaque):
Storage pool lifecycle events handler
'''
_salt_send_event(opaque, conn, {
'pool': pool.name(),
'pool': {
'name': pool.name(),
'uuid': pool.UUIDString()
},
'event': _get_libvirt_enum_string('VIR_STORAGE_POOL_EVENT_', event),
'detail': 'unknown' # currently unused
})
@ -490,7 +498,10 @@ def _pool_event_refresh_cb(conn, pool, opaque):
Storage pool refresh events handler
'''
_salt_send_event(opaque, conn, {
'pool': pool.name(),
'pool': {
'name': pool.name(),
'uuid': pool.UUIDString()
},
'event': opaque['event']
})
@ -500,7 +511,9 @@ def _nodedev_event_lifecycle_cb(conn, dev, event, detail, opaque):
Node device lifecycle events handler
'''
_salt_send_event(opaque, conn, {
'nodedev': dev.name(),
'nodedev': {
'name': dev.name()
},
'event': _get_libvirt_enum_string('VIR_NODE_DEVICE_EVENT_', event),
'detail': 'unknown' # currently unused
})
@ -511,7 +524,9 @@ def _nodedev_event_update_cb(conn, dev, opaque):
Node device update events handler
'''
_salt_send_event(opaque, conn, {
'nodedev': dev.name(),
'nodedev': {
'name': dev.name()
},
'event': opaque['event']
})
@ -521,7 +536,9 @@ def _secret_event_lifecycle_cb(conn, secret, event, detail, opaque):
Secret lifecycle events handler
'''
_salt_send_event(opaque, conn, {
'secret': secret.UUIDString(),
'secret': {
'uuid': secret.UUIDString()
},
'event': _get_libvirt_enum_string('VIR_SECRET_EVENT_', event),
'detail': 'unknown' # currently unused
})
@ -532,7 +549,9 @@ def _secret_event_value_changed_cb(conn, secret, opaque):
Secret value change events handler
'''
_salt_send_event(opaque, conn, {
'secret': secret.UUIDString(),
'secret': {
'uuid': secret.UUIDString()
},
'event': opaque['event']
})