Revision 660b9f3b snf-cyclades-app/synnefo/logic/management/commands/reconcile-networks.py
| b/snf-cyclades-app/synnefo/logic/management/commands/reconcile-networks.py | ||
|---|---|---|
| 40 | 40 |
|
| 41 | 41 |
from optparse import make_option |
| 42 | 42 |
|
| 43 |
from synnefo.settings import PUBLIC_USE_POOL |
|
| 44 | 43 |
from django.core.management.base import BaseCommand |
| 45 | 44 |
from django.db import transaction |
| 46 | 45 |
|
| ... | ... | |
| 105 | 104 |
for network in networks: |
| 106 | 105 |
ip_available_maps = [] |
| 107 | 106 |
ip_reserved_maps = [] |
| 108 |
uses_pool = not network.public or PUBLIC_USE_POOL |
|
| 109 | 107 |
for bend in backends: |
| 110 | 108 |
bnet = get_backend_network(network, bend) |
| 111 | 109 |
gnet = ganeti_networks[bend].get(network.id) |
| ... | ... | |
| 150 | 148 |
# exists and is connected to all nodes so is must be active! |
| 151 | 149 |
reconcile_unsynced_network(network, bend, bnet) |
| 152 | 150 |
|
| 153 |
if uses_pool: |
|
| 154 |
# Get ganeti IP Pools |
|
| 155 |
available_map, reserved_map = get_network_pool(gnet) |
|
| 156 |
ip_available_maps.append(available_map) |
|
| 157 |
ip_reserved_maps.append(reserved_map) |
|
| 151 |
# Get ganeti IP Pools |
|
| 152 |
available_map, reserved_map = get_network_pool(gnet) |
|
| 153 |
ip_available_maps.append(available_map) |
|
| 154 |
ip_reserved_maps.append(reserved_map) |
|
| 158 | 155 |
|
| 159 |
if uses_pool and (ip_available_maps or ip_reserved_maps):
|
|
| 156 |
if ip_available_maps or ip_reserved_maps:
|
|
| 160 | 157 |
# CASE-5: Unsynced IP Pools |
| 161 | 158 |
reconcile_ip_pools(network, ip_available_maps, ip_reserved_maps) |
| 162 | 159 |
|
Also available in: Unified diff