Revision c414bc87 snf-cyclades-app/synnefo/logic/reconciliation.py
| b/snf-cyclades-app/synnefo/logic/reconciliation.py | ||
|---|---|---|
| 73 | 73 |
|
| 74 | 74 |
from synnefo.db.models import (VirtualMachine, pooled_rapi_client) |
| 75 | 75 |
from synnefo.logic.rapi import GanetiApiError |
| 76 |
from synnefo.logic.backend import get_ganeti_instances |
|
| 76 |
from synnefo.logic.backend import get_ganeti_instances, get_backends
|
|
| 77 | 77 |
from synnefo.logic import utils |
| 78 | 78 |
|
| 79 | 79 |
|
| ... | ... | |
| 160 | 160 |
return failed |
| 161 | 161 |
|
| 162 | 162 |
|
| 163 |
def get_servers_from_db(): |
|
| 164 |
vms = VirtualMachine.objects.filter(deleted=False, backend__offline=False) |
|
| 163 |
def get_servers_from_db(backend=None): |
|
| 164 |
backends = get_backends(backend) |
|
| 165 |
vms = VirtualMachine.objects.filter(deleted=False, backend__in=backends) |
|
| 165 | 166 |
return dict(map(lambda x: (x.id, x.operstate), vms)) |
| 166 | 167 |
|
| 167 | 168 |
|
| 168 |
def get_instances_from_ganeti(): |
|
| 169 |
ganeti_instances = get_ganeti_instances(bulk=True) |
|
| 169 |
def get_instances_from_ganeti(backend=None):
|
|
| 170 |
ganeti_instances = get_ganeti_instances(backend=backend, bulk=True)
|
|
| 170 | 171 |
snf_instances = {}
|
| 171 | 172 |
snf_nics = {}
|
| 172 | 173 |
|
| ... | ... | |
| 193 | 194 |
# |
| 194 | 195 |
# Nics |
| 195 | 196 |
# |
| 196 |
def get_nics_from_ganeti(): |
|
| 197 |
def get_nics_from_ganeti(backend=None):
|
|
| 197 | 198 |
"""Get network interfaces for each ganeti instance. |
| 198 | 199 |
|
| 199 | 200 |
""" |
| 200 |
instances = get_ganeti_instances(bulk=True) |
|
| 201 |
instances = get_ganeti_instances(backend=backend, bulk=True)
|
|
| 201 | 202 |
prefix = settings.BACKEND_PREFIX_ID |
| 202 | 203 |
|
| 203 | 204 |
snf_instances_nics = {}
|
| ... | ... | |
| 232 | 233 |
return nics |
| 233 | 234 |
|
| 234 | 235 |
|
| 235 |
def get_nics_from_db(): |
|
| 236 |
def get_nics_from_db(backend=None):
|
|
| 236 | 237 |
"""Get network interfaces for each vm in DB. |
| 237 | 238 |
|
| 238 | 239 |
""" |
| 239 |
instances = VirtualMachine.objects.filter(deleted=False) |
|
| 240 |
backends = get_backends(backend) |
|
| 241 |
instances = VirtualMachine.objects.filter(deleted=False, |
|
| 242 |
backend__in=backends) |
|
| 240 | 243 |
instances_nics = {}
|
| 241 | 244 |
for instance in instances: |
| 242 | 245 |
nics = {}
|
Also available in: Unified diff