openstack
/
neutron
Code Issues Proposed changes

Fix required enum's name in migration 

Enums must contain name parameter for PostgreSQL and need to be
deleted after dropping table.

Closes-Bug: #1243652
Closes-Bug: #1243213

Change-Id: I01d18ff25572bbe9e6a8b8c6ae27f250ab154734
This commit is contained in:
Ann Kamyshnikova 2013-10-23 15:58:35 +04:00
parent 145eb3e15e
commit b9ddfa566c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/db/migration/alembic_migrations/versions/c88b6b5fea3_cisco_n1kv_tables.py
View File

@ -36,6 +36,9 @@ import sqlalchemy as sa
from neutron.db import migration
vlan_type = sa.Enum('vlan', 'vxlan', name='vlan_type')
network_type = sa.Enum('network', 'policy', name='network_type')
def upgrade(active_plugins=None, options=None):
if not migration.should_run(active_plugins, migration_for_plugins):
@ -74,7 +77,7 @@ def upgrade(active_plugins=None, options=None):
'cisco_network_profiles',
sa.Column('id', sa.String(length=36), nullable=False),
sa.Column('name', sa.String(length=255), nullable=True),
sa.Column('segment_type', sa.Enum('vlan', 'vxlan'), nullable=False),
sa.Column('segment_type', vlan_type, nullable=False),
sa.Column('segment_range', sa.String(length=255), nullable=True),
sa.Column('multicast_ip_index', sa.Integer(), autoincrement=False,
nullable=True),
@ -84,7 +87,7 @@ def upgrade(active_plugins=None, options=None):
)
op.create_table(
'cisco_n1kv_profile_bindings',
sa.Column('profile_type', sa.Enum('network', 'policy'), nullable=True),
sa.Column('profile_type', network_type, nullable=True),
sa.Column('tenant_id', sa.String(length=36), nullable=False),
sa.Column('profile_id', sa.String(length=36), nullable=False),
sa.PrimaryKeyConstraint('tenant_id', 'profile_id')
@ -133,7 +136,9 @@ def downgrade(active_plugins=None, options=None):
op.drop_table('cisco_n1kv_vlan_allocations')
op.drop_table('cisco_n1kv_port_bindings')
op.drop_table('cisco_n1kv_profile_bindings')
network_type.drop(op.get_bind(), checkfirst=False)
op.drop_table('cisco_network_profiles')
vlan_type.drop(op.get_bind(), checkfirst=False)
op.drop_table('cisco_n1kv_vxlan_allocations')
op.drop_table('cisco_n1kv_vmnetworks')
op.drop_table('cisco_policy_profiles')