5932096f21
Implements blueprint nec-distribute-router Two types of neutron router will be supported: l3-agent and distributed. A type can be specified through "provider" attribute of a router. The naming of the attribute "provider" is intentional since I plan to support the service provider framework for router in the future and would like to make it easy to migrate. distributed router in NEC OpenFLow controller now does not support NAT, so l3-agent and distributed router coexists. To achieve it, l3-agent scheudler logic is modified in NEC plugin to exclude distributed routers from candidates of floating IP hosting routers. To support the above feature, the following related changes are done: - Adds a new driver to PFC driver which supports OpenFlow based router support in NEC OpenFlow products in PFlow v5. - Update ofc_client to extract detail error message from OpenFlow controller This commit also changes the following outside of NEC plugin: - Makes L3 agent notifiers configurable. l3-agent router and OpenFlow distributed router can coexist. Notication to l3-agent should be done only when routers are hosted by l3-agent, so we need custom L3 agent notifiers to filter non l3-agent routers. - Split test_agent_scheduler base class (in OVS plugin) into the base setup and testcases. By doing so we can implement custom testcases related to agent scheduler. Change-Id: I538201742950a61b92fb05c49a9256bc96ae9014
96 lines
3.0 KiB
Python
96 lines
3.0 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 sqlalchemy import orm
|
|
|
|
from neutron.db import model_base
|
|
from neutron.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 NeutronId(object):
|
|
"""Logical ID on Quantum."""
|
|
quantum_id = sa.Column(sa.String(36), primary_key=True)
|
|
|
|
|
|
class OFCTenantMapping(model_base.BASEV2, NeutronId, OFCId):
|
|
"""Represents a Tenant on OpenFlow Network/Controller."""
|
|
|
|
|
|
class OFCNetworkMapping(model_base.BASEV2, NeutronId, OFCId):
|
|
"""Represents a Network on OpenFlow Network/Controller."""
|
|
|
|
|
|
class OFCPortMapping(model_base.BASEV2, NeutronId, OFCId):
|
|
"""Represents a Port on OpenFlow Network/Controller."""
|
|
|
|
|
|
class OFCRouterMapping(model_base.BASEV2, NeutronId, OFCId):
|
|
"""Represents a router on OpenFlow Network/Controller."""
|
|
|
|
|
|
class OFCFilterMapping(model_base.BASEV2, NeutronId, OFCId):
|
|
"""Represents a Filter on OpenFlow Network/Controller."""
|
|
|
|
|
|
"""Old mapping tables."""
|
|
|
|
|
|
class HasNeutronId(object):
|
|
"""Logical ID on Quantum."""
|
|
quantum_id = sa.Column(sa.String(36), nullable=False)
|
|
|
|
|
|
class OFCTenant(model_base.BASEV2, models_v2.HasId, HasNeutronId):
|
|
"""Represents a Tenant on OpenFlow Network/Controller."""
|
|
|
|
|
|
class OFCNetwork(model_base.BASEV2, models_v2.HasId, HasNeutronId):
|
|
"""Represents a Network on OpenFlow Network/Controller."""
|
|
|
|
|
|
class OFCPort(model_base.BASEV2, models_v2.HasId, HasNeutronId):
|
|
"""Represents a Port on OpenFlow Network/Controller."""
|
|
|
|
|
|
class OFCFilter(model_base.BASEV2, models_v2.HasId, HasNeutronId):
|
|
"""Represents a Filter on OpenFlow Network/Controller."""
|
|
|
|
|
|
class PortInfo(model_base.BASEV2):
|
|
"""Represents a Virtual Interface."""
|
|
id = sa.Column(sa.String(36),
|
|
sa.ForeignKey('ports.id', ondelete="CASCADE"),
|
|
primary_key=True)
|
|
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)
|
|
port = orm.relationship(
|
|
models_v2.Port,
|
|
backref=orm.backref("portinfo",
|
|
lazy='joined', uselist=False,
|
|
cascade='delete'))
|