Support L3 plugin
This patch implements dragonflow l3 plugin support router, router interface and floating ip Change-Id: I8ebebc40248374a424a14b93f186283a707b5a60
This commit is contained in:
parent
019b3968c7
commit
258206352c
|
@ -3,6 +3,8 @@
|
||||||
# By default, dragonflow uses DFPlugin as core plugin. If you want to use
|
# By default, dragonflow uses DFPlugin as core plugin. If you want to use
|
||||||
# ML2 as core plugin, you can edit local.conf file to configure
|
# ML2 as core plugin, you can edit local.conf file to configure
|
||||||
# "USE_ML2_PLUGIN=True" and "Q_ML2_PLUGIN_MECHANISM_DRIVERS=df"
|
# "USE_ML2_PLUGIN=True" and "Q_ML2_PLUGIN_MECHANISM_DRIVERS=df"
|
||||||
|
# if you want to use df-l3 as the l3 services plugin, you could edit
|
||||||
|
# local.conf file to configure "ML2_L3_PLUGIN=df-l3"
|
||||||
USE_ML2_PLUGIN=${USE_ML2_PLUGIN:-"False"}
|
USE_ML2_PLUGIN=${USE_ML2_PLUGIN:-"False"}
|
||||||
|
|
||||||
# The git repo to use
|
# The git repo to use
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
[[local|localrc]]
|
[[local|localrc]]
|
||||||
|
|
||||||
# By default, dragonflow uses DFPlugin as core plugin. If you want to use
|
# By default, dragonflow uses DFPlugin as core plugin. If you want to use
|
||||||
# ML2 as core plugin, you can edit local.conf file to configure
|
# ML2 as core plugin, you can edit local.conf file to configure
|
||||||
# "USE_ML2_PLUGIN=True" and "Q_ML2_PLUGIN_MECHANISM_DRIVERS=df"
|
# "USE_ML2_PLUGIN=True" and "Q_ML2_PLUGIN_MECHANISM_DRIVERS=df"
|
||||||
|
# if you want to use df-l3 as the l3 services plugin, you could edit
|
||||||
|
# local.conf file to configure "ML2_L3_PLUGIN=df-l3"
|
||||||
USE_ML2_PLUGIN=False
|
USE_ML2_PLUGIN=False
|
|
@ -1,6 +1,8 @@
|
||||||
[[local|localrc]]
|
[[local|localrc]]
|
||||||
|
|
||||||
# By default, dragonflow uses DFPlugin as core plugin. If you want to use
|
# By default, dragonflow uses DFPlugin as core plugin. If you want to use
|
||||||
# ML2 as core plugin, you can edit local.conf file to configure
|
# ML2 as core plugin, you can edit local.conf file to configure
|
||||||
# "USE_ML2_PLUGIN=True" and "Q_ML2_PLUGIN_MECHANISM_DRIVERS=df"
|
# "USE_ML2_PLUGIN=True" and "Q_ML2_PLUGIN_MECHANISM_DRIVERS=df"
|
||||||
|
# if you want to use df-l3 as the l3 services plugin, you could edit
|
||||||
|
# local.conf file to configure "ML2_L3_PLUGIN=df-l3"
|
||||||
USE_ML2_PLUGIN=False
|
USE_ML2_PLUGIN=False
|
|
@ -0,0 +1,328 @@
|
||||||
|
# Copyright (c) 2016 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 netaddr
|
||||||
|
|
||||||
|
from neutron import manager
|
||||||
|
from oslo_config import cfg
|
||||||
|
from oslo_log import log
|
||||||
|
from oslo_utils import excutils
|
||||||
|
from oslo_utils import importutils
|
||||||
|
|
||||||
|
from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api
|
||||||
|
from neutron.api.rpc.handlers import l3_rpc
|
||||||
|
from neutron.common import constants as const
|
||||||
|
from neutron.common import exceptions as n_exc
|
||||||
|
from neutron.common import rpc as n_rpc
|
||||||
|
from neutron.common import topics
|
||||||
|
from neutron.db import common_db_mixin
|
||||||
|
from neutron.db import db_base_plugin_v2
|
||||||
|
from neutron.db import extraroute_db
|
||||||
|
from neutron.db import l3_agentschedulers_db
|
||||||
|
from neutron.db import l3_db
|
||||||
|
from neutron.db import l3_gwmode_db
|
||||||
|
from neutron.plugins.common import constants
|
||||||
|
from neutron.quota import resource_registry
|
||||||
|
from neutron.services import service_base
|
||||||
|
|
||||||
|
from dragonflow._i18n import _LE
|
||||||
|
from dragonflow.common import exceptions as df_exceptions
|
||||||
|
from dragonflow.db import api_nb
|
||||||
|
from dragonflow.db.neutron import lockedobjects_db as lock_db
|
||||||
|
from dragonflow.db.neutron import versionobjects_db as version_db
|
||||||
|
from dragonflow.neutron.common import constants as df_const
|
||||||
|
|
||||||
|
|
||||||
|
LOG = log.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class DFL3RouterPlugin(service_base.ServicePluginBase,
|
||||||
|
db_base_plugin_v2.NeutronDbPluginV2,
|
||||||
|
common_db_mixin.CommonDbMixin,
|
||||||
|
extraroute_db.ExtraRoute_db_mixin,
|
||||||
|
l3_gwmode_db.L3_NAT_db_mixin,
|
||||||
|
l3_agentschedulers_db.L3AgentSchedulerDbMixin):
|
||||||
|
|
||||||
|
"""Implementation of the Dragonflow Neutron L3 Router Service Plugin.
|
||||||
|
|
||||||
|
This class implements a L3 service plugin that provides
|
||||||
|
router, floatingip resources and manages associated
|
||||||
|
request/response.
|
||||||
|
"""
|
||||||
|
|
||||||
|
@resource_registry.tracked_resources(
|
||||||
|
router=l3_db.Router,
|
||||||
|
floatingip=l3_db.FloatingIP)
|
||||||
|
def __init__(self):
|
||||||
|
self.router_scheduler = importutils.import_object(
|
||||||
|
cfg.CONF.router_scheduler_driver)
|
||||||
|
super(DFL3RouterPlugin, self).__init__()
|
||||||
|
nb_driver_class = importutils.import_class(cfg.CONF.df.nb_db_class)
|
||||||
|
self.nb_api = api_nb.NbApi(
|
||||||
|
nb_driver_class(),
|
||||||
|
use_pubsub=cfg.CONF.df.enable_df_pub_sub,
|
||||||
|
is_neutron_server=True)
|
||||||
|
# TODO(hshan) provide interface to get nb_api
|
||||||
|
self.nb_api.initialize(db_ip=cfg.CONF.df.remote_db_ip,
|
||||||
|
db_port=cfg.CONF.df.remote_db_port)
|
||||||
|
self.core_plugin = None
|
||||||
|
self._start_rpc_notifiers()
|
||||||
|
|
||||||
|
def _start_rpc_notifiers(self):
|
||||||
|
"""Initialization RPC notifiers for agents"""
|
||||||
|
self.agent_notifiers[const.AGENT_TYPE_L3] = {
|
||||||
|
l3_rpc_agent_api.L3AgentNotifyAPI()
|
||||||
|
}
|
||||||
|
|
||||||
|
def start_rpc_listeners(self):
|
||||||
|
self.topic = topics.L3PLUGIN
|
||||||
|
self.conn = n_rpc.create_connection()
|
||||||
|
self.agent_notifiers.update(
|
||||||
|
{const.AGENT_TYPE_L3: l3_rpc_agent_api.L3AgentNotifyAPI()})
|
||||||
|
self.endpoints = [l3_rpc.L3RpcCallback()]
|
||||||
|
self.conn.create_consumer(self.topic, self.endpoints,
|
||||||
|
fanout=False)
|
||||||
|
return self.conn.consume_in_threads()
|
||||||
|
|
||||||
|
def get_plugin_type(self):
|
||||||
|
return constants.L3_ROUTER_NAT
|
||||||
|
|
||||||
|
def get_plugin_description(self):
|
||||||
|
"""Returns string description of the plugin."""
|
||||||
|
return ("L3 Router Service Plugin for basic L3 forwarding "
|
||||||
|
"using Dragonflow.")
|
||||||
|
|
||||||
|
@lock_db.wrap_db_lock(lock_db.RESOURCE_DF_PLUGIN)
|
||||||
|
def create_router(self, context, router):
|
||||||
|
with context.session.begin(subtransactions=True):
|
||||||
|
router = super(DFL3RouterPlugin, self).create_router(
|
||||||
|
context, router)
|
||||||
|
router_version = version_db._create_db_version_row(
|
||||||
|
context.session, router['id']
|
||||||
|
)
|
||||||
|
|
||||||
|
router_id = router['id']
|
||||||
|
tenant_id = router['tenant_id']
|
||||||
|
is_distributed = router.get('distributed', False)
|
||||||
|
router_name = router.get('name', df_const.DF_ROUTER_DEFAULT_NAME)
|
||||||
|
self.nb_api.create_lrouter(router_id, topic=tenant_id,
|
||||||
|
name=router_name,
|
||||||
|
distributed=is_distributed,
|
||||||
|
version=router_version,
|
||||||
|
ports=[])
|
||||||
|
return router
|
||||||
|
|
||||||
|
@lock_db.wrap_db_lock(lock_db.RESOURCE_DF_PLUGIN)
|
||||||
|
def update_router(self, context, router_id, router):
|
||||||
|
with context.session.begin(subtransactions=True):
|
||||||
|
router = super(DFL3RouterPlugin, self).update_router(
|
||||||
|
context, router_id, router)
|
||||||
|
router_version = version_db._update_db_version_row(
|
||||||
|
context.session, router['id'])
|
||||||
|
|
||||||
|
try:
|
||||||
|
gw_info = router.get('external_gateway_info', {})
|
||||||
|
if gw_info:
|
||||||
|
gw_info.update({'port_id': router.get('gw_port_id')})
|
||||||
|
is_distributed = router.get('distributed', False)
|
||||||
|
self.nb_api.update_lrouter(
|
||||||
|
router_id,
|
||||||
|
topic=router['tenant_id'],
|
||||||
|
name=router['name'],
|
||||||
|
distributed=is_distributed,
|
||||||
|
version=router_version,
|
||||||
|
routes=router.get('routes', []),
|
||||||
|
admin_state_up=router['admin_state_up'],
|
||||||
|
description=router['description'],
|
||||||
|
gateway=gw_info
|
||||||
|
)
|
||||||
|
except df_exceptions.DBKeyNotFound:
|
||||||
|
LOG.debug("router %s is not found in DF DB" % router_id)
|
||||||
|
|
||||||
|
return router
|
||||||
|
|
||||||
|
@lock_db.wrap_db_lock(lock_db.RESOURCE_DF_PLUGIN)
|
||||||
|
def delete_router(self, context, router_id):
|
||||||
|
router = self.get_router(context, router_id)
|
||||||
|
with context.session.begin(subtransactions=True):
|
||||||
|
ret_val = super(DFL3RouterPlugin, self).delete_router(context,
|
||||||
|
router_id)
|
||||||
|
version_db._delete_db_version_row(context.session, router_id)
|
||||||
|
try:
|
||||||
|
self.nb_api.delete_lrouter(id=router_id,
|
||||||
|
topic=router['tenant_id'])
|
||||||
|
except df_exceptions.DBKeyNotFound:
|
||||||
|
LOG.debug("router %s is not found in DF DB" % router_id)
|
||||||
|
return ret_val
|
||||||
|
|
||||||
|
def _get_floatingip_port(self, context, floatingip_id):
|
||||||
|
filters = {'device_id': [floatingip_id]}
|
||||||
|
floating_ports = self.get_ports(context, filters=filters)
|
||||||
|
if floating_ports:
|
||||||
|
return floating_ports[0]
|
||||||
|
return None
|
||||||
|
|
||||||
|
def _get_floatingip_subnet(self, context, subnet_id):
|
||||||
|
gateway_subnet = self.get_subnet(context, subnet_id)
|
||||||
|
if gateway_subnet['ip_version'] == 4:
|
||||||
|
return gateway_subnet
|
||||||
|
return None
|
||||||
|
|
||||||
|
@lock_db.wrap_db_lock(lock_db.RESOURCE_DF_PLUGIN)
|
||||||
|
def create_floatingip(self, context, floatingip):
|
||||||
|
try:
|
||||||
|
floatingip_port = None
|
||||||
|
with context.session.begin(subtransactions=True):
|
||||||
|
floatingip_dict = \
|
||||||
|
super(DFL3RouterPlugin, self).create_floatingip(
|
||||||
|
context,
|
||||||
|
floatingip,
|
||||||
|
initial_status=const.FLOATINGIP_STATUS_DOWN)
|
||||||
|
fip_version = version_db._create_db_version_row(
|
||||||
|
context.session, floatingip_dict['id']
|
||||||
|
)
|
||||||
|
|
||||||
|
floatingip_port = self._get_floatingip_port(
|
||||||
|
context, floatingip_dict['id'])
|
||||||
|
if not floatingip_port:
|
||||||
|
raise n_exc.DeviceNotFoundError(
|
||||||
|
device_name=floatingip_dict['id'])
|
||||||
|
subnet_id = floatingip_port['fixed_ips'][0]['subnet_id']
|
||||||
|
floatingip_subnet = self._get_floatingip_subnet(
|
||||||
|
context, subnet_id)
|
||||||
|
if floatingip_subnet is None:
|
||||||
|
raise n_exc.SubnetNotFound(subnet_id=subnet_id)
|
||||||
|
except Exception:
|
||||||
|
with excutils.save_and_reraise_exception() as ctxt:
|
||||||
|
ctxt.reraise = True
|
||||||
|
# delete the stale floatingip port
|
||||||
|
try:
|
||||||
|
if floatingip_port:
|
||||||
|
self.nb_api.delete_lport(floatingip_port['id'],
|
||||||
|
floatingip_port['tenant_id'])
|
||||||
|
except df_exceptions.DBKeyNotFound:
|
||||||
|
pass
|
||||||
|
|
||||||
|
self.nb_api.create_floatingip(
|
||||||
|
id=floatingip_dict['id'],
|
||||||
|
topic=floatingip_dict['tenant_id'],
|
||||||
|
name=floatingip_dict.get('name', df_const.DF_FIP_DEFAULT_NAME),
|
||||||
|
floating_ip_address=floatingip_dict['floating_ip_address'],
|
||||||
|
floating_network_id=floatingip_dict['floating_network_id'],
|
||||||
|
router_id=floatingip_dict['router_id'],
|
||||||
|
port_id=floatingip_dict['port_id'],
|
||||||
|
fixed_ip_address=floatingip_dict['fixed_ip_address'],
|
||||||
|
status=floatingip_dict['status'],
|
||||||
|
floating_port_id=floatingip_port['id'],
|
||||||
|
floating_mac_address=floatingip_port['mac_address'],
|
||||||
|
external_gateway_ip=floatingip_subnet['gateway_ip'],
|
||||||
|
version=fip_version,
|
||||||
|
external_cidr=floatingip_subnet['cidr'])
|
||||||
|
|
||||||
|
return floatingip_dict
|
||||||
|
|
||||||
|
@lock_db.wrap_db_lock(lock_db.RESOURCE_DF_PLUGIN)
|
||||||
|
def update_floatingip(self, context, id, floatingip):
|
||||||
|
with context.session.begin(subtransactions=True):
|
||||||
|
floatingip_dict = super(DFL3RouterPlugin, self).update_floatingip(
|
||||||
|
context, id, floatingip)
|
||||||
|
fip_version = version_db._update_db_version_row(
|
||||||
|
context.session, id)
|
||||||
|
|
||||||
|
self.nb_api.update_floatingip(
|
||||||
|
id=floatingip_dict['id'],
|
||||||
|
topic=floatingip_dict['tenant_id'],
|
||||||
|
notify=True,
|
||||||
|
name=floatingip_dict.get('name', df_const.DF_FIP_DEFAULT_NAME),
|
||||||
|
router_id=floatingip_dict['router_id'],
|
||||||
|
port_id=floatingip_dict['port_id'],
|
||||||
|
version=fip_version,
|
||||||
|
fixed_ip_address=floatingip_dict['fixed_ip_address'])
|
||||||
|
return floatingip_dict
|
||||||
|
|
||||||
|
@lock_db.wrap_db_lock(lock_db.RESOURCE_DF_PLUGIN)
|
||||||
|
def delete_floatingip(self, context, id):
|
||||||
|
with context.session.begin(subtransactions=True):
|
||||||
|
floatingip = self.get_floatingip(context, id)
|
||||||
|
super(DFL3RouterPlugin, self).delete_floatingip(context, id)
|
||||||
|
version_db._delete_db_version_row(context.session, id)
|
||||||
|
try:
|
||||||
|
self.nb_api.delete_floatingip(id=id,
|
||||||
|
topic=floatingip['tenant_id'])
|
||||||
|
except df_exceptions.DBKeyNotFound:
|
||||||
|
LOG.exception(_LE("floatingip %s is not found in DF DB") % id)
|
||||||
|
|
||||||
|
def get_floatingip(self, context, id, fields=None):
|
||||||
|
with context.session.begin(subtransactions=True):
|
||||||
|
fip = super(DFL3RouterPlugin, self).get_floatingip(context, id,
|
||||||
|
fields)
|
||||||
|
fip['status'] = self.nb_api.get_floatingip(id).get_status()
|
||||||
|
return fip
|
||||||
|
|
||||||
|
def _get_core_plugin(self):
|
||||||
|
if not self.core_plugin:
|
||||||
|
self.core_plugin = manager.NeutronManager.get_plugin()
|
||||||
|
return self.core_plugin
|
||||||
|
|
||||||
|
@lock_db.wrap_db_lock(lock_db.RESOURCE_DF_PLUGIN)
|
||||||
|
def add_router_interface(self, context, router_id, interface_info):
|
||||||
|
with context.session.begin(subtransactions=True):
|
||||||
|
result = super(DFL3RouterPlugin, self).add_router_interface(
|
||||||
|
context, router_id, interface_info)
|
||||||
|
router_version = version_db._update_db_version_row(
|
||||||
|
context.session, router_id)
|
||||||
|
|
||||||
|
self.core_plugin = self._get_core_plugin()
|
||||||
|
port = self.core_plugin.get_port(context, result['port_id'])
|
||||||
|
subnet = self.core_plugin.get_subnet(context, result['subnet_id'])
|
||||||
|
cidr = netaddr.IPNetwork(subnet['cidr'])
|
||||||
|
network = "%s/%s" % (port['fixed_ips'][0]['ip_address'],
|
||||||
|
str(cidr.prefixlen))
|
||||||
|
logical_port = self.nb_api.get_logical_port(port['id'],
|
||||||
|
port['tenant_id'])
|
||||||
|
|
||||||
|
self.nb_api.add_lrouter_port(result['port_id'],
|
||||||
|
result['id'],
|
||||||
|
result['network_id'],
|
||||||
|
result['tenant_id'],
|
||||||
|
router_version=router_version,
|
||||||
|
mac=port['mac_address'],
|
||||||
|
network=network,
|
||||||
|
tunnel_key=logical_port.get_tunnel_key())
|
||||||
|
return result
|
||||||
|
|
||||||
|
@lock_db.wrap_db_lock(lock_db.RESOURCE_DF_PLUGIN)
|
||||||
|
def remove_router_interface(self, context, router_id, interface_info):
|
||||||
|
with context.session.begin(subtransactions=True):
|
||||||
|
new_router = super(DFL3RouterPlugin, self).remove_router_interface(
|
||||||
|
context, router_id, interface_info)
|
||||||
|
router_version = version_db._update_db_version_row(
|
||||||
|
context.session, router_id)
|
||||||
|
|
||||||
|
self.core_plugin = self._get_core_plugin()
|
||||||
|
subnet = self.core_plugin.get_subnet(context, new_router['subnet_id'])
|
||||||
|
network_id = subnet['network_id']
|
||||||
|
|
||||||
|
try:
|
||||||
|
self.nb_api.delete_lrouter_port(router_id,
|
||||||
|
network_id,
|
||||||
|
subnet['tenant_id'],
|
||||||
|
router_version=router_version)
|
||||||
|
except df_exceptions.DBKeyNotFound:
|
||||||
|
LOG.exception(_LE("logical router %s is not found in DF DB, "
|
||||||
|
"suppressing delete_lrouter_port "
|
||||||
|
"exception") % router_id)
|
||||||
|
return new_router
|
|
@ -57,3 +57,5 @@ dragonflow.pubsub_driver =
|
||||||
zmq_pubsub_driver = dragonflow.db.pubsub_drivers.zmq_pubsub_driver:ZMQPubSub
|
zmq_pubsub_driver = dragonflow.db.pubsub_drivers.zmq_pubsub_driver:ZMQPubSub
|
||||||
zmq_pubsub_multiproc_driver = dragonflow.db.pubsub_drivers.zmq_pubsub_driver:ZMQPubSubMultiproc
|
zmq_pubsub_multiproc_driver = dragonflow.db.pubsub_drivers.zmq_pubsub_driver:ZMQPubSubMultiproc
|
||||||
redis_db_pubsub_driver = dragonflow.db.pubsub_drivers.redis_db_pubsub_driver:RedisPubSub
|
redis_db_pubsub_driver = dragonflow.db.pubsub_drivers.redis_db_pubsub_driver:RedisPubSub
|
||||||
|
neutron.service_plugins =
|
||||||
|
df-l3 = dragonflow.neutron.services.l3_router_plugin:DFL3RouterPlugin
|
||||||
|
|
Loading…
Reference in New Issue