Revision c088076b kamaki/clients/livetest/cyclades.py

b/kamaki/clients/livetest/cyclades.py
88 88

  
89 89
    def _create_server(self, servername, flavorid, imageid, personality=None):
90 90
        server = self.client.create_server(
91
            servername,
92
            flavorid,
93
            imageid,
94
            personality)
91
            servername, flavorid, imageid, personality)
95 92
        print('CREATE VM %s (%s)' % (server['id'], server['name']))
96 93
        self.servers[servername] = server
97 94
        return server
......
241 238

  
242 239
    def _test_0010_create_server(self):
243 240
        self.assertEqual(self.server1["name"], self.servname1)
244
        self.assertEqual(self.server1["flavor"], self.flavorid)
245
        self.assertEqual(self.server1["image"], self.img)
241
        self.assertEqual(self.server1["flavor"]["id"], self.flavorid)
242
        self.assertEqual(self.server1["image"]["id"], self.img)
246 243
        self.assertEqual(self.server1["status"], "BUILD")
247 244

  
248 245
    def test_list_servers(self):
......
298 295
    def _test_0040_get_server_details(self):
299 296
        r = self.client.get_server_details(self.server1['id'])
300 297
        self.assertEqual(r["name"], self.servname1)
301
        self.assertEqual(r["flavor"], self.flavorid)
302
        self.assertEqual(r["image"], self.img)
298
        self.assertEqual(r["flavor"]["id"], self.flavorid)
299
        self.assertEqual(r["image"]["id"], self.img)
303 300
        self.assertEqual(r["status"], "ACTIVE")
304 301

  
305 302
    def test_update_server_name(self):
......
364 361
            'mymeta val')
365 362
        self.assertTrue('mymeta' in r1)
366 363
        r2 = self.client.get_server_metadata(self.server1['id'], 'mymeta')
367
        self.assert_dicts_are_deeply_equal(r1, r2)
364
        self.assert_dicts_are_equal(r1, r2)
368 365

  
369 366
    def test_get_server_metadata(self):
370 367
        """Test get server_metadata"""
......
429 426

  
430 427
    def _test_0130_get_flavor_details(self):
431 428
        r = self.client.get_flavor_details(self.flavorid)
432
        self.assert_dicts_are_deeply_equal(self._flavor_details, r)
429
        self.assert_dicts_are_equal(self._flavor_details, r)
433 430

  
434
    def test_list_images(self):
435
        """Test list_images"""
436
        self._test_0140_list_images()
431
    #def test_list_images(self):
432
    #    """Test list_images"""
433
    #    self._test_0140_list_images()
437 434

  
438
    def _test_0140_list_images(self):
439
        r = self.client.list_images()
440
        self.assertTrue(len(r) > 1)
441
        r = self.client.list_images(detail=True)
442
        for detailed_img in r:
443
            if detailed_img['id'] == self.img:
444
                break
445
        self.assert_dicts_are_deeply_equal(detailed_img, self.img_details)
435
    #def _test_0140_list_images(self):
436
    #    r = self.client.list_images()
437
    #    self.assertTrue(len(r) > 1)
438
    #    r = self.client.list_images(detail=True)
439
    #    for detailed_img in r:
440
    #        if detailed_img['id'] == self.img:
441
    #            break
442
    #    self.assert_dicts_are_equal(detailed_img, self.img_details)
446 443

  
447 444
    def test_get_image_details(self):
448 445
        """Test image_details"""
......
450 447

  
451 448
    def _test_0150_get_image_details(self):
452 449
        r = self.client.get_image_details(self.img)
453
        self.assert_dicts_are_deeply_equal(r, self.img_details)
450
        self.assert_dicts_are_equal(r, self.img_details)
454 451

  
455 452
    def test_get_image_metadata(self):
456 453
        """Test get_image_metadata"""
......
458 455

  
459 456
    def _test_0160_get_image_metadata(self):
460 457
        r = self.client.get_image_metadata(self.img)
461
        self.assert_dicts_are_deeply_equal(
458
        self.assert_dicts_are_equal(
462 459
            self.img_details['metadata'], r)
463 460
        for key, val in self.img_details['metadata'].items():
464 461
            r = self.client.get_image_metadata(self.img, key)
......
592 589
        chosen.pop('updated')
593 590
        net1 = dict(self.network1)
594 591
        net1.pop('updated')
595
        self.assert_dicts_are_deeply_equal(chosen, net1)
592
        self.assert_dicts_are_equal(chosen, net1)
596 593
        full_args = dict(
597 594
                cidr='192.168.1.0/24',
598 595
                gateway='192.168.1.1',
......
735 732
        r.pop('status')
736 733
        r.pop('updated', None)
737 734
        r.pop('attachments')
738
        self.assert_dicts_are_deeply_equal(net1, r)
735
        self.assert_dicts_are_equal(net1, r)
739 736

  
740 737
    def test_update_network_name(self):
741 738
        self.network2 = self._create_network(self.netname2)

Also available in: Unified diff