Revision 1b696c26 snf-cyclades-app/synnefo/api/test/servers.py

b/snf-cyclades-app/synnefo/api/test/servers.py
90 90
        self.assertSuccess(response)
91 91
        servers = json.loads(response.content)['servers']
92 92
        db_server = self.vm1
93
        self.assertEqual(servers, [{'name': db_server.name,
94
                                    'id': db_server.id}])
93
        server = servers[0]
94
        self.assertEqual(server["name"], db_server.name)
95
        self.assertEqual(server["id"], db_server.id)
95 96

  
96 97
    def test_server_list_detail(self):
97 98
        """Test if the servers list details are returned."""
......
104 105
        self.assertEqual(len(servers), len(user_vms))
105 106
        for api_vm in servers:
106 107
            db_vm = user_vms[api_vm['id']]
107
            self.assertEqual(api_vm['flavor'], db_vm.flavor.id)
108
            self.assertEqual(api_vm['flavor']["id"], db_vm.flavor.id)
108 109
            self.assertEqual(api_vm['hostId'], db_vm.hostid)
109 110
            self.assertEqual(api_vm['id'], db_vm.id)
110
            self.assertEqual(api_vm['image'], db_vm.imageid)
111
            self.assertEqual(api_vm['image']["id"], db_vm.imageid)
111 112
            self.assertEqual(api_vm['name'], db_vm.name)
112 113
            self.assertEqual(api_vm['status'], get_rsapi_state(db_vm))
113 114
            self.assertSuccess(response)
......
124 125
        response = self.myget('servers/%d' % db_vm.id, user)
125 126
        server = json.loads(response.content)['server']
126 127

  
127
        self.assertEqual(server['flavor'], db_vm.flavor.id)
128
        self.assertEqual(server['flavor']["id"], db_vm.flavor.id)
128 129
        self.assertEqual(server['hostId'], db_vm.hostid)
129 130
        self.assertEqual(server['id'], db_vm.id)
130
        self.assertEqual(server['image'], db_vm.imageid)
131
        self.assertEqual(server['image']["id"], db_vm.imageid)
131 132
        self.assertEqual(server['name'], db_vm.name)
132 133
        self.assertEqual(server['status'], get_rsapi_state(db_vm))
133 134
        api_nic = server['attachments'][0]

Also available in: Unified diff