← Back to branch summary

~rackspace-ozone/rackspace-nova/development

« back to all changes in this revision

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

  • Committer: paul at openstack
  • Date: 2011-09-26 18:57:03 UTC
  • mfrom: (1098.1.519 nova)
  • Revision ID: paul@openstack.org-20110926185703-ad3bthrj309itbrw
merging Diablo

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/db/sqlalchemy/models.py
232
232
    uuid = Column(String(36))
233
233
 
234
234
    root_device_name = Column(String(255))
 
235
    default_local_device = Column(String(255), nullable=True)
 
236
    default_swap_device = Column(String(255), nullable=True)
235
237
    config_drive = Column(String(255))
236
238
 
237
239
    # User editable field meant to represent what ip should be used
239
241
    access_ip_v4 = Column(String(255))
240
242
    access_ip_v6 = Column(String(255))
241
243
 
 
244
    progress = Column(Integer)
 
245
 
242
246
 
243
247
class VirtualStorageArray(BASE, NovaBase):
244
248
    """
640
644
    address = Column(String(255), unique=True)
641
645
    network_id = Column(Integer, ForeignKey('networks.id'))
642
646
    network = relationship(Network, backref=backref('virtual_interfaces'))
643
 
 
644
 
    # TODO(tr3buchet): cut the cord, removed foreign key and backrefs
645
 
    instance_id = Column(Integer, ForeignKey('instances.id'), nullable=False)
646
 
    instance = relationship(Instance, backref=backref('virtual_interfaces'))
 
647
    instance_id = Column(Integer, nullable=False)
647
648
 
648
649
    uuid = Column(String(36))
649
650
 
838
839
    """Represents a child zone of this zone."""
839
840
    __tablename__ = 'zones'
840
841
    id = Column(Integer, primary_key=True)
 
842
    name = Column(String(255))
841
843
    api_url = Column(String(255))
842
844
    username = Column(String(255))
843
845
    password = Column(String(255))