Revision e13aeb09

b/snf-cyclades-app/synnefo/api/servers.py
133 133
        d['hostId'] = vm.hostid
134 134
        d['updated'] = utils.isoformat(vm.updated)
135 135
        d['created'] = utils.isoformat(vm.created)
136
        d['flavorRef'] = vm.flavor.id
137
        d['imageRef'] = vm.imageid
136
        d['flavor'] = vm.flavor.id
137
        d['image'] = vm.imageid
138 138
        d['suspended'] = vm.suspended
139 139

  
140 140
        metadata = dict((m.meta_key, m.meta_value) for m in vm.metadata.all())
b/snf-cyclades-app/synnefo/api/test/servers.py
78 78
        self.assertEqual(len(servers), len(user_vms))
79 79
        for api_vm in servers:
80 80
            db_vm = user_vms[api_vm['id']]
81
            self.assertEqual(api_vm['flavorRef'], db_vm.flavor.id)
81
            self.assertEqual(api_vm['flavor'], db_vm.flavor.id)
82 82
            self.assertEqual(api_vm['hostId'], db_vm.hostid)
83 83
            self.assertEqual(api_vm['id'], db_vm.id)
84
            self.assertEqual(api_vm['imageRef'], db_vm.imageid)
84
            self.assertEqual(api_vm['image'], db_vm.imageid)
85 85
            self.assertEqual(api_vm['name'], db_vm.name)
86 86
            self.assertEqual(api_vm['status'], get_rsapi_state(db_vm))
87 87
            self.assertSuccess(response)
......
98 98
        response = self.get('/api/v1.1/servers/%d' % db_vm.id, user)
99 99
        server = json.loads(response.content)['server']
100 100

  
101
        self.assertEqual(server['flavorRef'], db_vm.flavor.id)
101
        self.assertEqual(server['flavor'], db_vm.flavor.id)
102 102
        self.assertEqual(server['hostId'], db_vm.hostid)
103 103
        self.assertEqual(server['id'], db_vm.id)
104
        self.assertEqual(server['imageRef'], db_vm.imageid)
104
        self.assertEqual(server['image'], db_vm.imageid)
105 105
        self.assertEqual(server['name'], db_vm.name)
106 106
        self.assertEqual(server['status'], get_rsapi_state(db_vm))
107 107
        api_nic = server['attachments']['values'][0]

Also available in: Unified diff