x/vmware-nsx
Code Issues Proposed changes

Merge "DB migration upgrade/downgrade not employed for brocade-plugin"

Browse Source
This commit is contained in:
Jenkins 2013-10-12 01:47:04 +00:00 committed by Gerrit Code Review
commit 9cd32ec60e
1 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
neutron/db/migration/alembic_migrations/versions/folsom_initial.py
View File

@ -1,4 +1,4 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4 # vim: tabstop=4 shiftwidth=4 softtabstop=4l359
# #
# Copyright 2012 New Dream Network, LLC (DreamHost) # Copyright 2012 New Dream Network, LLC (DreamHost)
# #
@ -26,6 +26,7 @@ Create Date: 2012-12-03 09:14:50.579765
PLUGINS = { PLUGINS = {
'bigswitch': 'neutron.plugins.bigswitch.plugin.NeutronRestProxyV2', 'bigswitch': 'neutron.plugins.bigswitch.plugin.NeutronRestProxyV2',
'brocade': 'neutron.plugins.brocade.NeutronPlugin.BrocadePluginV2',
'cisco': 'neutron.plugins.cisco.network_plugin.PluginV2', 'cisco': 'neutron.plugins.cisco.network_plugin.PluginV2',
'lbr': 'neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2', 'lbr': 'neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2',
'meta': 'neutron.plugins.metaplugin.meta_neutron_plugin.MetaPluginV2', 'meta': 'neutron.plugins.metaplugin.meta_neutron_plugin.MetaPluginV2',
@ -45,6 +46,7 @@ L3_CAPABLE = [
PLUGINS['nec'], PLUGINS['nec'],
PLUGINS['ovs'], PLUGINS['ovs'],
PLUGINS['ryu'], PLUGINS['ryu'],
PLUGINS['brocade'],
PLUGINS['plumgrid'], PLUGINS['plumgrid'],
] ]
@ -91,6 +93,10 @@ def upgrade(active_plugins=None, options=None):
upgrade_nec() upgrade_nec()
elif PLUGINS['ryu'] in active_plugins: elif PLUGINS['ryu'] in active_plugins:
upgrade_ryu() upgrade_ryu()
elif PLUGINS['brocade'] in active_plugins:
upgrade_brocade()
# Brocade plugin imports linux bridge models too
upgrade_linuxbridge()
def upgrade_base(): def upgrade_base():
@ -351,6 +357,26 @@ def upgrade_ryu():
) )
def upgrade_brocade():
op.create_table(
'brocadenetworks',
sa.Column('id', sa.Integer(), autoincrement=False, nullable=False),
sa.Column('vlan', sa.String(10)),
sa.PrimaryKeyConstraint('id')
)
op.create_table(
'brocadeports',
sa.Column('port_id', sa.String(36), nullable=False),
sa.Column('network_id', sa.String(36)),
sa.Column('admin_state_up', sa.Boolean()),
sa.Column('physical_interface', sa.String(36)),
sa.Column('vlan_id', sa.String(10)),
sa.Column('tenant_id', sa.String(36)),
sa.PrimaryKeyConstraint('port_id')
)
def upgrade_cisco(): def upgrade_cisco():
op.create_table( op.create_table(
'cisco_vlan_ids', 'cisco_vlan_ids',
@ -446,6 +472,10 @@ def downgrade(active_plugins=None, options=None):
downgrade_nec() downgrade_nec()
elif PLUGINS['ryu'] in active_plugins: elif PLUGINS['ryu'] in active_plugins:
downgrade_ryu() downgrade_ryu()
elif PLUGINS['brocade'] in active_plugins:
# Brocade plugin imports linux bridge models too
downgrade_brocade()
downgrade_linuxbridge()
if set(active_plugins) & set(FOLSOM_QUOTA): if set(active_plugins) & set(FOLSOM_QUOTA):
common_ext_ops.downgrade_quota(options) common_ext_ops.downgrade_quota(options)
@ -502,6 +532,11 @@ def downgrade_ryu():
op.drop_table('ofp_server') op.drop_table('ofp_server')
def downgrade_brocade():
op.drop_table('brocadenetworks')
op.drop_table('brocadeports')
def downgrade_cisco(): def downgrade_cisco():
op.drop_tables( op.drop_tables(
'nexusport_bindings', 'nexusport_bindings',