64f9a58d91
Description: Currently, there is nothing in the schema that ensures segments for a network are returned in the same order they were specified when the network was created, or even in a deterministic order. Solution: We need to add another field named 'segment_index' in 'ml2_network_segment' table containing a numeric position index. With segment_index field we can retrieve the segments in the order in which user created. This patch set also fixes ML2 invalid unit test case in test_create_network_multiprovider(). Closes-Bug: #1224978 Closes-Bug: #1377346 Change-Id: I560c34c6fe1c5425469ccdf9b8b4905c123d496d
120 lines
4.8 KiB
Python
120 lines
4.8 KiB
Python
# Copyright (c) 2013 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# 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.
|
|
|
|
import sqlalchemy as sa
|
|
from sqlalchemy import orm
|
|
|
|
from neutron.db import model_base
|
|
from neutron.db import models_v2
|
|
from neutron.extensions import portbindings
|
|
|
|
BINDING_PROFILE_LEN = 4095
|
|
|
|
|
|
class NetworkSegment(model_base.BASEV2, models_v2.HasId):
|
|
"""Represent persistent state of a network segment.
|
|
|
|
A network segment is a portion of a neutron network with a
|
|
specific physical realization. A neutron network can consist of
|
|
one or more segments.
|
|
"""
|
|
|
|
__tablename__ = 'ml2_network_segments'
|
|
|
|
network_id = sa.Column(sa.String(36),
|
|
sa.ForeignKey('networks.id', ondelete="CASCADE"),
|
|
nullable=False)
|
|
network_type = sa.Column(sa.String(32), nullable=False)
|
|
physical_network = sa.Column(sa.String(64))
|
|
segmentation_id = sa.Column(sa.Integer)
|
|
is_dynamic = sa.Column(sa.Boolean, default=False, nullable=False,
|
|
server_default=sa.sql.false())
|
|
segment_index = sa.Column(sa.Integer, nullable=False, server_default='0')
|
|
|
|
|
|
class PortBinding(model_base.BASEV2):
|
|
"""Represent binding-related state of a port.
|
|
|
|
A port binding stores the port attributes required for the
|
|
portbindings extension, as well as internal ml2 state such as
|
|
which MechanismDriver and which segment are used by the port
|
|
binding.
|
|
"""
|
|
|
|
__tablename__ = 'ml2_port_bindings'
|
|
|
|
port_id = sa.Column(sa.String(36),
|
|
sa.ForeignKey('ports.id', ondelete="CASCADE"),
|
|
primary_key=True)
|
|
host = sa.Column(sa.String(255), nullable=False, default='',
|
|
server_default='')
|
|
vnic_type = sa.Column(sa.String(64), nullable=False,
|
|
default=portbindings.VNIC_NORMAL,
|
|
server_default=portbindings.VNIC_NORMAL)
|
|
profile = sa.Column(sa.String(BINDING_PROFILE_LEN), nullable=False,
|
|
default='', server_default='')
|
|
vif_type = sa.Column(sa.String(64), nullable=False)
|
|
vif_details = sa.Column(sa.String(4095), nullable=False, default='',
|
|
server_default='')
|
|
driver = sa.Column(sa.String(64))
|
|
segment = sa.Column(sa.String(36),
|
|
sa.ForeignKey('ml2_network_segments.id',
|
|
ondelete="SET NULL"))
|
|
|
|
# Add a relationship to the Port model in order to instruct SQLAlchemy to
|
|
# eagerly load port bindings
|
|
port = orm.relationship(
|
|
models_v2.Port,
|
|
backref=orm.backref("port_binding",
|
|
lazy='joined', uselist=False,
|
|
cascade='delete'))
|
|
|
|
|
|
class DVRPortBinding(model_base.BASEV2):
|
|
"""Represent binding-related state of a DVR port.
|
|
|
|
Port binding for all the ports associated to a DVR identified by router_id.
|
|
"""
|
|
|
|
__tablename__ = 'ml2_dvr_port_bindings'
|
|
|
|
port_id = sa.Column(sa.String(36),
|
|
sa.ForeignKey('ports.id', ondelete="CASCADE"),
|
|
primary_key=True)
|
|
host = sa.Column(sa.String(255), nullable=False, primary_key=True)
|
|
router_id = sa.Column(sa.String(36), nullable=True)
|
|
vif_type = sa.Column(sa.String(64), nullable=False)
|
|
vif_details = sa.Column(sa.String(4095), nullable=False, default='',
|
|
server_default='')
|
|
vnic_type = sa.Column(sa.String(64), nullable=False,
|
|
default=portbindings.VNIC_NORMAL,
|
|
server_default=portbindings.VNIC_NORMAL)
|
|
profile = sa.Column(sa.String(BINDING_PROFILE_LEN), nullable=False,
|
|
default='', server_default='')
|
|
cap_port_filter = sa.Column(sa.Boolean, nullable=False)
|
|
driver = sa.Column(sa.String(64))
|
|
segment = sa.Column(sa.String(36),
|
|
sa.ForeignKey('ml2_network_segments.id',
|
|
ondelete="SET NULL"))
|
|
status = sa.Column(sa.String(16), nullable=False)
|
|
|
|
# Add a relationship to the Port model in order to instruct SQLAlchemy to
|
|
# eagerly load port bindings
|
|
port = orm.relationship(
|
|
models_v2.Port,
|
|
backref=orm.backref("dvr_port_binding",
|
|
lazy='joined', uselist=False,
|
|
cascade='delete'))
|