diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2010-09-28 00:23:49 -0500 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2010-09-28 00:23:49 -0500 |
| commit | 2f72b2a9fc9fee508b16c0b96285124279ef89ca (patch) | |
| tree | add8a43cc32b17bcb1e46d842f04565f75d71eda /nova/db | |
| parent | f32e7054052f9daca7dcb92b0fb0ff0525c073be (diff) | |
| download | nova-2f72b2a9fc9fee508b16c0b96285124279ef89ca.tar.gz nova-2f72b2a9fc9fee508b16c0b96285124279ef89ca.tar.xz nova-2f72b2a9fc9fee508b16c0b96285124279ef89ca.zip | |
More cleanup, backup_schedules controller, server details and the beginnings of the servers action route
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index f6ba7953f..47c505f25 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -209,12 +209,14 @@ class Instance(BASE, NovaBase): @property def name(self): - return self.str_id + return self.server_name or self.str_id image_id = Column(String(255)) kernel_id = Column(String(255)) ramdisk_id = Column(String(255)) + server_name = Column(String(255)) + # image_id = Column(Integer, ForeignKey('images.id'), nullable=True) # kernel_id = Column(Integer, ForeignKey('images.id'), nullable=True) # ramdisk_id = Column(Integer, ForeignKey('images.id'), nullable=True) |