Revision 839e2bd0 snf-cyclades-app/synnefo/logic/backend.py
b/snf-cyclades-app/synnefo/logic/backend.py | ||
---|---|---|
407 | 407 |
|
408 | 408 |
""" |
409 | 409 |
|
410 |
mode = network.public and 'routed' or 'bridged' |
|
410 |
if network.type in ('PUBLIC_ROUTED', 'CUSTOM_ROUTED'): |
|
411 |
mode = 'routed' |
|
412 |
else: |
|
413 |
mode = 'bridged' |
|
411 | 414 |
|
412 | 415 |
if not backend_jobs: |
413 | 416 |
backend_jobs = [(backend, []) for backend in |
... | ... | |
424 | 427 |
"""Connect a network to a specific nodegroup of a backend. |
425 | 428 |
|
426 | 429 |
""" |
427 |
mode = network.public and 'routed' or 'bridged' |
|
430 |
if network.type in ('PUBLIC_ROUTED', 'CUSTOM_ROUTED'): |
|
431 |
mode = 'routed' |
|
432 |
else: |
|
433 |
mode = 'bridged' |
|
428 | 434 |
|
429 | 435 |
return backend.client.ConnectNetwork(network.backend_id, group, mode, |
430 | 436 |
network.link) |
... | ... | |
617 | 623 |
|
618 | 624 |
|
619 | 625 |
def connect_network_synced(network, backend): |
620 |
mode = network.public and 'routed' or 'bridged' |
|
626 |
if network.type in ('PUBLIC_ROUTED', 'CUSTOM_ROUTED'): |
|
627 |
mode = 'routed' |
|
628 |
else: |
|
629 |
mode = 'bridged' |
|
621 | 630 |
client = backend.client |
622 | 631 |
|
623 | 632 |
for group in client.GetGroups(): |
Also available in: Unified diff