← Back to branch summary

~gundlach/nova/servers_api

« back to all changes in this revision

Viewing changes to nova/db/sqlalchemy/models.py

  • Committer: Tarmac
  • Author(s): Cerberus
  • Date: 2010-09-28 22:48:06 UTC
  • mfrom: (267.2.16 servers_api)
  • Revision ID: hudson@openstack.org-20100928224806-p2t60mo2ff8kk8g5
Implementation of the Rackspace servers API controller

Currently, work remains on the controller, but I'm proposing a merge before the diff becomes completely unwieldy. However, all implemented tests pass. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/db/sqlalchemy/models.py
215
215
    kernel_id = Column(String(255))
216
216
    ramdisk_id = Column(String(255))
217
217
 
 
218
    server_name = Column(String(255))
 
219
 
218
220
#    image_id = Column(Integer, ForeignKey('images.id'), nullable=True)
219
221
#    kernel_id = Column(Integer, ForeignKey('images.id'), nullable=True)
220
222
#    ramdisk_id = Column(Integer, ForeignKey('images.id'), nullable=True)