x/vmware-nsx
Code Issues Proposed changes

Merge "Fix NSX migration path"

Browse Source
This commit is contained in:
Jenkins
2014-02-27 22:21:02 +00:00
committed by Gerrit Code Review
parent 6f64e6698d 53944a8e0a
commit a1f6e9c646
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/db/migration/alembic_migrations/versions/1c33fa3cd1a1_extra_route_config.py
View File

@@ -32,9 +32,13 @@ down_revision = '45680af419f9'
migration_for_plugins = [ migration_for_plugins = [
'neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2', 'neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2',
'neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2', 'neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2',
'neutron.plugins.metaplugin.meta_neutron_plugin.MetaPluginV2',
'neutron.plugins.nec.nec_plugin.NECPluginV2', 'neutron.plugins.nec.nec_plugin.NECPluginV2',
'neutron.plugins.nicira.NeutronPlugin.NvpPluginV2',
'neutron.plugins.nicira.NeutronServicePlugin.NvpAdvancedPlugin',
'neutron.plugins.ryu.ryu_neutron_plugin.RyuNeutronPluginV2', 'neutron.plugins.ryu.ryu_neutron_plugin.RyuNeutronPluginV2',
'neutron.plugins.metaplugin.meta_neutron_plugin.MetaPluginV2' 'neutron.plugins.vmware.plugin.NsxPlugin',
'neutron.plugins.vmware.plugin.NsxServicePlugin'
] ]
from alembic import op from alembic import op

7
neutron/db/migration/alembic_migrations/versions/363468ac592c_nvp_network_gw.py
View File

@@ -30,7 +30,10 @@ down_revision = '1c33fa3cd1a1'
# Change to ['*'] if this migration applies to all plugins # Change to ['*'] if this migration applies to all plugins
migration_for_plugins = [ migration_for_plugins = [
'neutron.plugins.nicira.NeutronPluginV2.NvpPluginV2' 'neutron.plugins.nicira.NeutronPlugin.NvpPluginV2',
'neutron.plugins.nicira.NeutronServicePlugin.NvpAdvancedPlugin',
'neutron.plugins.vmware.plugin.NsxPlugin',
'neutron.plugins.vmware.plugin.NsxServicePlugin'
] ]
from alembic import op from alembic import op
@@ -48,7 +51,7 @@ def upgrade(active_plugins=None, options=None):
sa.Column('name', sa.String(length=255), nullable=True), sa.Column('name', sa.String(length=255), nullable=True),
sa.Column('tenant_id', sa.String(length=36), sa.Column('tenant_id', sa.String(length=36),
nullable=True), nullable=True),
sa.Column('shared', sa.Boolean(), nullable=True), sa.Column('default', sa.Boolean(), nullable=True),
sa.PrimaryKeyConstraint('id')) sa.PrimaryKeyConstraint('id'))
op.create_table('networkgatewaydevices', op.create_table('networkgatewaydevices',
sa.Column('id', sa.String(length=36), nullable=False), sa.Column('id', sa.String(length=36), nullable=False),