Revision 4e6f9904 api/handlers.py

b/api/handlers.py
106 106 
            server = {'status': server.rsapi_state,
107 107 
                     'flavorRef': server.flavor.id,
108 108 
                     'name': server.name,
109 
                     'description': server.description,
110 109 
                     'id': server.id,
111 110 
                     'imageRef': server.sourceimage.id,
112 111 
                     'created': server.created,
......
149 148 
                                         'flavorRef': server.flavor.id,
150 149 
                                         'name': server.name,
151 150 
                                         'id': server.id,
152 
                                         'description': server.description,
153 151 
                                         'created': server.created,
154 152 
                                         'updated': server.updated,
155 153 
                                         'imageRef': server.sourceimage.id,
......
254 252 
                "progress" : 0,
255 253 
                "status" : 'BUILD',
256 254 
                "adminPass" : self.random_password(),
257 
                "metadata" : {"My Server Name" : vm.description},
255 
                "metadata" : {"My Server Name" : vm.name},
258 256 
                "addresses" : {
259 257 
                    "public" : [  ],
260 258 
                    "private" : [  ],
......
639 637 
                        'id': image.id,
640 638 
                        'name': image.name,
641 639 
                        'updated': image.updated.isoformat(),
642 
                        'description': image.description,
643 640 
                        'status': image.state,
644 641 
                        'progress': image.state == 'ACTIVE' and 100 or 0,
645 642 
                        'size': image.size,
646 
                        'serverId': image.sourcevm and image.sourcevm.id or ""
643 
                        'serverId': image.sourcevm and image.sourcevm.id or "",
644 
                        #'metadata':[{'meta': { 'key': {metadata.meta_key: metadata.meta_value}}} for metadata in image.imagemetadata_set.all()]
645 
                        'metadata':{'meta': { 'key': {'description': image.description}}},
647 646 
                       } for image in images]
648 647 
            # Images info is stored in the DB. Ganeti is not aware of this
649 648 
            if id == "detail":
......
660 659 
                    'status': image.state,
661 660 
                    'progress': image.state == 'ACTIVE' and 100 or 0,
662 661 
                    'size': image.size,
663 
                    'serverId': image.sourcevm and image.sourcevm.id or ""
662 
                    'serverId': image.sourcevm and image.sourcevm.id or "",
663 
                    #'metadata':[{'meta': { 'key': {metadata.meta_key: metadata.meta_value}}} for metadata in image.imagemetadata_set.all()]
664 
                    'metadata':{'meta': { 'key': {'description': image.description}}},
664 665 
                   } }
665 666 
        except Image.DoesNotExist:
666 667 
                    raise fault.itemNotFound

Also available in: Unified diff