Revision 2e0916f2 snf-cyclades-app/synnefo/neutron/tests/api.py

b/snf-cyclades-app/synnefo/neutron/tests/api.py
10 10
NEUTRON_URL = get_service_path(cyclades_services, "neutron", "v2.0")
11 11
NETWORKS_URL = join_urls(NEUTRON_URL, "networks/")
12 12
SUBNETS_URL = join_urls(NEUTRON_URL, "subnets/")
13

  
13
ROUTERS_URL = join_urls(NEUTRON_URL, "routers/")
14 14

  
15 15
class NetworkTest(BaseAPITest):
16 16

  
......
18 18
        response = self.get(NETWORKS_URL)
19 19
        self.assertSuccess(response)
20 20
        networks = json.loads(response.content)
21
        self.assertEqual(networks, {'networks': []})
21
        self.assertEqual(networks, {"networks": []})
22 22

  
23 23
    def test_create_network(self):
24 24
        request = {
......
99 99
        url = join_urls(NETWORKS_URL, str(test_net.id))
100 100
        request = {
101 101
            "network": {
102
                "wronng_field": "new_name"}
102
                "wrong_field": "new_name"}
103 103
        }
104 104
        response = self.put(url, params=json.dumps(request),
105 105
                            user=test_net.userid)
......
112 112
        self.assertEqual(response.status_code, 400)
113 113

  
114 114

  
115
class RouterTest(BaseAPITest):
116
    def test_list_empty_routers(self):
117
        response = self.get(ROUTERS_URL)
118
        self.assertSuccess(response)
119
        routers = json.loads(response.content)
120
        self.assertEqual(routers, {"routers": []})
121

  
122
    def test_create_router(self):
123
        pass
124

  
125
    def test_get_router(self):
126
        router = dbmf.VirtualMachineFactory.create(router=True)
127
        net = mf.NetworkFactory.create(public=True)
128
        nic = mf.NetworkInterfaceFactory.create(network=net, machine=router)
129
        response = self.get(ROUTERS_URL, user=router.userid)
130
        self.assertSuccess(response)
131

  
132
    def test_delete_router(self):
133
        router = dbmf.VirtualMachineFactory.create(router=True)
134
        url = join_urls(ROUTERS_URL, str(router.id))
135
        response = self.delete(url, user=router.userid)
136
        print response.content
137
        self.assertEqual(response.status_code, 204)
138

  
139
    def test_delete_router_with_private_net(self):
140
        router = dbmf.VirtualMachineFactory.create(router=True)
141
        net = mf.NetworkFactory.create(public=False)
142
        nic = mf.NetworkInterfaceFactory.create(network=net, machine=router)
143
        url = join_urls(ROUTERS_URL, str(router.id))
144
        response = self.delete(url, user=router.userid)
145
        print response.content
146
        self.assertEqual(response.status_code, 409)
147

  
148
    def test_update_router(self):
149
        router = dbmf.VirtualMachineFactory.create(router=True)
150
        net1 = mf.NetworkFactory.create(public=True)
151
        net2 = mf.NetworkFactory.create(public=True)
152
        nic = mf.NetworkInterfaceFactory.create(network=net1, machine=router)
153
        request = {"router":{
154
                        "name": "new_name",
155
                        "external_gateway_info":{
156
                           "network_id": net2.id
157
                           }
158
                    }
159
            }
160
        url = join_urls(ROUTERS_URL, str(router.id))
161
        response = self.put(url, params=json.dumps(request), user=router.userid)
162
        info = json.loads(response.content)
163
        self.assertEqual(info['router']['external_gateway_info']['network_id'], net2.id)
164
        self.assertEqual(info['router']['name'], "new_name")
165

  
166
    def test_remove_interface(self):
167
        url = join_urls(join_urls(ROUTERS_URL,"123"), "remove_router_interface")
168
        response = self.put(url, params="")
169
        print response.content
170

  
171
    def test_add_interface(self):
172
        url = join_urls(join_urls(ROUTERS_URL,"123"), "add_router_interface")
173
        request =  {"port_id": "a2f1f29d-571b-4533-907f-5803ab96ead1","subnet_id": "a2f1f29d-571b-4533-907f-5803ab96ead1"}
174
        print json.dumps(request)
175
        response = self.put(url, params=json.dumps(request))
176
        print response.content
177

  
115 178
class SubnetTest(BaseAPITest):
116 179
    def test_list_subnets(self):
117 180
        '''Test list subnets without data'''

Also available in: Unified diff