db: add segment_index to the unique constraint
For multi segments support we have update the unique contraint so `segment_index` will be part of it. Related-Bug: #1791233 Partial-Bug: #1956435 Partial-Bug: #1764738 Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@industrialdiscipline.com> Change-Id: Ic564131dcd7525fc5f24c3282688e3584cd2e2e0
This commit is contained in:
parent
77fc7cd285
commit
eeff5b3c81
@ -119,7 +119,8 @@ def get_duplicate_network_segment_count():
|
|||||||
query = query.group_by(
|
query = query.group_by(
|
||||||
segment.NetworkSegment.network_id,
|
segment.NetworkSegment.network_id,
|
||||||
segment.NetworkSegment.network_type,
|
segment.NetworkSegment.network_type,
|
||||||
segment.NetworkSegment.physical_network
|
segment.NetworkSegment.physical_network,
|
||||||
|
segment.NetworkSegment.segment_index,
|
||||||
)
|
)
|
||||||
query = query.having(func.count() > 1)
|
query = query.having(func.count() > 1)
|
||||||
return query.count()
|
return query.count()
|
||||||
|
@ -1 +1 @@
|
|||||||
5881373af7f5
|
fc153938cdc1
|
||||||
|
@ -0,0 +1,63 @@
|
|||||||
|
# Copyright 2022 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
|
||||||
|
|
||||||
|
from neutron.db import migration
|
||||||
|
|
||||||
|
|
||||||
|
"""update segment networks constraint
|
||||||
|
|
||||||
|
Revision ID: fc153938cdc1
|
||||||
|
Revises: 5881373af7f5
|
||||||
|
Create Date: 2022-11-06 13:04:26.390013
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision = 'fc153938cdc1'
|
||||||
|
down_revision = '5881373af7f5'
|
||||||
|
|
||||||
|
TABLE_NAME = 'networksegments'
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade():
|
||||||
|
inspector = sa.inspect(op.get_bind())
|
||||||
|
|
||||||
|
fk_constraints = inspector.get_foreign_keys(TABLE_NAME)
|
||||||
|
for fk in fk_constraints:
|
||||||
|
if fk['constrained_columns'] == ['network_id']:
|
||||||
|
migration.remove_foreign_keys(TABLE_NAME, [fk])
|
||||||
|
op.drop_constraint(
|
||||||
|
constraint_name=(
|
||||||
|
'uniq_networksegment0network_id0network_type0'
|
||||||
|
'physical_network'),
|
||||||
|
table_name=TABLE_NAME,
|
||||||
|
type_='unique')
|
||||||
|
migration.create_foreign_keys(TABLE_NAME, [fk])
|
||||||
|
op.create_unique_constraint(
|
||||||
|
('uniq_networksegment0network_id0network_type0physnet0sidx'),
|
||||||
|
TABLE_NAME,
|
||||||
|
['network_id', 'network_type', 'physical_network', 'segment_index'])
|
||||||
|
|
||||||
|
|
||||||
|
def expand_drop_exceptions():
|
||||||
|
"""We want to drop the old constraint before to add the new one"""
|
||||||
|
return {
|
||||||
|
sa.Constraint: [
|
||||||
|
'uniq_networksegment0network_id0network_type0physical_network'],
|
||||||
|
sa.ForeignKeyConstraint: ['networksegments_ibfk_1',
|
||||||
|
'ml2_network_segments_network_id_fkey']}
|
@ -58,8 +58,9 @@ class NetworkSegment(standard_attr.HasStandardAttributes,
|
|||||||
network_id,
|
network_id,
|
||||||
network_type,
|
network_type,
|
||||||
physical_network,
|
physical_network,
|
||||||
|
segment_index,
|
||||||
name='uniq_networksegment0network_id0'
|
name='uniq_networksegment0network_id0'
|
||||||
'network_type0physical_network'),
|
'network_type0physnet0sidx'),
|
||||||
model_base.BASEV2.__table_args__
|
model_base.BASEV2.__table_args__
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -2999,7 +2999,7 @@ class TestMultiSegmentNetworks(Ml2PluginV2TestCase):
|
|||||||
res = network_req.get_response(self.api)
|
res = network_req.get_response(self.api)
|
||||||
self.assertEqual(400, res.status_int)
|
self.assertEqual(400, res.status_int)
|
||||||
|
|
||||||
def test_create_network_duplicate_partial_segments_fail(self):
|
def test_create_network_duplicate_partial_segments(self):
|
||||||
data = {'network': {'name': 'net1',
|
data = {'network': {'name': 'net1',
|
||||||
mpnet_apidef.SEGMENTS:
|
mpnet_apidef.SEGMENTS:
|
||||||
[{pnet.NETWORK_TYPE: 'vlan',
|
[{pnet.NETWORK_TYPE: 'vlan',
|
||||||
@ -3011,7 +3011,7 @@ class TestMultiSegmentNetworks(Ml2PluginV2TestCase):
|
|||||||
retry_fixture.setUp()
|
retry_fixture.setUp()
|
||||||
network_req = self.new_create_request('networks', data)
|
network_req = self.new_create_request('networks', data)
|
||||||
res = network_req.get_response(self.api)
|
res = network_req.get_response(self.api)
|
||||||
self.assertEqual(409, res.status_int)
|
self.assertEqual(201, res.status_int)
|
||||||
|
|
||||||
def test_release_network_segments(self):
|
def test_release_network_segments(self):
|
||||||
data = {'network': {'name': 'net1',
|
data = {'network': {'name': 'net1',
|
||||||
|
Loading…
Reference in New Issue
Block a user