Merge "Drop redundant index on ports table"

neutron/db/migration/alembic_migrations/versions/2023.2/expand/b1199a3adbef_de_duplicate_indices_for_ports.py

@@ -0,0 +1,54 @@
+# Copyright 2023 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.
+#
+
+from alembic import op
+import sqlalchemy as sa
+
+"""de-duplicate indices for ports
+
+Revision ID: b1199a3adbef
+Revises: 682c319773d7
+Create Date: 2023-06-07 14:31:24.476704
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'b1199a3adbef'
+down_revision = '0aefee21cd87'
+
+
+TABLE = 'ports'
+
+
+def upgrade():
+    inspector = sa.inspect(op.get_bind())
+    indexes = inspector.get_indexes("ports")
+
+    for index in indexes:
+        if index['unique'] is False:
+            if index['column_names'] == ['network_id', 'mac_address']:
+                op.drop_index(index['name'], table_name=TABLE)
+
+
+def expand_drop_exceptions():
+    """Drop the redundant index on network_id+mac_address in ports
+
+    This migration will remove the explicit index on the columns.
+    A unique contraint already maintains an index, this second index is
+    redundant.
+    """
+    return {
+        sa.Index: [TABLE]
+    }

neutron/db/migration/alembic_migrations/versions/EXPAND_HEAD

@@ -1 +1 @@
-0aefee21cd87
+b1199a3adbef

neutron/db/models_v2.py

@@ -147,8 +147,6 @@ class Port(standard_attr.HasStandardAttributes, model_base.BASEV2,
     ip_allocation = sa.Column(sa.String(16))
 
     __table_args__ = (
-        sa.Index(
-            'ix_ports_network_id_mac_address', 'network_id', 'mac_address'),
         sa.Index(
             'ix_ports_network_id_device_owner', 'network_id', 'device_owner'),
         sa.Index('ix_ports_device_id', 'device_id'),