c3fd3feba6
Fixes bug 1127664 Network cannot be created in NEC plugin when OFC network ID is unique inside a tenant. Some OFC implmenetations generate a network ID unique inside a tenant. In this case generated network IDs on can be duplicated in system-wide. To fix it, this changes resource ID on OFC to REST URI to make sure IDs on OFC globally unique. Fixes bug 1120962 Make sure NEC plugin creates shared networks In Quantum resource relationship is not limited inside a tenant. E.g., a non-owner tenant can create a port on a shared network. To deal with it the provider layer should not be aware of tenants each resource belongs to even when it has a kind of tenant concept. This commit changes ofc_manager to pass a parent resource for resource creation and identify a resouce by REST URI used to access OFC resources. It decouples Quantum resource access model from OFC resource models. OFC IDs created before this commit are also looked up. Primary keys of OFC ID mapping tables are changed to quantum_id because most of all accesses to these mapping tables are done by quantum_id. However the current version of alembic does not support changing primary keys, so new OFC ID mapping tables for tenant, network, port and packet filter are created. Dropping the previous mapping tables will be done along with the data migration logic. This commit also changes the following minor issues. - Make sure ID on ProgrammableFlow OpenFlow controller (PFC) is less than 32 chars. The current PFC accepts only 31 chars max as ID and 127 chars as a description string. - Some database accesses created their own session and did not support subtransactions. Make sure to use context.session passed from the API layer. - Removes Unused methods (update_network, update_port) in trema/pfc drivers. Change-Id: Ib4bb830e5f537c789974fa7b77f06eaeacb65333
105 lines
3.5 KiB
Python
105 lines
3.5 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
#
|
|
# Copyright 2012 NEC Corporation. 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.
|
|
# @author: Ryota MIBU
|
|
|
|
import sqlalchemy as sa
|
|
|
|
from quantum.db import model_base
|
|
from quantum.db import models_v2
|
|
|
|
|
|
"""New mapping tables"""
|
|
|
|
|
|
class OFCId(object):
|
|
"""Resource ID on OpenFlow Controller"""
|
|
ofc_id = sa.Column(sa.String(255), unique=True, nullable=False)
|
|
|
|
|
|
class QuantumId(object):
|
|
"""Logical ID on Quantum"""
|
|
quantum_id = sa.Column(sa.String(36), primary_key=True)
|
|
|
|
|
|
class OFCTenantMapping(model_base.BASEV2, QuantumId, OFCId):
|
|
"""Represents a Tenant on OpenFlow Network/Controller."""
|
|
|
|
|
|
class OFCNetworkMapping(model_base.BASEV2, QuantumId, OFCId):
|
|
"""Represents a Network on OpenFlow Network/Controller."""
|
|
|
|
|
|
class OFCPortMapping(model_base.BASEV2, QuantumId, OFCId):
|
|
"""Represents a Port on OpenFlow Network/Controller."""
|
|
|
|
|
|
class OFCFilterMapping(model_base.BASEV2, QuantumId, OFCId):
|
|
"""Represents a Filter on OpenFlow Network/Controller."""
|
|
|
|
|
|
"""Old mapping tables"""
|
|
|
|
|
|
class HasQuantumId(object):
|
|
"""Logical ID on Quantum"""
|
|
quantum_id = sa.Column(sa.String(36), nullable=False)
|
|
|
|
|
|
class OFCTenant(model_base.BASEV2, models_v2.HasId, HasQuantumId):
|
|
"""Represents a Tenant on OpenFlow Network/Controller."""
|
|
|
|
|
|
class OFCNetwork(model_base.BASEV2, models_v2.HasId, HasQuantumId):
|
|
"""Represents a Network on OpenFlow Network/Controller."""
|
|
|
|
|
|
class OFCPort(model_base.BASEV2, models_v2.HasId, HasQuantumId):
|
|
"""Represents a Port on OpenFlow Network/Controller."""
|
|
|
|
|
|
class OFCFilter(model_base.BASEV2, models_v2.HasId, HasQuantumId):
|
|
"""Represents a Filter on OpenFlow Network/Controller."""
|
|
|
|
|
|
class PortInfo(model_base.BASEV2, models_v2.HasId):
|
|
"""Represents a Virtual Interface."""
|
|
datapath_id = sa.Column(sa.String(36), nullable=False)
|
|
port_no = sa.Column(sa.Integer, nullable=False)
|
|
vlan_id = sa.Column(sa.Integer, nullable=False)
|
|
mac = sa.Column(sa.String(32), nullable=False)
|
|
|
|
|
|
class PacketFilter(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant):
|
|
"""Represents a packet filter"""
|
|
network_id = sa.Column(sa.String(36),
|
|
sa.ForeignKey('networks.id', ondelete="CASCADE"),
|
|
nullable=False)
|
|
priority = sa.Column(sa.Integer, nullable=False)
|
|
action = sa.Column(sa.String(16), nullable=False)
|
|
# condition
|
|
in_port = sa.Column(sa.String(36), nullable=False)
|
|
src_mac = sa.Column(sa.String(32), nullable=False)
|
|
dst_mac = sa.Column(sa.String(32), nullable=False)
|
|
eth_type = sa.Column(sa.Integer, nullable=False)
|
|
src_cidr = sa.Column(sa.String(64), nullable=False)
|
|
dst_cidr = sa.Column(sa.String(64), nullable=False)
|
|
protocol = sa.Column(sa.String(16), nullable=False)
|
|
src_port = sa.Column(sa.Integer, nullable=False)
|
|
dst_port = sa.Column(sa.Integer, nullable=False)
|
|
# status
|
|
admin_state_up = sa.Column(sa.Boolean(), nullable=False)
|
|
status = sa.Column(sa.String(16), nullable=False)
|