Merge "Add support for service plugins to the migration framework"

neutron/db/migration/__init__.py

@@ -17,8 +17,8 @@
 # @author: Mark McClain, DreamHost
 
 
-def should_run(active_plugin, migrate_plugins):
+def should_run(active_plugins, migrate_plugins):
     if '*' in migrate_plugins:
         return True
     else:
-        return active_plugin in migrate_plugins
+        return set(active_plugins) & set(migrate_plugins)

neutron/db/migration/alembic_migrations/env.py

@@ -37,6 +37,8 @@
 fileConfig(config.config_file_name)
 
 plugin_class_path = neutron_config.core_plugin
+active_plugins = [plugin_class_path]
+active_plugins += neutron_config.service_plugins
 
 plugin_klass = importutils.import_class(plugin_class_path)
 
@@ -59,7 +61,7 @@ def run_migrations_offline():
     context.configure(url=neutron_config.database.connection)
 
     with context.begin_transaction():
-        context.run_migrations(active_plugin=plugin_class_path,
+        context.run_migrations(active_plugins=active_plugins,
                                options=build_options())
 
 
@@ -82,7 +84,7 @@ def run_migrations_online():
 
     try:
         with context.begin_transaction():
-            context.run_migrations(active_plugin=plugin_class_path,
+            context.run_migrations(active_plugins=active_plugins,
                                    options=build_options())
     finally:
         connection.close()

neutron/db/migration/alembic_migrations/script.py.mako

@@ -40,15 +40,15 @@ ${imports if imports else ""}
 from neutron.db import migration
 
 
-def upgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     ${upgrades if upgrades else "pass"}
 
 
-def downgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     ${downgrades if downgrades else "pass"}

neutron/db/migration/alembic_migrations/versions/1149d7de0cfa_port_security.py

@@ -39,8 +39,8 @@
 from neutron.db import migration
 
 
-def upgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     ### commands auto generated by Alembic - please adjust! ###
@@ -71,8 +71,8 @@ def upgrade(active_plugin=None, options=None):
                "False as port_security_enabled from ports")
 
 
-def downgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     ### commands auto generated by Alembic - please adjust! ###

neutron/db/migration/alembic_migrations/versions/11c6e18605c8_pool_monitor_status_.py

@@ -29,20 +29,18 @@
 
 # Change to ['*'] if this migration applies to all plugins
 
-migration_for_plugins = ['*']
+migration_for_plugins = [
+    'neutron.services.loadbalancer.plugin.LoadBalancerPlugin',
+]
 
 from alembic import op
 import sqlalchemy as sa
 
 from neutron.db import migration
 
 
-# Change to ['*'] if this migration applies to all plugins
-migration_for_plugins = ['*']
-
-
-def upgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     op.add_column('poolmonitorassociations', sa.Column('status',
@@ -55,8 +53,8 @@ def upgrade(active_plugin=None, options=None):
     op.execute("UPDATE poolmonitorassociations SET status='ACTIVE'")
 
 
-def downgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     op.drop_column('poolmonitorassociations', 'status')

neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py

@@ -46,8 +46,8 @@
 from neutron.db import migration
 
 
-def upgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     op.add_column('routers', sa.Column('enable_snat', sa.Boolean(),
@@ -56,8 +56,8 @@ def upgrade(active_plugin=None, options=None):
     op.execute("UPDATE routers SET enable_snat=True")
 
 
-def downgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     op.drop_column('routers', 'enable_snat')

neutron/db/migration/alembic_migrations/versions/1341ed32cc1e_nvp_netbinding_update.py

@@ -40,8 +40,8 @@
 from neutron.db import migration
 
 
-def upgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
     op.alter_column('nvp_network_bindings', 'tz_uuid',
                     name='phy_uuid',
@@ -53,8 +53,8 @@ def upgrade(active_plugin=None, options=None):
                     existing_nullable=True)
 
 
-def downgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
     op.alter_column('nvp_network_bindings', 'phy_uuid',
                     name='tz_uuid',

neutron/db/migration/alembic_migrations/versions/13de305df56e_add_nec_pf_name.py

@@ -40,16 +40,16 @@
 from neutron.db import migration
 
 
-def upgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     op.add_column('packetfilters',
                   sa.Column('name', sa.String(length=255), nullable=True))
 
 
-def downgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     op.drop_column('packetfilters', 'name')

neutron/db/migration/alembic_migrations/versions/176a85fc7d79_add_portbindings_db.py

@@ -41,8 +41,8 @@
 from neutron.db import migration
 
 
-def upgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     op.create_table(
@@ -54,7 +54,7 @@ def upgrade(active_plugin=None, options=None):
     )
 
 
-def downgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
     op.drop_table('portbindingports')

neutron/db/migration/alembic_migrations/versions/1b693c095aa3_quota_ext_db_grizzly.py

@@ -39,8 +39,8 @@
 from neutron.db import migration
 
 
-def upgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     ### commands auto generated by Alembic - please adjust! ###
@@ -55,8 +55,8 @@ def upgrade(active_plugin=None, options=None):
     ### end Alembic commands ###
 
 
-def downgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     ### commands auto generated by Alembic - please adjust! ###

neutron/db/migration/alembic_migrations/versions/1c33fa3cd1a1_extra_route_config.py

@@ -43,8 +43,8 @@
 from neutron.db import migration
 
 
-def upgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     op.rename_table(
@@ -63,8 +63,8 @@ def upgrade(active_plugin=None, options=None):
     )
 
 
-def downgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     op.rename_table(

neutron/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py

@@ -39,8 +39,8 @@
 from neutron.db import migration
 
 
-def upgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     op.create_table(
@@ -57,8 +57,8 @@ def upgrade(active_plugin=None, options=None):
         sa.PrimaryKeyConstraint('network_id'))
 
 
-def downgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     op.drop_table('nvp_network_bindings')

neutron/db/migration/alembic_migrations/versions/2032abe8edac_lbaas_add_status_des.py

@@ -29,7 +29,9 @@
 
 # Change to ['*'] if this migration applies to all plugins
 
-migration_for_plugins = ['*']
+migration_for_plugins = [
+    'neutron.services.loadbalancer.plugin.LoadBalancerPlugin',
+]
 
 from alembic import op
 import sqlalchemy as sa
@@ -39,16 +41,16 @@
 ENTITIES = ['vips', 'pools', 'members', 'healthmonitors']
 
 
-def upgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     for entity in ENTITIES:
         op.add_column(entity, sa.Column('status_description', sa.String(255)))
 
 
-def downgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     for entity in ENTITIES:

neutron/db/migration/alembic_migrations/versions/20ae61555e95_ml2_gre_type_driver.py

@@ -39,8 +39,8 @@
 from neutron.db import migration
 
 
-def upgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     op.create_table(
@@ -58,8 +58,8 @@ def upgrade(active_plugin=None, options=None):
     )
 
 
-def downgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     op.drop_table('ml2_gre_allocations')

neutron/db/migration/alembic_migrations/versions/263772d65691_cisco_db_cleanup_2.py

@@ -39,8 +39,8 @@
 from neutron.db import migration
 
 
-def upgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     if 'credentials' in sa.MetaData().tables:
@@ -53,8 +53,8 @@ def upgrade(active_plugin=None, options=None):
     op.drop_table('cisco_vlan_ids')
 
 
-def downgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     op.create_table(

neutron/db/migration/alembic_migrations/versions/2a6d0b51f4bb_cisco_plugin_cleanup.py

@@ -39,8 +39,8 @@
 from neutron.db import migration
 
 
-def upgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     op.drop_table(u'port_bindings')
@@ -49,8 +49,8 @@ def upgrade(active_plugin=None, options=None):
     op.drop_table(u'portprofile_bindings')
 
 
-def downgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
     op.create_table(

neutron/db/migration/alembic_migrations/versions/2c4af419145b_l3_support.py

@@ -40,13 +40,13 @@
 from neutron.db.migration.alembic_migrations import common_ext_ops
 
 
-def upgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
     common_ext_ops.upgrade_l3()
 
 
-def downgrade(active_plugin=None, options=None):
-    if not migration.should_run(active_plugin, migration_for_plugins):
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
         return
     common_ext_ops.downgrade_l3()