openstack/manila
Code Issues Proposed changes

Removed SM models and migrations

Browse Source
This commit is contained in:
Yulia Portnova 2013-09-03 10:40:38 +03:00
parent e1943b3d6a
commit 439855f1e8
2 changed files with 5 additions and 74 deletions
manila/db/sqlalchemy
migrate_repo/versions
001_manila_init.py
models.py

57
manila/db/sqlalchemy/migrate_repo/versions/001_manila_init.py

@ -62,49 +62,6 @@ def upgrade(migrate_engine):
mysql_engine='InnoDB'
)
sm_flavors = Table(
'sm_flavors', meta,
Column('created_at', DateTime),
Column('updated_at', DateTime),
Column('deleted_at', DateTime),
Column('deleted', Boolean),
Column('id', Integer, primary_key=True, nullable=False),
Column('label', String(length=255)),
Column('description', String(length=255)),
mysql_engine='InnoDB'
)
sm_backend_config = Table(
'sm_backend_config', meta,
Column('created_at', DateTime),
Column('updated_at', DateTime),
Column('deleted_at', DateTime),
Column('deleted', Boolean),
Column('id', Integer, primary_key=True, nullable=False),
Column('flavor_id', Integer, ForeignKey('sm_flavors.id'),
nullable=False),
Column('sr_uuid', String(length=255)),
Column('sr_type', String(length=255)),
Column('config_params', String(length=2047)),
mysql_engine='InnoDB'
)
sm_volume = Table(
'sm_volume', meta,
Column('created_at', DateTime),
Column('updated_at', DateTime),
Column('deleted_at', DateTime),
Column('deleted', Boolean),
Column('id', String(length=36),
ForeignKey('volumes.id'),
primary_key=True,
nullable=False),
Column('backend_id', Integer, ForeignKey('sm_backend_config.id'),
nullable=False),
Column('vdi_uuid', String(length=255)),
mysql_engine='InnoDB'
)
quotas = Table(
'quotas', meta,
Column('id', Integer, primary_key=True, nullable=False),
@ -120,12 +77,9 @@ def upgrade(migrate_engine):
# create all tables
# Take care on create order for those with FK dependencies
tables = [sm_flavors,
sm_backend_config,
migrations,
tables = [migrations,
quotas,
services,
sm_volume]
services]
for table in tables:
try:
@ -136,13 +90,10 @@ def upgrade(migrate_engine):
raise
if migrate_engine.name == "mysql":
tables = ["sm_flavors",
"sm_backend_config",
"migrate_version",
tables = ["migrate_version",
"migrations",
"quotas",
"services",
"sm_volume"]
"services"]
sql = "SET foreign_key_checks = 0;"
for table in tables:

22
manila/db/sqlalchemy/models.py

@ -210,24 +210,6 @@ class Migration(BASE, CinderBase):
status = Column(String(255))
class SMFlavors(BASE, CinderBase):
"""Represents a flavor for SM volumes."""
__tablename__ = 'sm_flavors'
id = Column(Integer(), primary_key=True)
label = Column(String(255))
description = Column(String(255))
class SMBackendConf(BASE, CinderBase):
"""Represents the connection to the backend for SM."""
__tablename__ = 'sm_backend_config'
id = Column(Integer(), primary_key=True)
flavor_id = Column(Integer, ForeignKey('sm_flavors.id'), nullable=False)
sr_uuid = Column(String(255))
sr_type = Column(String(255))
config_params = Column(String(2047))
class Backup(BASE, CinderBase):
"""Represents a backup of a volume to Swift."""
__tablename__ = 'backups'
@ -340,9 +322,7 @@ def register_models():
Service,
Share,
ShareAccessMapping,
ShareSnapshot,
SMBackendConf,
SMFlavors
ShareSnapshot
)
engine = create_engine(FLAGS.sql_connection, echo=False)
for model in models: