← Back to branch summary

~cbehrens/nova/servers-search

« back to all changes in this revision

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

  • Committer: Chris Behrens
  • Date: 2011-08-04 21:58:42 UTC
  • mfrom: (1250.1.127 nova)
  • Revision ID: cbehrens@codestud.com-20110804215842-nfykqar8k74l33tj
merged trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/db/sqlalchemy/models.py
203
203
    hostname = Column(String(255))
204
204
    host = Column(String(255))  # , ForeignKey('hosts.id'))
205
205
 
206
 
    # aka flavor_id
 
206
    # *not* flavor_id
207
207
    instance_type_id = Column(Integer)
208
208
 
209
209
    user_data = Column(Text)
512
512
    source_compute = Column(String(255))
513
513
    dest_compute = Column(String(255))
514
514
    dest_host = Column(String(255))
515
 
    old_flavor_id = Column(Integer())
516
 
    new_flavor_id = Column(Integer())
 
515
    old_instance_type_id = Column(Integer())
 
516
    new_instance_type_id = Column(Integer())
517
517
    instance_uuid = Column(String(255), ForeignKey('instances.uuid'),
518
518
            nullable=True)
519
519
    #TODO(_cerberus_): enum