Revision 36d450e8 snf-cyclades-app/synnefo/logic/callbacks.py
b/snf-cyclades-app/synnefo/logic/callbacks.py | ||
---|---|---|
34 | 34 |
import json |
35 | 35 |
from functools import wraps |
36 | 36 |
|
37 |
from django.db import transaction |
|
37 | 38 |
from synnefo.db.models import Backend, VirtualMachine, Network, BackendNetwork |
38 |
from synnefo.logic import utils, backend |
|
39 |
from synnefo.logic import utils, backend_mod
|
|
39 | 40 |
|
40 | 41 |
from synnefo.lib.utils import merge_time |
41 | 42 |
|
... | ... | |
172 | 173 |
|
173 | 174 |
nics = msg.get("nics", None) |
174 | 175 |
beparams = msg.get("beparams", None) |
175 |
backend.process_op_status(vm, event_time, msg['jobId'], msg['operation'], |
|
176 |
msg['status'], msg['logmsg'], nics=nics, |
|
177 |
beparams=beparams) |
|
176 |
backend_mod.process_op_status(vm, event_time, msg['jobId'], |
|
177 |
msg['operation'], msg['status'], |
|
178 |
msg['logmsg'], nics=nics, |
|
179 |
beparams=beparams) |
|
178 | 180 |
|
179 | 181 |
log.debug("Done processing ganeti-op-status msg for vm %s.", |
180 | 182 |
msg['instance']) |
... | ... | |
195 | 197 |
jobid = msg['jobId'] |
196 | 198 |
|
197 | 199 |
if opcode == "OP_NETWORK_SET_PARAMS": |
198 |
backend.process_network_modify(network, event_time, jobid, opcode, |
|
199 |
status, msg['add_reserved_ips'], |
|
200 |
msg['remove_reserved_ips']) |
|
200 |
backend_mod.process_network_modify(network, event_time, jobid, opcode,
|
|
201 |
status, msg['add_reserved_ips'],
|
|
202 |
msg['remove_reserved_ips'])
|
|
201 | 203 |
else: |
202 |
backend.process_network_status(network, event_time, jobid, opcode, |
|
203 |
status, msg['logmsg']) |
|
204 |
backend_mod.process_network_status(network, event_time, jobid, opcode,
|
|
205 |
status, msg['logmsg'])
|
|
204 | 206 |
|
205 | 207 |
log.debug("Done processing ganeti-network-status msg for network %s.", |
206 | 208 |
msg['network']) |
... | ... | |
221 | 223 |
return |
222 | 224 |
|
223 | 225 |
if msg['type'] == 'image-copy-progress': |
224 |
backend.process_create_progress(vm, event_time, msg['progress']) |
|
226 |
backend_mod.process_create_progress(vm, event_time, msg['progress'])
|
|
225 | 227 |
# we do not add diagnostic messages for copy-progress messages |
226 | 228 |
return |
227 | 229 |
|
... | ... | |
261 | 263 |
message = " ".join(source.split("-")).capitalize() |
262 | 264 |
|
263 | 265 |
# create the diagnostic entry |
264 |
backend.create_instance_diagnostic(vm, message, source, level, event_time,
|
|
265 |
details=details) |
|
266 |
backend_mod.create_instance_diagnostic(vm, message, source, level,
|
|
267 |
event_time, details=details)
|
|
266 | 268 |
|
267 | 269 |
log.debug("Done processing ganeti-create-progress msg for vm %s.", |
268 | 270 |
msg['instance']) |
269 | 271 |
|
270 | 272 |
|
273 |
@transaction.commit_on_success() |
|
274 |
def update_cluster(msg): |
|
275 |
clustername = msg.get("cluster") |
|
276 |
if clustername is None: |
|
277 |
return |
|
278 |
backend = Backend.objects.select_for_update().get(clustername=clustername) |
|
279 |
backend_mod.update_backend_disk_templates(backend) |
|
280 |
backend_mod.update_backend_resources(backend) |
|
281 |
|
|
282 |
|
|
271 | 283 |
def dummy_proc(client, message, *args, **kwargs): |
272 | 284 |
try: |
273 | 285 |
log.debug("Msg: %s", message['body']) |
Also available in: Unified diff