diff options
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/db/sqlalchemy/migrate_repo/versions/001_austin.py (renamed from nova/db/sqlalchemy/migrate_repo/versions/001_first_database.py) | 0 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/migrate_repo/versions/002_bexar.py (renamed from nova/db/sqlalchemy/migrate_repo/versions/002_update_to_trunk.py) | 98 |
2 files changed, 81 insertions, 17 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/001_first_database.py b/nova/db/sqlalchemy/migrate_repo/versions/001_austin.py index 8a60bd890..8a60bd890 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/001_first_database.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/001_austin.py diff --git a/nova/db/sqlalchemy/migrate_repo/versions/002_update_to_trunk.py b/nova/db/sqlalchemy/migrate_repo/versions/002_bexar.py index f9468f005..e93efab58 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/002_update_to_trunk.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/002_bexar.py @@ -25,46 +25,102 @@ from nova import log as logging meta = MetaData() -# Just for the ForeignKey to succeed +# Just for the ForeignKey and column creation to succeed, these are not the +# actual definitions of instances or services. instances = Table('instances', meta, Column('id', Integer(), primary_key=True, nullable=False), ) +services = Table('services', meta, + Column('id', Integer(), primary_key=True, nullable=False), + ) + # # New Tables # -instance_actions = Table('instance_actions', meta, +certificates = Table('certificates', meta, Column('created_at', DateTime(timezone=False)), Column('updated_at', DateTime(timezone=False)), Column('deleted_at', DateTime(timezone=False)), Column('deleted', Boolean(create_constraint=True, name=None)), Column('id', Integer(), primary_key=True, nullable=False), - Column('instance_id', - Integer(), - ForeignKey('instances.id')), - Column('action', + Column('user_id', + String(length=None, convert_unicode=False, assert_unicode=None, + unicode_error=None, _warn_on_bytestring=False)), + Column('project_id', + String(length=None, convert_unicode=False, assert_unicode=None, + unicode_error=None, _warn_on_bytestring=False)), + Column('file_name', String(length=None, convert_unicode=False, assert_unicode=None, unicode_error=None, _warn_on_bytestring=False)), - Column('error', - Text(length=None, convert_unicode=False, assert_unicode=None, - unicode_error=None, _warn_on_bytestring=False)), ) -certificates = Table('certificates', meta, + +consoles = Table('consoles', meta, Column('created_at', DateTime(timezone=False)), Column('updated_at', DateTime(timezone=False)), Column('deleted_at', DateTime(timezone=False)), Column('deleted', Boolean(create_constraint=True, name=None)), Column('id', Integer(), primary_key=True, nullable=False), - Column('user_id', + Column('instance_name', String(length=None, convert_unicode=False, assert_unicode=None, unicode_error=None, _warn_on_bytestring=False)), - Column('project_id', + Column('instance_id', Integer()), + Column('password', String(length=None, convert_unicode=False, assert_unicode=None, unicode_error=None, _warn_on_bytestring=False)), - Column('file_name', + Column('port', Integer(), nullable=True), + Column('pool_id', + Integer(), + ForeignKey('console_pools.id')), + ) + + +console_pools = Table('console_pools', meta, + Column('created_at', DateTime(timezone=False)), + Column('updated_at', DateTime(timezone=False)), + Column('deleted_at', DateTime(timezone=False)), + Column('deleted', Boolean(create_constraint=True, name=None)), + Column('id', Integer(), primary_key=True, nullable=False), + Column('address', + String(length=None, convert_unicode=False, assert_unicode=None, + unicode_error=None, _warn_on_bytestring=False)), + Column('username', + String(length=None, convert_unicode=False, assert_unicode=None, + unicode_error=None, _warn_on_bytestring=False)), + Column('password', + String(length=None, convert_unicode=False, assert_unicode=None, + unicode_error=None, _warn_on_bytestring=False)), + Column('console_type', + String(length=None, convert_unicode=False, assert_unicode=None, + unicode_error=None, _warn_on_bytestring=False)), + Column('public_hostname', + String(length=None, convert_unicode=False, assert_unicode=None, + unicode_error=None, _warn_on_bytestring=False)), + Column('host', + String(length=None, convert_unicode=False, assert_unicode=None, + unicode_error=None, _warn_on_bytestring=False)), + Column('compute_host', + String(length=None, convert_unicode=False, assert_unicode=None, + unicode_error=None, _warn_on_bytestring=False)), + ) + + +instance_actions = Table('instance_actions', meta, + Column('created_at', DateTime(timezone=False)), + Column('updated_at', DateTime(timezone=False)), + Column('deleted_at', DateTime(timezone=False)), + Column('deleted', Boolean(create_constraint=True, name=None)), + Column('id', Integer(), primary_key=True, nullable=False), + Column('instance_id', + Integer(), + ForeignKey('instances.id')), + Column('action', String(length=None, convert_unicode=False, assert_unicode=None, unicode_error=None, _warn_on_bytestring=False)), + Column('error', + Text(length=None, convert_unicode=False, assert_unicode=None, + unicode_error=None, _warn_on_bytestring=False)), ) @@ -101,14 +157,20 @@ instances_availability_zone = Column( instances_locked = Column('locked', - Boolean(create_constraint=True, name=None)) + Boolean(create_constraint=True, name=None)) + + +services_availability_zone = Column( + 'availability_zone', + String(length=None, convert_unicode=False, assert_unicode=None, + unicode_error=None, _warn_on_bytestring=False)) def upgrade(migrate_engine): # Upgrade operations go here. Don't create your own engine; # bind migrate_engine to your metadata meta.bind = migrate_engine - for table in (instance_actions, certificates): + for table in (certificates, consoles, console_pools, instance_actions): try: table.create() except Exception: @@ -121,5 +183,7 @@ def upgrade(migrate_engine): assert_unicode=None, unicode_error=None, _warn_on_bytestring=False)) - instances_availability_zone.create(table=instances) - instances_locked.create(table=instances) + + instances.create_column(instances_availability_zone) + instances.create_column(instances_locked) + services.create_column(services_availability_zone) |