8284bf9b3a
* use neutron_lib.directory for plugin retrieval * switch to neutron_lib for neutron constants, exceptions, extensions * add neutron.plugins.ml2.ovo_rpc to OUT_OF_PROCESS_NOTIFICATIONS: neutron added ovo rpc callback mechanism for ovo objects, and aim notification manager needs to recognize those as out of process. Since neutron moved away from get_session API to get_reader_session and get_writer_session, override for these was added. Few bugs were fixed in the delayed notification area as well. * new engine facade: make use of reader and writer to grab db engine * remove _update_fip_assoc override (didn't find a reason for the override) * aim driver: a fix in update_subnetpool_precommit - not to assume address_scope_id field is returned from neutron update call if it was not updated. * extend_XXX_dict call was switched to receive ovo instead of db object. As a result, foreign keys are not part of the object anymore, and need to be retrieved from db. * remove_router_interface - receive port dictinary rather than port object * fix patched neutron functions to receive correct parameter types (like patched_get_locked_port_and_binding) * use add_agent_status_check_worker instead of add_agent_status_check * advertise_mtu configuration parameter was removed from neutron. It is used in aim driver, hence added to aim driver config. * use of project_id instead of tenant_id where required * use segments_db module for network segments * test_aim_mapping_driver: the test used to override uuid generation in order to get predictable uuid results. New neutron code makes use of python uuid module where overrides are complicated. It was easire to remove all uuid-based values from dictionaries under test * add filters parameter to get_address_scopes calls, otherwise the call fails (probably should be fixed in neutron) * in routing tests, remove the assumption that routes are returned in specific order Change-Id: I1943fd4196ea6199d825ae53f0e9f5b54d54a260
102 lines
4.1 KiB
Python
102 lines
4.1 KiB
Python
# 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.
|
|
|
|
from neutron_lib.plugins import directory
|
|
from oslo_log import helpers as log
|
|
|
|
from gbpservice.network.neutronv2 import local_api
|
|
from gbpservice.neutron.services.grouppolicy.common import exceptions as exc
|
|
from gbpservice.neutron.services.grouppolicy.drivers import (
|
|
implicit_policy as ipd)
|
|
from gbpservice.neutron.services.grouppolicy.drivers import (
|
|
resource_mapping as rmd)
|
|
|
|
|
|
class CommonNeutronBase(ipd.ImplicitPolicyBase, rmd.OwnedResourcesOperations,
|
|
rmd.ImplicitResourceOperations):
|
|
"""Neutron Resources' Orchestration driver.
|
|
|
|
This driver realizes GBP's network semantics by orchestrating
|
|
the necessary Neutron resources.
|
|
"""
|
|
|
|
@log.log_method_call
|
|
def initialize(self):
|
|
# REVISIT: Check if this is still required
|
|
self._cached_agent_notifier = None
|
|
self._gbp_plugin = None
|
|
super(CommonNeutronBase, self).initialize()
|
|
local_api.QUEUE_OUT_OF_PROCESS_NOTIFICATIONS = True
|
|
|
|
@property
|
|
def gbp_plugin(self):
|
|
if not self._gbp_plugin:
|
|
self._gbp_plugin = directory.get_plugin("GROUP_POLICY")
|
|
return self._gbp_plugin
|
|
|
|
@log.log_method_call
|
|
def create_l2_policy_precommit(self, context):
|
|
l2p_db = context._plugin._get_l2_policy(
|
|
context._plugin_context, context.current['id'])
|
|
if not context.current['l3_policy_id']:
|
|
self._create_implicit_l3_policy(context)
|
|
l2p_db['l3_policy_id'] = context.current['l3_policy_id']
|
|
l3p_db = context._plugin._get_l3_policy(
|
|
context._plugin_context, l2p_db['l3_policy_id'])
|
|
if not context.current['network_id']:
|
|
self._use_implicit_network(
|
|
context, address_scope_v4=l3p_db['address_scope_v4_id'],
|
|
address_scope_v6=l3p_db['address_scope_v6_id'])
|
|
l2p_db['network_id'] = context.current['network_id']
|
|
|
|
@log.log_method_call
|
|
def update_l2_policy_precommit(self, context):
|
|
if (context.current['inject_default_route'] !=
|
|
context.original['inject_default_route']):
|
|
raise exc.UnsettingInjectDefaultRouteOfL2PolicyNotSupported()
|
|
if (context.current['l3_policy_id'] !=
|
|
context.original['l3_policy_id']):
|
|
raise exc.L3PolicyUpdateOfL2PolicyNotSupported()
|
|
|
|
@log.log_method_call
|
|
def delete_l2_policy_precommit(self, context):
|
|
l2p_db = context._plugin._get_l2_policy(
|
|
context._plugin_context, context.current['id'])
|
|
if l2p_db['network_id']:
|
|
network_id = l2p_db['network_id']
|
|
l2p_db.update({'network_id': None})
|
|
self._cleanup_network(context._plugin_context, network_id)
|
|
if l2p_db['l3_policy_id']:
|
|
l3p_id = l2p_db['l3_policy_id']
|
|
l2p_db.update({'l3_policy_id': None})
|
|
self._cleanup_l3_policy(context, l3p_id)
|
|
|
|
def _port_id_to_pt(self, plugin_context, port_id):
|
|
pts = self.gbp_plugin.get_policy_targets(
|
|
plugin_context, {'port_id': [port_id]})
|
|
if pts:
|
|
return pts[0]
|
|
|
|
def _port_id_to_ptg(self, plugin_context, port_id):
|
|
pt = self._port_id_to_pt(plugin_context, port_id)
|
|
if pt:
|
|
return self.gbp_plugin.get_policy_target_group(
|
|
plugin_context, pt['policy_target_group_id']), pt
|
|
return None, None
|
|
|
|
def _network_id_to_l2p(self, context, network_id):
|
|
l2ps = self.gbp_plugin.get_l2_policies(
|
|
context, filters={'network_id': [network_id]})
|
|
for l2p in l2ps:
|
|
if l2p['network_id'] == network_id:
|
|
return l2p
|