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
234 lines
7.8 KiB
Python
234 lines
7.8 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 neutron.db import api as db
|
|
from neutron.db import model_base
|
|
from neutron.db import models_v2
|
|
from neutron.db import securitygroups_db as sg_db
|
|
from neutron.extensions import securitygroup as ext_sg
|
|
from neutron import manager
|
|
from neutron.openstack.common import log as logging
|
|
from neutron.plugins.nec.common import config # noqa
|
|
from neutron.plugins.nec.common import exceptions as nexc
|
|
from neutron.plugins.nec.db import models as nmodels
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
OFP_VLAN_NONE = 0xffff
|
|
|
|
|
|
resource_map = {'ofc_tenant': nmodels.OFCTenantMapping,
|
|
'ofc_network': nmodels.OFCNetworkMapping,
|
|
'ofc_port': nmodels.OFCPortMapping,
|
|
'ofc_router': nmodels.OFCRouterMapping,
|
|
'ofc_packet_filter': nmodels.OFCFilterMapping}
|
|
|
|
old_resource_map = {'ofc_tenant': nmodels.OFCTenant,
|
|
'ofc_network': nmodels.OFCNetwork,
|
|
'ofc_port': nmodels.OFCPort,
|
|
'ofc_packet_filter': nmodels.OFCFilter}
|
|
|
|
|
|
# utitlity methods
|
|
|
|
def _get_resource_model(resource, old_style):
|
|
if old_style:
|
|
# NOTE: Some new resources are not defined in old_resource_map.
|
|
# In such case None is returned.
|
|
return old_resource_map.get(resource)
|
|
else:
|
|
return resource_map[resource]
|
|
|
|
|
|
def initialize():
|
|
db.configure_db()
|
|
|
|
|
|
def clear_db(base=model_base.BASEV2):
|
|
db.clear_db(base)
|
|
|
|
|
|
def get_ofc_item(session, resource, neutron_id, old_style=False):
|
|
model = _get_resource_model(resource, old_style)
|
|
if not model:
|
|
return None
|
|
try:
|
|
return session.query(model).filter_by(quantum_id=neutron_id).one()
|
|
except sa.orm.exc.NoResultFound:
|
|
return None
|
|
|
|
|
|
def get_ofc_id(session, resource, neutron_id, old_style=False):
|
|
ofc_item = get_ofc_item(session, resource, neutron_id, old_style)
|
|
if ofc_item:
|
|
if old_style:
|
|
return ofc_item.id
|
|
else:
|
|
return ofc_item.ofc_id
|
|
else:
|
|
return None
|
|
|
|
|
|
def exists_ofc_item(session, resource, neutron_id, old_style=False):
|
|
if get_ofc_item(session, resource, neutron_id, old_style):
|
|
return True
|
|
else:
|
|
return False
|
|
|
|
|
|
def find_ofc_item(session, resource, ofc_id, old_style=False):
|
|
try:
|
|
model = _get_resource_model(resource, old_style)
|
|
if old_style:
|
|
params = dict(id=ofc_id)
|
|
else:
|
|
params = dict(ofc_id=ofc_id)
|
|
return (session.query(model).filter_by(**params).one())
|
|
except sa.orm.exc.NoResultFound:
|
|
return None
|
|
|
|
|
|
def add_ofc_item(session, resource, neutron_id, ofc_id, old_style=False):
|
|
try:
|
|
model = _get_resource_model(resource, old_style)
|
|
if old_style:
|
|
params = dict(quantum_id=neutron_id, id=ofc_id)
|
|
else:
|
|
params = dict(quantum_id=neutron_id, ofc_id=ofc_id)
|
|
item = model(**params)
|
|
with session.begin(subtransactions=True):
|
|
session.add(item)
|
|
session.flush()
|
|
except Exception as exc:
|
|
LOG.exception(exc)
|
|
raise nexc.NECDBException(reason=exc.message)
|
|
return item
|
|
|
|
|
|
def del_ofc_item(session, resource, neutron_id, old_style=False,
|
|
warning=True):
|
|
try:
|
|
model = _get_resource_model(resource, old_style)
|
|
with session.begin(subtransactions=True):
|
|
item = session.query(model).filter_by(quantum_id=neutron_id).one()
|
|
session.delete(item)
|
|
return True
|
|
except sa.orm.exc.NoResultFound:
|
|
if warning:
|
|
LOG.warning(_("_del_ofc_item(): NotFound item "
|
|
"(model=%(model)s, id=%(id)s) "),
|
|
{'model': model, 'id': neutron_id})
|
|
return False
|
|
|
|
|
|
def get_ofc_id_lookup_both(session, resource, neutron_id):
|
|
ofc_id = get_ofc_id(session, resource, neutron_id)
|
|
# Lookup old style of OFC mapping table
|
|
if not ofc_id:
|
|
ofc_id = get_ofc_id(session, resource, neutron_id,
|
|
old_style=True)
|
|
if not ofc_id:
|
|
reason = (_("NotFound %(resource)s for neutron_id=%(id)s.")
|
|
% {'resource': resource, 'id': neutron_id})
|
|
raise nexc.OFCConsistencyBroken(reason=reason)
|
|
return ofc_id
|
|
|
|
|
|
def exists_ofc_item_lookup_both(session, resource, neutron_id):
|
|
if exists_ofc_item(session, resource, neutron_id):
|
|
return True
|
|
# Check old style of OFC mapping table
|
|
if exists_ofc_item(session, resource, neutron_id,
|
|
old_style=True):
|
|
return True
|
|
return False
|
|
|
|
|
|
def del_ofc_item_lookup_both(session, resource, neutron_id):
|
|
# Delete the mapping from new style of OFC mapping table
|
|
if del_ofc_item(session, resource, neutron_id,
|
|
old_style=False, warning=False):
|
|
return
|
|
# Delete old style of OFC mapping table
|
|
if del_ofc_item(session, resource, neutron_id,
|
|
old_style=True, warning=False):
|
|
return
|
|
# The specified resource not found
|
|
LOG.warning(_("_del_ofc_item(): NotFound item "
|
|
"(resource=%(resource)s, id=%(id)s) "),
|
|
{'resource': resource, 'id': neutron_id})
|
|
|
|
|
|
def get_portinfo(session, id):
|
|
try:
|
|
return (session.query(nmodels.PortInfo).
|
|
filter_by(id=id).
|
|
one())
|
|
except sa.orm.exc.NoResultFound:
|
|
return None
|
|
|
|
|
|
def add_portinfo(session, id, datapath_id='', port_no=0,
|
|
vlan_id=OFP_VLAN_NONE, mac=''):
|
|
try:
|
|
portinfo = nmodels.PortInfo(id=id, datapath_id=datapath_id,
|
|
port_no=port_no, vlan_id=vlan_id, mac=mac)
|
|
with session.begin(subtransactions=True):
|
|
session.add(portinfo)
|
|
except Exception as exc:
|
|
LOG.exception(exc)
|
|
raise nexc.NECDBException(reason=exc.message)
|
|
return portinfo
|
|
|
|
|
|
def del_portinfo(session, id):
|
|
try:
|
|
with session.begin(subtransactions=True):
|
|
portinfo = session.query(nmodels.PortInfo).filter_by(id=id).one()
|
|
session.delete(portinfo)
|
|
except sa.orm.exc.NoResultFound:
|
|
LOG.warning(_("del_portinfo(): NotFound portinfo for "
|
|
"port_id: %s"), id)
|
|
|
|
|
|
def get_port_from_device(port_id):
|
|
"""Get port from database."""
|
|
LOG.debug(_("get_port_with_securitygroups() called:port_id=%s"), port_id)
|
|
session = db.get_session()
|
|
sg_binding_port = sg_db.SecurityGroupPortBinding.port_id
|
|
|
|
query = session.query(models_v2.Port,
|
|
sg_db.SecurityGroupPortBinding.security_group_id)
|
|
query = query.outerjoin(sg_db.SecurityGroupPortBinding,
|
|
models_v2.Port.id == sg_binding_port)
|
|
query = query.filter(models_v2.Port.id == port_id)
|
|
port_and_sgs = query.all()
|
|
if not port_and_sgs:
|
|
return None
|
|
port = port_and_sgs[0][0]
|
|
plugin = manager.NeutronManager.get_plugin()
|
|
port_dict = plugin._make_port_dict(port)
|
|
port_dict[ext_sg.SECURITYGROUPS] = [
|
|
sg_id for port_, sg_id in port_and_sgs if sg_id]
|
|
port_dict['security_group_rules'] = []
|
|
port_dict['security_group_source_groups'] = []
|
|
port_dict['fixed_ips'] = [ip['ip_address']
|
|
for ip in port['fixed_ips']]
|
|
return port_dict
|