Merge "remove unused db model for openvswitch plugin"

quantum/db/migration/alembic_migrations/versions/32b517556ec9_remove_tunnelip_mode.py

@@ -0,0 +1,58 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+#
+# Copyright 2013 OpenStack Foundation
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+#
+
+"""remove TunnelIP model
+
+Revision ID: 32b517556ec9
+Revises: 176a85fc7d79
+Create Date: 2013-05-23 06:46:57.390838
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '32b517556ec9'
+down_revision = '176a85fc7d79'
+
+# Change to ['*'] if this migration applies to all plugins
+
+migration_for_plugins = [
+    'quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2'
+]
+
+from alembic import op
+import sqlalchemy as sa
+
+
+from quantum.db import migration
+
+
+def upgrade(active_plugin=None, options=None):
+    if not migration.should_run(active_plugin, migration_for_plugins):
+        return
+
+    op.drop_table('ovs_tunnel_ips')
+
+
+def downgrade(active_plugin=None, options=None):
+    if not migration.should_run(active_plugin, migration_for_plugins):
+        return
+
+    op.create_table(
+        'ovs_tunnel_ips',
+        sa.Column('ip_address', sa.String(length=255), nullable=False),
+        sa.PrimaryKeyConstraint('ip_address')
+    )

quantum/plugins/openvswitch/ovs_models_v2.py

@@ -83,19 +83,6 @@ class NetworkBinding(model_base.BASEV2):
                                                   self.segmentation_id)
 
 
-class TunnelIP(model_base.BASEV2):
-    """Represents tunnel endpoint in DB mode."""
-    __tablename__ = 'ovs_tunnel_ips'
-
-    ip_address = Column(String(255), primary_key=True)
-
-    def __init__(self, ip_address):
-        self.ip_address = ip_address
-
-    def __repr__(self):
-        return "<TunnelIP(%s)>" % (self.ip_address)
-
-
 class TunnelEndpoint(model_base.BASEV2):
     """Represents tunnel endpoint in RPC mode."""
     __tablename__ = 'ovs_tunnel_endpoints'