Revision bcc21c50

b/snf-tools/synnefo_tools/burnin.py
710 710
        log.info("Server id: " + str(server["id"]))
711 711
        log.info("Server password: " + server["adminPass"])
712 712
        self.assertEqual(server["name"], self.servername)
713
        self.assertEqual(server["flavor"], self.flavorid)
714
        self.assertEqual(server["image"], self.imageid)
713
        self.assertEqual(server["flavor"]["id"], self.flavorid)
714
        self.assertEqual(server["image"]["id"], self.imageid)
715 715
        self.assertEqual(server["status"], "BUILD")
716 716

  
717 717
        # Update class attributes to reflect data on building server
......
734 734

  
735 735
        server = servers[0]
736 736
        self.assertEqual(server["name"], self.servername)
737
        self.assertEqual(server["flavor"], self.flavorid)
738
        self.assertEqual(server["image"], self.imageid)
737
        self.assertEqual(server["flavor"]["id"], self.flavorid)
738
        self.assertEqual(server["image"]["id"], self.imageid)
739 739
        self.assertEqual(server["status"], "BUILD")
740 740

  
741 741
    def test_002b_server_is_building_in_details(self):
......
745 745

  
746 746
        server = self.cyclades_client.get_server_details(self.serverid)
747 747
        self.assertEqual(server["name"], self.servername)
748
        self.assertEqual(server["flavor"], self.flavorid)
749
        self.assertEqual(server["image"], self.imageid)
748
        self.assertEqual(server["flavor"]["id"], self.flavorid)
749
        self.assertEqual(server["image"]["id"], self.imageid)
750 750
        self.assertEqual(server["status"], "BUILD")
751 751

  
752 752
    def test_002c_set_server_metadata(self):
......
1073 1073
            self.servername, self.flavorid, self.imageid, personality=None)
1074 1074

  
1075 1075
        self.assertEqual(serverA["name"], self.servername)
1076
        self.assertEqual(serverA["flavor"], self.flavorid)
1077
        self.assertEqual(serverA["image"], self.imageid)
1076
        self.assertEqual(serverA["flavor"]["id"], self.flavorid)
1077
        self.assertEqual(serverA["image"]["id"], self.imageid)
1078 1078
        self.assertEqual(serverA["status"], "BUILD")
1079 1079

  
1080 1080
        # Update class attributes to reflect data on building server
......
1117 1117
            self.servername, self.flavorid, self.imageid, personality=None)
1118 1118

  
1119 1119
        self.assertEqual(serverB["name"], self.servername)
1120
        self.assertEqual(serverB["flavor"], self.flavorid)
1121
        self.assertEqual(serverB["image"], self.imageid)
1120
        self.assertEqual(serverB["flavor"]["id"], self.flavorid)
1121
        self.assertEqual(serverB["image"]["id"], self.imageid)
1122 1122
        self.assertEqual(serverB["status"], "BUILD")
1123 1123

  
1124 1124
        # Update class attributes to reflect data on building server

Also available in: Unified diff