Revision e6fbada1 snf-cyclades-gtools/synnefo/ganeti/eventd.py
| b/snf-cyclades-gtools/synnefo/ganeti/eventd.py | ||
|---|---|---|
| 282 | 282 |
self.logger.debug("Job: %d: %s(%s) %s", job_id, op_id,
|
| 283 | 283 |
instances, op.status) |
| 284 | 284 |
|
| 285 |
job_fields = {}
|
|
| 286 |
if op_id in ["OP_INSTANCE_SET_PARAMS", "OP_INSTANCE_CREATE"]: |
|
| 287 |
job_fields = {"nics": get_field(input, "nics"),
|
|
| 288 |
"disks": get_field(input, "disks"), |
|
| 289 |
"beparams": get_field(input, "beparams")} |
|
| 290 |
|
|
| 285 | 291 |
msg = {"type": "ganeti-op-status",
|
| 286 | 292 |
"instance": instances, |
| 287 |
"operation": op_id} |
|
| 293 |
"operation": op_id, |
|
| 294 |
"job_fields": job_fields} |
|
| 288 | 295 |
|
| 289 |
if op_id == "OP_INSTANCE_SET_PARAMS": |
|
| 290 |
beparams = get_field(input, "beparams") |
|
| 291 |
if beparams: |
|
| 292 |
msg["beparams"] = beparams |
|
| 296 |
if op_id in ["OP_INSTANCE_CREATE", "OP_INSTANCE_SET_PARAMS", |
|
| 297 |
"OP_INSTANCE_STARTUP"]: |
|
| 298 |
if op.status == "success": |
|
| 299 |
nics = get_instance_nics(msg["instance"], self.logger) |
|
| 300 |
msg["instance_nics"] = nics |
|
| 293 | 301 |
|
| 294 | 302 |
routekey = "ganeti.%s.event.op" % prefix_from_name(instances) |
| 295 | 303 |
|
| ... | ... | |
| 310 | 318 |
self.logger.debug("Job: %d: %s(%s) %s", job_id, op_id,
|
| 311 | 319 |
network_name, op.status) |
| 312 | 320 |
|
| 321 |
job_fields = {
|
|
| 322 |
'subnet': get_field(input, 'network'), |
|
| 323 |
'gateway': get_field(input, 'gateway'), |
|
| 324 |
"add_reserved_ips": get_field(input, "add_reserved_ips"), |
|
| 325 |
"remove_reserved_ips": get_field(input, "remove_reserved_ips"), |
|
| 326 |
# 'network_mode': get_field(input, 'network_mode'), |
|
| 327 |
# 'network_link': get_field(input, 'network_link'), |
|
| 328 |
'group_name': get_field(input, 'group_name')} |
|
| 329 |
|
|
| 313 | 330 |
msg = {'operation': op_id,
|
| 314 | 331 |
'type': "ganeti-network-status", |
| 315 | 332 |
'network': network_name, |
| 316 |
'subnet': get_field(input, 'network'), |
|
| 317 |
# 'network_mode': get_field(input, 'network_mode'), |
|
| 318 |
# 'network_link': get_field(input, 'network_link'), |
|
| 319 |
'gateway': get_field(input, 'gateway'), |
|
| 320 |
'group_name': get_field(input, 'group_name')} |
|
| 321 |
|
|
| 322 |
if op_id == "OP_NETWORK_SET_PARAMS": |
|
| 323 |
msg["add_reserved_ips"] = get_field(input, "add_reserved_ips") |
|
| 324 |
msg["remove_reserved_ips"] = get_field(input, |
|
| 325 |
"remove_reserved_ips") |
|
| 333 |
'job_fields': job_fields} |
|
| 334 |
|
|
| 326 | 335 |
routekey = "ganeti.%s.event.network" % prefix_from_name(network_name) |
| 327 | 336 |
|
| 328 | 337 |
return msg, routekey |
Also available in: Unified diff