Revision f8675683 snf-cyclades-app/synnefo/logic/servers.py
b/snf-cyclades-app/synnefo/logic/servers.py | ||
---|---|---|
202 | 202 |
vm.task_job_id = jobID |
203 | 203 |
vm.save() |
204 | 204 |
transaction.commit() |
205 |
log.info("User %s created VM %s, NIC %s, Backend %s, JobID %s", |
|
205 |
log.info("User %s created VM %s, NICs %s, Backend %s, JobID %s",
|
|
206 | 206 |
userid, vm, nics, backend, str(jobID)) |
207 | 207 |
except GanetiApiError as e: |
208 | 208 |
log.exception("Can not communicate to backend %s: %s.", |
... | ... | |
249 | 249 |
address = util.get_network_free_address(network) |
250 | 250 |
attachments.append((network, address)) |
251 | 251 |
for address in floating_ips: |
252 |
floating_ip = add_floating_ip_to_vm(address=address, |
|
253 |
user_id=userid, |
|
254 |
vm=vm) |
|
252 |
floating_ip = add_floating_ip_to_vm(vm=vm, address=address) |
|
255 | 253 |
network = floating_ip.network |
256 | 254 |
attachments.append((network, address)) |
257 | 255 |
for network_id in private_networks: |
... | ... | |
423 | 421 |
return console |
424 | 422 |
|
425 | 423 |
|
426 |
@server_command("CONNECTING")
|
|
424 |
@server_command("CONNECT") |
|
427 | 425 |
def add_floating_ip(vm, address): |
428 | 426 |
floating_ip = add_floating_ip_to_vm(vm, address) |
429 | 427 |
log.info("Connecting VM %s to floating IP %s", vm, floating_ip) |
... | ... | |
464 | 462 |
return floating_ip |
465 | 463 |
|
466 | 464 |
|
467 |
@server_command("DISCONNECTING")
|
|
465 |
@server_command("DISCONNECT") |
|
468 | 466 |
def remove_floating_ip(vm, address): |
469 | 467 |
user_id = vm.userid |
470 | 468 |
try: |
Also available in: Unified diff