Revision 90d90bd2 api/servers.py

b/api/servers.py
64 64 
        d['hostId'] = server.hostid
65 65 
        d['updated'] = server.updated.isoformat()
66 66 
        d['created'] = server.created.isoformat()
67 
        d['flavorId'] = server.flavor.id            # XXX Should use flavorRef instead?
68 
        d['imageId'] = server.sourceimage.id        # XXX Should use imageRef instead?
67 
        d['flavorRef'] = server.flavor.id
68 
        d['imageRef'] = server.sourceimage.id
69 69 
        d['description'] = server.description       # XXX Not in OpenStack docs
70 70
71 71 
        server_meta = server.virtualmachinemetadata_set.all()
......
122 122 
    try:
123 123 
        server = req['server']
124 124 
        name = server['name']
125 
        sourceimage = Image.objects.get(id=server['imageId'])
126 
        flavor = Flavor.objects.get(id=server['flavorId'])
125 
        sourceimage = Image.objects.get(id=server['imageRef'])
126 
        flavor = Flavor.objects.get(id=server['flavorRef'])
127 127 
    except KeyError:
128 128 
        raise BadRequest
129 129 
    except Image.DoesNotExist:
......
152 152 
        disk_template='plain',
153 153 
        disks=[{"size": 2000}],         #FIXME: Always ask for a 2GB disk for now
154 154 
        nics=[{}],
155 
        os='debootstrap+default',       #TODO: select OS from imageId
155 
        os='debootstrap+default',       #TODO: select OS from imageRef
156 156 
        ip_check=False,
157 
        nam_check=False,
157 
        name_check=False,
158 158 
        pnode=rapi.GetNodes()[0],       #TODO: verify if this is necessary
159 159 
        dry_run=dry_run,
160 160 
        beparams=dict(auto_balance=True, vcpus=flavor.cpu, memory=flavor.ram))

Also available in: Unified diff