Revision 207b70d5 api/tests.py
b/api/tests.py | ||
---|---|---|
500 | 500 |
return reply |
501 | 501 |
|
502 | 502 |
def get_network_details(self, network_id): |
503 |
path = '/api/v1.1/networks/%d' % network_id
|
|
503 |
path = '/api/v1.1/networks/%s' % network_id
|
|
504 | 504 |
response = self.client.get(path) |
505 | 505 |
self.assertEqual(response.status_code, 200) |
506 | 506 |
reply = json.loads(response.content) |
... | ... | |
508 | 508 |
return reply['network'] |
509 | 509 |
|
510 | 510 |
def update_network_name(self, network_id, new_name): |
511 |
path = '/api/v1.1/networks/%d' % network_id
|
|
511 |
path = '/api/v1.1/networks/%s' % network_id
|
|
512 | 512 |
data = json.dumps({'network': {'name': new_name}}) |
513 | 513 |
response = self.client.put(path, data, content_type='application/json') |
514 | 514 |
self.assertEqual(response.status_code, 204) |
515 | 515 |
|
516 | 516 |
def delete_network(self, network_id): |
517 |
path = '/api/v1.1/networks/%d' % network_id
|
|
517 |
path = '/api/v1.1/networks/%s' % network_id
|
|
518 | 518 |
response = self.client.delete(path) |
519 | 519 |
self.assertEqual(response.status_code, 204) |
520 | 520 |
|
521 | 521 |
def add_to_network(self, network_id, server_id): |
522 |
path = '/api/v1.1/networks/%d/action' % network_id
|
|
522 |
path = '/api/v1.1/networks/%s/action' % network_id
|
|
523 | 523 |
data = json.dumps({'add': {'serverRef': server_id}}) |
524 | 524 |
response = self.client.post(path, data, content_type='application/json') |
525 | 525 |
self.assertEqual(response.status_code, 202) |
526 | 526 |
|
527 | 527 |
def remove_from_network(self, network_id, server_id): |
528 |
path = '/api/v1.1/networks/%d/action' % network_id
|
|
528 |
path = '/api/v1.1/networks/%s/action' % network_id
|
|
529 | 529 |
data = json.dumps({'remove': {'serverRef': server_id}}) |
530 | 530 |
response = self.client.post(path, data, content_type='application/json') |
531 | 531 |
self.assertEqual(response.status_code, 202) |
... | ... | |
865 | 865 |
def test_list_networks(self): |
866 | 866 |
networks = self.list_networks() |
867 | 867 |
for net in Network.objects.all(): |
868 |
network = popdict(networks, id=net.id) |
|
868 |
net_id = str(net.id) if not net.public else 'public' |
|
869 |
network = popdict(networks, id=net_id) |
|
869 | 870 |
self.assertEqual(network['name'], net.name) |
870 | 871 |
self.assertEqual(networks, []) |
871 | 872 |
|
872 | 873 |
def test_list_networks_detail(self): |
873 | 874 |
networks = self.list_networks(detail=True) |
874 | 875 |
for net in Network.objects.all(): |
875 |
network = popdict(networks, id=net.id) |
|
876 |
net_id = str(net.id) if not net.public else 'public' |
|
877 |
network = popdict(networks, id=net_id) |
|
876 | 878 |
self.assertEqual(network['name'], net.name) |
877 | 879 |
machines = set(vm.id for vm in net.machines.all()) |
878 | 880 |
self.assertEqual(set(network['servers']['values']), machines) |
... | ... | |
914 | 916 |
|
915 | 917 |
|
916 | 918 |
class UpdateNetworkName(BaseTestCase): |
917 |
NETWORKS = 5 |
|
918 |
|
|
919 | 919 |
def test_update_network_name(self): |
920 |
name = 'net' |
|
921 |
self.create_network(name) |
|
920 | 922 |
networks = self.list_networks(detail=True) |
921 |
network = choice(networks) |
|
923 |
priv = [net for net in networks if net['id'] != 'public'] |
|
924 |
network = choice(priv) |
|
922 | 925 |
network_id = network['id'] |
923 | 926 |
new_name = network['name'] + '_2' |
924 | 927 |
self.update_network_name(network_id, new_name) |
... | ... | |
936 | 939 |
self.create_network('net%d' % i) |
937 | 940 |
|
938 | 941 |
networks = self.list_networks() |
939 |
network = choice(networks) |
|
940 |
while network['id'] == 1: |
|
941 |
network = choice(networks) |
|
942 |
priv = [net for net in networks if net['id'] != 'public'] |
|
943 |
network = choice(priv) |
|
942 | 944 |
network_id = network['id'] |
943 | 945 |
self.delete_network(network_id) |
944 | 946 |
|
945 | 947 |
net = self.get_network_details(network_id) |
946 | 948 |
self.assertEqual(net['status'], 'DELETED') |
947 | 949 |
|
948 |
networks.remove(network) |
|
949 |
self.assertEqual(self.list_networks(), networks) |
|
950 |
priv.remove(network) |
|
951 |
networks = self.list_networks() |
|
952 |
new_priv = [net for net in networks if net['id'] != 'public'] |
|
953 |
self.assertEqual(priv, new_priv) |
|
950 | 954 |
|
951 | 955 |
|
952 | 956 |
class NetworkActions(BaseTestCase): |
Also available in: Unified diff