openstack/neutron
Code Issues Proposed changes

Merge "Do not explicitly set mysql_engine"

Browse Source
This commit is contained in:
Jenkins 2014-08-25 22:12:40 +00:00 committed by Gerrit Code Review
commit 8179645492
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/db/migration/alembic_migrations/versions/19180cf98af6_nsx_gw_devices.py
View File

@ -51,8 +51,7 @@ def upgrade(active_plugins=None, options=None):
sa.Column('interface_name', sa.String(length=64), nullable=True),
sa.ForeignKeyConstraint(['network_gateway_id'], ['networkgateways.id'],
ondelete='CASCADE'),
sa.PrimaryKeyConstraint('id', 'network_gateway_id', 'interface_name'),
mysql_engine='InnoDB')
sa.PrimaryKeyConstraint('id', 'network_gateway_id', 'interface_name'))
# Copy data from networkgatewaydevices into networkgatewaydevicereference
op.execute("INSERT INTO networkgatewaydevicereferences SELECT "
"id, network_gateway_id, interface_name FROM "
@ -68,8 +67,7 @@ def upgrade(active_plugins=None, options=None):
sa.Column('connector_type', sa.String(length=10), nullable=True),
sa.Column('connector_ip', sa.String(length=64), nullable=True),
sa.Column('status', sa.String(length=16), nullable=True),
sa.PrimaryKeyConstraint('id'),
mysql_engine='InnoDB')
sa.PrimaryKeyConstraint('id'))
# Create a networkgatewaydevice for each existing reference.
# For existing references nsx_id == neutron_id
# Do not fill conenctor info as they would be unknown
@ -93,8 +91,7 @@ def downgrade(active_plugins=None, options=None):
sa.Column('interface_name', sa.String(length=64), nullable=True),
sa.ForeignKeyConstraint(['network_gateway_id'], ['networkgateways.id'],
ondelete='CASCADE'),
sa.PrimaryKeyConstraint('id'),
mysql_engine='InnoDB')
sa.PrimaryKeyConstraint('id'))
# Copy from networkgatewaydevicereferences to networkgatewaydevices
op.execute("INSERT INTO networkgatewaydevices SELECT "
"id, network_gateway_id, interface_name FROM "

4
neutron/db/migration/alembic_migrations/versions/3c6e57a23db4_add_multiprovider.py
View File

@ -64,9 +64,7 @@ def upgrade(active_plugins=None, options=None):
sa.Column('network_id', sa.String(length=36), nullable=False),
sa.ForeignKeyConstraint(['network_id'], ['networks.id'],
ondelete='CASCADE'),
sa.PrimaryKeyConstraint('network_id'),
mysql_engine='InnoDB'
)
sa.PrimaryKeyConstraint('network_id'))
op.create_table('rename_nvp_network_bindings',
sa.Column('network_id', sa.String(length=36),
primary_key=True),

4
neutron/db/migration/alembic_migrations/versions/4a666eb208c2_service_router.py
View File

@ -53,9 +53,7 @@ def upgrade(active_plugins=None, options=None):
sa.Column('router_id', sa.String(length=36), nullable=False),
sa.Column('edge_id', sa.String(length=16), nullable=True),
sa.Column('lswitch_id', sa.String(length=36), nullable=False),
sa.PrimaryKeyConstraint('router_id'),
mysql_engine='InnoDB'
)
sa.PrimaryKeyConstraint('router_id'))
op.add_column(
u'nsxrouterextattributess',
sa.Column('service_router', sa.Boolean(), nullable=False))