Revision d224bb37

b/kamaki/clients/compute/test.py
40 40
from kamaki.clients.cyclades_rest_api import CycladesClientApi
41 41

  
42 42

  
43
khttp_pkg = 'kamaki.clients.connection.kamakicon.KamakiHTTPConnection'
43
compute_pkg_pkg = 'kamaki.clients.connection.kamakicon.KamakiHTTPConnection'
44 44
compute_pkg = 'kamaki.clients.cyclades.CycladesClient'
45 45

  
46 46
img_ref = "1m4g3-r3f3r3nc3"
......
228 228
                vm_id, 'meta/%s' % k,
229 229
                json_data=dict(meta={k: v}), success=201))
230 230

  
231
    """
232
    @patch('%s.perform_request' % khttp, return_value=FR())
233
    def test_get_server_metadata(self, PR):
231
    @patch('%s.servers_get' % compute_pkg, return_value=FR())
232
    def test_get_server_metadata(self, SG):
234 233
        vm_id = vm_recv['server']['id']
235 234
        metadata = dict(m1='v1', m2='v2', m3='v3')
236 235
        FR.json = dict(metadata=dict(values=metadata))
237 236
        r = self.client.get_server_metadata(vm_id)
238
        self.assertEqual(self.client.http_client.url, self.url)
239
        self.assertEqual(
240
            self.client.http_client.path,
241
            '/servers/%s/meta' % vm_id)
237
        self.assertEqual(SG.mock_calls[-1], call(vm_id, '/meta'))
242 238
        self.assert_dicts_are_equal(r, metadata)
243 239

  
244 240
        for k, v in metadata.items():
245 241
            FR.json = dict(meta={k: v})
246 242
            r = self.client.get_server_metadata(vm_id, k)
247
            self.assertEqual(self.client.http_client.url, self.url)
248
            self.assertEqual(
249
                self.client.http_client.path,
250
                '/servers/%s/meta/%s' % (vm_id, k))
251 243
            self.assert_dicts_are_equal(r, {k: v})
244
            self.assertEqual(SG.mock_calls[-1], call(vm_id, '/meta/%s' % k))
252 245

  
253
    @patch('%s.servers_post' % cyclades_pkg, return_value=FR())
246
    """
247
    @patch('%s.servers_post' % compute_pkg, return_value=FR())
254 248
    def test_update_server_metadata(self, servers_post):
255 249
        vm_id = vm_recv['server']['id']
256 250
        metadata = dict(m1='v1', m2='v2', m3='v3')
......
263 257
        data = servers_post.call_args[1]['json_data']
264 258
        self.assert_dicts_are_equal(data, dict(metadata=metadata))
265 259

  
266
    @patch('%s.servers_delete' % cyclades_pkg, return_value=FR())
260
    @patch('%s.servers_delete' % compute_pkg, return_value=FR())
267 261
    def test_delete_server_metadata(self, servers_delete):
268 262
        vm_id = vm_recv['server']['id']
269 263
        key = 'metakey'
270 264
        self.client.delete_server_metadata(vm_id, key)
271 265
        self.assertEqual((vm_id, 'meta/' + key), servers_delete.call_args[0])
272 266

  
273
    @patch('%s.perform_request' % khttp, return_value=FR())
267
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
274 268
    def test_list_flavors(self, PR):
275 269
        FR.json = flavor_list
276 270
        r = self.client.list_flavors()
......
282 276
        self.assertEqual(self.client.http_client.url, self.url)
283 277
        self.assertEqual(self.client.http_client.path, '/flavors/detail')
284 278

  
285
    @patch('%s.perform_request' % khttp, return_value=FR())
279
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
286 280
    def test_get_flavor_details(self, PR):
287 281
        FR.json = dict(flavor=flavor_list['flavors'])
288 282
        r = self.client.get_flavor_details(fid)
......
290 284
        self.assertEqual(self.client.http_client.path, '/flavors/%s' % fid)
291 285
        self.assert_dicts_are_equal(r, flavor_list['flavors'])
292 286

  
293
    @patch('%s.perform_request' % khttp, return_value=FR())
287
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
294 288
    def test_list_images(self, PR):
295 289
        FR.json = img_list
296 290
        r = self.client.list_images()
......
303 297
        self.assertEqual(self.client.http_client.url, self.url)
304 298
        self.assertEqual(self.client.http_client.path, '/images/detail')
305 299

  
306
    @patch('%s.perform_request' % khttp, return_value=FR())
300
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
307 301
    def test_get_image_details(self, PR):
308 302
        FR.json = img_recv
309 303
        r = self.client.get_image_details(img_ref)
......
311 305
        self.assertEqual(self.client.http_client.path, '/images/%s' % img_ref)
312 306
        self.assert_dicts_are_equal(r, img_recv['image'])
313 307

  
314
    @patch('%s.images_get' % cyclades_pkg, return_value=FR())
308
    @patch('%s.images_get' % compute_pkg, return_value=FR())
315 309
    def test_get_image_metadata(self, IG):
316 310
        FR.json = dict(metadata=dict(values=img_recv['image']))
317 311
        r = self.client.get_image_metadata(img_ref)
......
322 316
        self.client.get_image_metadata(img_ref, key)
323 317
        self.assertEqual(IG.call_args[0], ('%s' % img_ref, '/meta/%s' % key))
324 318

  
325
    @patch('%s.perform_request' % khttp, return_value=FR())
319
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
326 320
    def test_shutdown_server(self, PR):
327 321
        vm_id = vm_recv['server']['id']
328 322
        FR.status_code = 202
......
335 329
            PR.call_args[0],
336 330
            ('post',  '{"shutdown": {}}', {}, {}))
337 331

  
338
    @patch('%s.perform_request' % khttp, return_value=FR())
332
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
339 333
    def test_start_server(self, PR):
340 334
        vm_id = vm_recv['server']['id']
341 335
        FR.status_code = 202
......
346 340
            '/servers/%s/action' % vm_id)
347 341
        self.assertEqual(PR.call_args[0], ('post',  '{"start": {}}', {}, {}))
348 342

  
349
    @patch('%s.perform_request' % khttp, return_value=FR())
343
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
350 344
    def test_get_server_console(self, PR):
351 345
        cnsl = dict(console=dict(info1='i1', info2='i2', info3='i3'))
352 346
        FR.json = cnsl
......
378 372
                self.client.get_firewall_profile,
379 373
                vm_id)
380 374

  
381
    @patch('%s.perform_request' % khttp, return_value=FR())
375
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
382 376
    def test_set_firewall_profile(self, PR):
383 377
        vm_id = vm_recv['server']['id']
384 378
        v = 'Some profile'
......
394 388
            {},
395 389
            {}))
396 390

  
397
    @patch('%s.perform_request' % khttp, return_value=FR())
391
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
398 392
    def test_get_server_stats(self, PR):
399 393
        vm_id = vm_recv['server']['id']
400 394
        stats = dict(stat1='v1', stat2='v2', stat3='v3', stat4='v4')
......
406 400
            '/servers/%s/stats' % vm_id)
407 401
        self.assert_dicts_are_equal(stats, r)
408 402

  
409
    @patch('%s.perform_request' % khttp, return_value=FR())
403
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
410 404
    def test_create_network(self, PR):
411 405
        net_name = net_send['network']['name']
412 406
        FR.json = net_recv
......
432 426
            expected['network'].update(kwargs)
433 427
            self.assert_dicts_are_equal(loads(data), expected)
434 428

  
435
    @patch('%s.perform_request' % khttp, return_value=FR())
429
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
436 430
    def test_connect_server(self, PR):
437 431
        vm_id = vm_recv['server']['id']
438 432
        net_id = net_recv['network']['id']
......
446 440
            PR.call_args[0],
447 441
            ('post', '{"add": {"serverRef": %s}}' % vm_id, {}, {}))
448 442

  
449
    @patch('%s.networks_post' % cyclades_pkg, return_value=FR())
443
    @patch('%s.networks_post' % compute_pkg, return_value=FR())
450 444
    def test_disconnect_server(self, NP):
451 445
        vm_id = vm_recv['server']['id']
452 446
        net_id = net_recv['network']['id']
......
467 461
                NP.call_args[1],
468 462
                dict(json_data=dict(remove=dict(attachment=nic_id))))
469 463

  
470
    @patch('%s.perform_request' % khttp, return_value=FR())
464
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
471 465
    def test_list_server_nics(self, PR):
472 466
        vm_id = vm_recv['server']['id']
473 467
        nics = dict(addresses=dict(values=[dict(id='nic1'), dict(id='nic2')]))
......
481 475
        for i in range(len(r)):
482 476
            self.assert_dicts_are_equal(r[i], expected[i])
483 477

  
484
    @patch('%s.perform_request' % khttp, return_value=FR())
478
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
485 479
    def test_list_networks(self, PR):
486 480
        FR.json = net_list
487 481
        r = self.client.list_networks()
......
494 488
        self.assertEqual(self.client.http_client.url, self.url)
495 489
        self.assertEqual(self.client.http_client.path, '/networks/detail')
496 490

  
497
    @patch('%s.perform_request' % khttp, return_value=FR())
491
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
498 492
    def test_list_network_nics(self, PR):
499 493
        net_id = net_recv['network']['id']
500 494
        FR.json = net_recv
......
507 501
        for i in range(len(r)):
508 502
            self.assert_dicts_are_equal(r[i], expected[i])
509 503

  
510
    @patch('%s.networks_post' % cyclades_pkg, return_value=FR())
504
    @patch('%s.networks_post' % compute_pkg, return_value=FR())
511 505
    def test_disconnect_network_nics(self, NP):
512 506
        net_id = net_recv['network']['id']
513 507
        nics = ['nic1', 'nic2', 'nic3']
......
522 516
                    remove=dict(attachment=nics[i])))
523 517
                self.assertEqual(expected, NP.mock_calls[i])
524 518

  
525
    @patch('%s.perform_request' % khttp, return_value=FR())
519
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
526 520
    def test_get_network_details(self, PR):
527 521
        FR.json = net_recv
528 522
        net_id = net_recv['network']['id']
......
533 527
            '/networks/%s' % net_id)
534 528
        self.assert_dicts_are_equal(r, net_recv['network'])
535 529

  
536
    @patch('%s.perform_request' % khttp, return_value=FR())
530
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
537 531
    def test_update_network_name(self, PR):
538 532
        net_id = net_recv['network']['id']
539 533
        new_name = '%s_new' % net_id
......
546 540
            dict(network=dict(name=new_name)),
547 541
            loads(data))
548 542

  
549
    @patch('%s.perform_request' % khttp, return_value=FR())
543
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
550 544
    def test_delete_server(self, PR):
551 545
        vm_id = vm_recv['server']['id']
552 546
        FR.status_code = 204
......
554 548
        self.assertEqual(self.client.http_client.url, self.url)
555 549
        self.assertEqual(self.client.http_client.path, '/servers/%s' % vm_id)
556 550

  
557
    @patch('%s.perform_request' % khttp, return_value=FR())
551
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
558 552
    def test_delete_image(self, PR):
559 553
        FR.status_code = 204
560 554
        self.client.delete_image(img_ref)
561 555
        self.assertEqual(self.client.http_client.url, self.url)
562 556
        self.assertEqual(self.client.http_client.path, '/images/%s' % img_ref)
563 557

  
564
    @patch('%s.perform_request' % khttp, return_value=FR())
558
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
565 559
    def test_delete_network(self, PR):
566 560
        net_id = net_recv['network']['id']
567 561
        FR.status_code = 204
......
569 563
        self.assertEqual(self.client.http_client.url, self.url)
570 564
        self.assertEqual(self.client.http_client.path, '/networks/%s' % net_id)
571 565

  
572
    @patch('%s.perform_request' % khttp, return_value=FR())
566
    @patch('%s.perform_request' % compute_pkg, return_value=FR())
573 567
    def test_create_image_metadata(self, PR):
574 568
        metadata = dict(m1='v1', m2='v2', m3='v3')
575 569
        FR.json = dict(meta=img_recv['image'])
......
588 582
            self.assertEqual(dict(meta={k: v}), loads(data))
589 583
            self.assert_dicts_are_equal(r, img_recv['image'])
590 584

  
591
    @patch('%s.images_post' % cyclades_pkg, return_value=FR())
585
    @patch('%s.images_post' % compute_pkg, return_value=FR())
592 586
    def test_update_image_metadata(self, images_post):
593 587
        metadata = dict(m1='v1', m2='v2', m3='v3')
594 588
        FR.json = dict(metadata=metadata)
......
600 594
        data = images_post.call_args[1]['json_data']
601 595
        self.assert_dicts_are_equal(data, dict(metadata=metadata))
602 596

  
603
    @patch('%s.images_delete' % cyclades_pkg, return_value=FR())
597
    @patch('%s.images_delete' % compute_pkg, return_value=FR())
604 598
    def test_delete_image_metadata(self, images_delete):
605 599
        key = 'metakey'
606 600
        self.client.delete_image_metadata(img_ref, key)

Also available in: Unified diff