Revision 5ad6a119

b/kamaki/clients/test/cyclades.py
35 35
from json import loads
36 36

  
37 37
from kamaki.clients import Client, ClientError
38
from kamaki.clients.cyclades_rest_api import CycladesClientApi
38 39

  
39 40
img_ref = "1m4g3-r3f3r3nc3"
40 41
vm_name = "my new VM"
......
159 160
            r = self.client.list_servers(detail=True)
160 161
            self.assertEqual(self.client.http_client.url, self.url)
161 162
            self.assertEqual(self.client.http_client.path, '/servers/detail')
162
        from kamaki.clients.cyclades_rest_api import CycladesClientApi
163 163
        with patch.object(
164 164
                CycladesClientApi,
165 165
                'servers_get',
......
260 260
        vm_id = vm_recv['server']['id']
261 261
        metadata = dict(m1='v1', m2='v2', m3='v3')
262 262
        self.FR.json = dict(metadata=metadata)
263
        from kamaki.clients.cyclades_rest_api import CycladesClientApi
264 263
        with patch.object(
265 264
                CycladesClientApi,
266 265
                'servers_post',
......
273 272
            data = servers_post.call_args[1]['json_data']
274 273
            self.assert_dicts_are_equal(data, dict(metadata=metadata))
275 274

  
276
    """
277 275
    def test_delete_server_metadata(self):
278
        r1 = self.client.create_server_metadata(
279
            self.server1['id'],
280
            'mymeta',
281
            'val')
282
        self.assertTrue('mymeta' in r1)
283
        self.client.delete_server_metadata(self.server1['id'], 'mymeta')
284
        try:
285
            self.client.get_server_metadata(self.server1['id'], 'mymeta')
286
            raise ClientError('Wrong Error', status=100)
287
        except ClientError as err:
288
            self.assertEqual(err.status, 404)
276
        vm_id = vm_recv['server']['id']
277
        key = 'metakey'
278
        with patch.object(
279
                CycladesClientApi,
280
                'servers_delete',
281
                return_value=self.FR()) as servers_delete:
282
            self.client.delete_server_metadata(vm_id, key)
283
            self.assertEqual(
284
                (vm_id, 'meta/' + key),
285
                servers_delete.call_args[0])
289 286

  
287
    """
290 288
    def test_list_flavors(self):
291 289
        r = self.client.list_flavors()
292 290
        self.assertTrue(len(r) > 1)

Also available in: Unified diff