Fix broken database migration for Cisco plugin

Remove migration for a table that was never used.
Correct table drop order due to foreignkey dependency.

Closes bug: #1210219

Change-Id: I38bcedf7a84967bea2c1679a6a6ab51a9451b33a

diff --git a/neutron/db/migration/alembic_migrations/versions/2a6d0b51f4bb_cisco_plugin_cleanup.py b/neutron/db/migration/alembic_migrations/versions/2a6d0b51f4bb_cisco_plugin_cleanup.py
index efc84e97db761270632c542e91b1af8fa950df4c..9a32e86b4b430666834b120871bde3eee486bdab 100644 (file)
--- a/neutron/db/migration/alembic_migrations/versions/2a6d0b51f4bb_cisco_plugin_cleanup.py
+++ b/neutron/db/migration/alembic_migrations/versions/2a6d0b51f4bb_cisco_plugin_cleanup.py
@@ -43,10 +43,9 @@ def upgrade(active_plugins=None, options=None):
     if not migration.should_run(active_plugins, migration_for_plugins):
         return
 
-    op.drop_table(u'port_bindings')
-    op.drop_table(u'services_bindings')
-    op.drop_table(u'portprofiles')
     op.drop_table(u'portprofile_bindings')
+    op.drop_table(u'portprofiles')
+    op.drop_table(u'port_bindings')
 
 
 def downgrade(active_plugins=None, options=None):
@@ -68,16 +67,6 @@ def downgrade(active_plugins=None, options=None):
         sa.Column(u'vif_id', sa.String(255), nullable=True),
         sa.PrimaryKeyConstraint(u'id')
     )
-    op.create_table(
-        u'service_bindings',
-        sa.Column(u'id', sa.Integer(), autoincrement=True,
-                  nullable=False),
-        sa.Column(u'service_id', sa.String(255), nullable=True),
-        sa.Column(u'mnget_id', sa.String(255), nullable=True),
-        sa.Column(u'nbnet_id', sa.String(255), nullable=True),
-        sa.Column(u'sbnet_id', sa.String(255), nullable=True),
-        sa.PrimaryKeyConstraint(u'id')
-    )
     op.create_table(
         u'portprofiles',
         sa.Column(u'uuid', sa.String(255), nullable=False),