Revision c988fcca snf-cyclades-app/synnefo/api/tests/networks.py
| b/snf-cyclades-app/synnefo/api/tests/networks.py | ||
|---|---|---|
| 35 | 35 |
from mock import patch |
| 36 | 36 |
|
| 37 | 37 |
from snf_django.utils.testing import BaseAPITest, mocked_quotaholder |
| 38 |
from synnefo.db.models import Network, NetworkInterface
|
|
| 38 |
from synnefo.db.models import Network |
|
| 39 | 39 |
from synnefo.db import models_factory as mfactory |
| 40 | 40 |
from synnefo.cyclades_settings import cyclades_services |
| 41 | 41 |
from synnefo.lib.services import get_service_path |
| ... | ... | |
| 93 | 93 |
self.assertEqual(db_net.gateway6, api_net['gateway6']) |
| 94 | 94 |
self.assertEqual(db_net.dhcp, api_net['dhcp']) |
| 95 | 95 |
self.assertEqual(db_net.public, api_net['public']) |
| 96 |
db_nics = ["nic-%d-%d" % (nic.machine.id, nic.id) for nic in
|
|
| 96 |
db_nics = [nic.id for nic in
|
|
| 97 | 97 |
db_net.nics.filter(machine__userid=db_net.userid)] |
| 98 | 98 |
self.assertEqual(db_nics, api_net['attachments']) |
| 99 | 99 |
|
| ... | ... | |
| 137 | 137 |
def test_invalid_data_3(self, mrapi): |
| 138 | 138 |
"""Test unauthorized to create public network""" |
| 139 | 139 |
request = {
|
| 140 |
'network': {'name': 'foo',
|
|
| 141 |
"public": "True",
|
|
| 142 |
"type": "MAC_FILTERED"}
|
|
| 140 |
'network': {"name": 'foo',
|
|
| 141 |
"public": "True", |
|
| 142 |
"type": "MAC_FILTERED"} |
|
| 143 | 143 |
} |
| 144 | 144 |
response = self.mypost('networks/', 'user1',
|
| 145 | 145 |
json.dumps(request), 'json') |
| ... | ... | |
| 148 | 148 |
def test_invalid_data_4(self, mrapi): |
| 149 | 149 |
"""Test unauthorized to create network not in settings""" |
| 150 | 150 |
request = {
|
| 151 |
'network': {'name': 'foo', 'type': 'CUSTOM'}
|
|
| 151 |
'network': {'name': 'foo', 'type': 'CUSTOM'}
|
|
| 152 | 152 |
} |
| 153 | 153 |
response = self.mypost('networks/', 'user1',
|
| 154 | 154 |
json.dumps(request), 'json') |
| ... | ... | |
| 407 | 407 |
net = mfactory.NetworkFactory(state='ACTIVE', userid=user) |
| 408 | 408 |
nic = mfactory.NetworkInterfaceFactory(machine=vm, network=net) |
| 409 | 409 |
mrapi().ModifyInstance.return_value = 1 |
| 410 |
request = {'remove': {'attachment': 'nic-%s-%s' % (vm.id, nic.id)}}
|
|
| 410 |
request = {'remove': {'attachment': "%s" % nic.id}}
|
|
| 411 | 411 |
response = self.mypost('networks/%d/action' % net.id,
|
| 412 | 412 |
net.userid, json.dumps(request), 'json') |
| 413 | 413 |
self.assertEqual(response.status_code, 202) |
| ... | ... | |
| 420 | 420 |
vm = mfactory.VirtualMachineFactory(name='yo', userid=user) |
| 421 | 421 |
net = mfactory.NetworkFactory(state='ACTIVE', userid=user) |
| 422 | 422 |
nic = mfactory.NetworkInterfaceFactory(machine=vm, network=net) |
| 423 |
request = {'remove':
|
|
| 424 |
{'att234achment': 'nic-%s-%s' % (vm.id, nic.id)}
|
|
| 425 |
} |
|
| 423 |
request = {'remove': {'att234achment': '%s' % nic.id}}
|
|
| 426 | 424 |
response = self.mypost('networks/%d/action' % net.id,
|
| 427 | 425 |
net.userid, json.dumps(request), 'json') |
| 428 | 426 |
self.assertBadRequest(response) |
| ... | ... | |
| 431 | 429 |
user = 'userr' |
| 432 | 430 |
vm = mfactory.VirtualMachineFactory(name='yo', userid=user) |
| 433 | 431 |
net = mfactory.NetworkFactory(state='ACTIVE', userid=user) |
| 434 |
request = {'remove':
|
|
| 435 |
{'attachment': 'nic-%s' % vm.id}
|
|
| 436 |
} |
|
| 432 |
request = {'remove': {'attachment': 'nic-%s' % vm.id}}
|
|
| 437 | 433 |
response = self.mypost('networks/%d/action' % net.id,
|
| 438 | 434 |
net.userid, json.dumps(request), 'json') |
| 439 | 435 |
self.assertBadRequest(response) |
| ... | ... | |
| 442 | 438 |
response = self.myget('nonexistent')
|
| 443 | 439 |
self.assertEqual(response.status_code, 400) |
| 444 | 440 |
try: |
| 445 |
error = json.loads(response.content)
|
|
| 441 |
json.loads(response.content) |
|
| 446 | 442 |
except ValueError: |
| 447 | 443 |
self.assertTrue(False) |
| 448 | 444 |
|
Also available in: Unified diff