Revision 1da50fe3 snf-cyclades-app/synnefo/logic/management/commands/backend-add.py
b/snf-cyclades-app/synnefo/logic/management/commands/backend-add.py | ||
---|---|---|
33 | 33 |
|
34 | 34 |
from synnefo.db.models import Backend, Network |
35 | 35 |
from django.db.utils import IntegrityError |
36 |
from synnefo.logic.backend import (get_physical_resources, |
|
37 |
update_resources, |
|
38 |
create_network_synced, |
|
39 |
connect_network_synced) |
|
36 |
from synnefo.logic import backend as backend_mod |
|
40 | 37 |
from synnefo.management.common import check_backend_credentials |
41 | 38 |
from snf_django.management.utils import pprint_table |
42 | 39 |
|
... | ... | |
116 | 113 |
return |
117 | 114 |
|
118 | 115 |
stream.write("Retrieving backend resources:\n") |
119 |
resources = get_physical_resources(backend) |
|
116 |
resources = backend_mod.get_physical_resources(backend)
|
|
120 | 117 |
attr = ['mfree', 'mtotal', 'dfree', 'dtotal', 'pinst_cnt', 'ctotal'] |
121 | 118 |
|
122 | 119 |
table = [[str(resources[x]) for x in attr]] |
123 | 120 |
pprint_table(stream, table, attr) |
124 | 121 |
|
125 |
update_resources(backend, resources) |
|
122 |
backend_mod.update_backend_resources(backend, resources) |
|
123 |
backend_mod.update_backend_disk_templates(backend) |
|
126 | 124 |
|
127 | 125 |
networks = Network.objects.filter(deleted=False, floating_ip_pool=True) |
128 | 126 |
if not networks: |
... | ... | |
139 | 137 |
|
140 | 138 |
for net in networks: |
141 | 139 |
net.create_backend_network(backend) |
142 |
result = create_network_synced(net, backend) |
|
140 |
result = backend_mod.create_network_synced(net, backend)
|
|
143 | 141 |
if result[0] != "success": |
144 | 142 |
stream.write('\nError Creating Network %s: %s\n' % |
145 | 143 |
(net.backend_id, result[1])) |
146 | 144 |
else: |
147 | 145 |
stream.write('Successfully created Network: %s\n' % |
148 | 146 |
net.backend_id) |
149 |
result = connect_network_synced(network=net, backend=backend) |
|
147 |
result = backend_mod.connect_network_synced(network=net, |
|
148 |
backend=backend) |
|
150 | 149 |
if result[0] != "success": |
151 | 150 |
stream.write('\nError Connecting Network %s: %s\n' % |
152 | 151 |
(net.backend_id, result[1])) |
Also available in: Unified diff