Revision c6c889f7
b/snf-cyclades-app/synnefo/api/test/networks.py | ||
---|---|---|
265 | 265 |
self.assertFault(response, 403, 'forbidden') |
266 | 266 |
|
267 | 267 |
def test_delete_network(self, mrapi): |
268 |
net = mfactory.NetworkFactory() |
|
269 |
response = self.delete('/api/v1.1/networks/%d' % net.id, |
|
270 |
net.userid) |
|
268 |
net = mfactory.NetworkFactory(deleted=False, state='ACTIVE') |
|
269 |
with mocked_quotaholder(): |
|
270 |
response = self.delete('/api/v1.1/networks/%d' % net.id, |
|
271 |
net.userid) |
|
271 | 272 |
self.assertEqual(response.status_code, 204) |
272 | 273 |
net = Network.objects.get(id=net.id, userid=net.userid) |
273 | 274 |
self.assertEqual(net.action, 'DESTROY') |
b/snf-cyclades-app/synnefo/logic/tests.py | ||
---|---|---|
426 | 426 |
link='prv12') |
427 | 427 |
bn1 = mfactory.BackendNetworkFactory(network=net) |
428 | 428 |
mfactory.BackendNetworkFactory(network=net, |
429 |
operstate="ACTIVE", |
|
429 | 430 |
backend__offline=True) |
430 | 431 |
msg = self.create_msg(operation='OP_NETWORK_REMOVE', |
431 | 432 |
network=net.backend_id, |
... | ... | |
438 | 439 |
self.assertFalse(new_net.deleted) |
439 | 440 |
|
440 | 441 |
def test_error_opcode(self, client): |
442 |
mfactory.MacPrefixPoolTableFactory() |
|
443 |
mfactory.BridgePoolTableFactory() |
|
441 | 444 |
for state, _ in Network.OPER_STATES: |
442 |
bn = mfactory.BackendNetworkFactory() |
|
445 |
bn = mfactory.BackendNetworkFactory(operstate="ACTIVE")
|
|
443 | 446 |
bn.operstate = state |
444 | 447 |
bn.save() |
445 | 448 |
network = bn.network |
... | ... | |
451 | 454 |
msg = self.create_msg(operation=opcode, |
452 | 455 |
network=bn.network.backend_id, |
453 | 456 |
status='error', |
457 |
add_reserved_ips=[], |
|
458 |
remove_reserved_ips=[], |
|
454 | 459 |
cluster=bn.backend.clustername) |
455 |
update_network(client, msg) |
|
460 |
with mocked_quotaholder(): |
|
461 |
update_network(client, msg) |
|
456 | 462 |
client.basic_ack.assert_called_once() |
457 | 463 |
db_bnet = BackendNetwork.objects.get(id=bn.id) |
458 | 464 |
self.assertEqual(bn.operstate, db_bnet.operstate) |
Also available in: Unified diff