Remove code no longer needed now that stable/queens is the oldest supported branch, and enhance compatabilty with newer neutron branches. Highlights include: * Use definitions from neutron_lib where appropriate. * Add gbpservice.neutron.db.api wrapper for definitions in neutron_lib.db.api in stable/rocky and newer that aren't moved yet in stable/queens, so that most DB code can remain unchanged across branches. In particular, this replaces db_api.context_manager.reader with db_api.CONTEXT_READER and db_api.context_manager.writer with db_api.CONTEXT_WRITER. * Eliminate some DeprecationWarning messages, such as those due to 'tenant' being renamed 'project'. * [AIM] Remove validation tool support for migrating SNAT resources from the legacy ACI plugin. * [AIM] Fix make_port_context to use a CONTEXT_WRITER instead of a CONTEXT_READER, since it can call get_network, which uses a CONTEXT_WRITER and transactions cannot be upgraded from read-only to read-write. * [AIM] Change UTs to use make_port_context instead of get_bound_port_context to prevent trying to bind the port if its not already bound. * [AIM] Remove quota-related monkey-patching that is no longer needed due to previous technical debt cleanup. * [AIM] Use the registry.receives decorator instead of calling registry.subscribe. * [AIM] Fix TypeError in _agent_bind_port. * [AIM] Simplify _net_2_epg function in test_apic_aim UT module. Change-Id: I01d57debd6884032267a6b7675883b6d1e61afcc
142 lines
5.5 KiB
Python
142 lines
5.5 KiB
Python
# Copyright (c) 2016 Cisco Systems Inc.
|
|
# 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.
|
|
|
|
from gbpclient.v2_0 import client as gbp_client
|
|
from keystoneclient import auth as ksc_auth
|
|
from keystoneclient import session as ksc_session
|
|
from keystoneclient.v3 import client as ksc_client
|
|
from oslo_config import cfg
|
|
from oslo_log import log as logging
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
# REVISIT(rkukura): We use keystone to get the name of the keystone
|
|
# project owning each neutron resource, which by default, requires
|
|
# admin. If we keep this, we should probably move it to a separate
|
|
# config module. But we should also investigate whether admin is even
|
|
# needed, or if neutron's credentials could somehow be used.
|
|
AUTH_GROUP = 'apic_aim_auth'
|
|
ksc_session.Session.register_conf_options(cfg.CONF, AUTH_GROUP)
|
|
ksc_auth.register_conf_options(cfg.CONF, AUTH_GROUP)
|
|
|
|
|
|
class ProjectDetailsCache(object):
|
|
"""Cache of Keystone project ID to project details mappings."""
|
|
|
|
def __init__(self):
|
|
self.project_details = {}
|
|
self.keystone = None
|
|
self.gbp = None
|
|
self.enable_neutronclient_internal_ep_interface = (
|
|
cfg.CONF.ml2_apic_aim.enable_neutronclient_internal_ep_interface)
|
|
|
|
def _get_keystone_client(self):
|
|
# REVISIT: It seems load_from_conf_options() and
|
|
# keystoneclient auth plugins have been deprecated, and we
|
|
# should use keystoneauth instead.
|
|
LOG.debug("Getting keystone client")
|
|
auth = ksc_auth.load_from_conf_options(cfg.CONF, AUTH_GROUP)
|
|
LOG.debug("Got auth: %s", auth)
|
|
if not auth:
|
|
LOG.warning('No auth_plugin configured in %s',
|
|
AUTH_GROUP)
|
|
session = ksc_session.Session.load_from_conf_options(
|
|
cfg.CONF, AUTH_GROUP, auth=auth)
|
|
LOG.debug("Got session: %s", session)
|
|
self.keystone = ksc_client.Client(session=session)
|
|
LOG.debug("Got keystone client: %s", self.keystone)
|
|
endpoint_type = 'publicURL'
|
|
if self.enable_neutronclient_internal_ep_interface:
|
|
endpoint_type = 'internalURL'
|
|
self.gbp = gbp_client.Client(session=session,
|
|
endpoint_type=endpoint_type)
|
|
LOG.debug("Got gbp client: %s", self.gbp)
|
|
|
|
def ensure_project(self, project_id):
|
|
"""Ensure cache contains mapping for project.
|
|
|
|
:param project_id: ID of the project
|
|
|
|
Ensure that the cache contains a mapping for the project
|
|
identified by project_id. If it is not, Keystone will be
|
|
queried for the current list of projects, and any new mappings
|
|
will be added to the cache. This method should never be called
|
|
inside a transaction with a project_id not already in the
|
|
cache.
|
|
"""
|
|
if project_id and project_id not in self.project_details:
|
|
self.load_projects()
|
|
|
|
def load_projects(self):
|
|
if self.keystone is None:
|
|
self._get_keystone_client()
|
|
LOG.debug("Calling project API")
|
|
projects = self.keystone.projects.list()
|
|
LOG.debug("Received projects: %s", projects)
|
|
for project in projects:
|
|
self.project_details[project.id] = (project.name,
|
|
project.description)
|
|
|
|
def get_project_details(self, project_id):
|
|
"""Get name and descr of project from cache.
|
|
|
|
:param project_id: ID of the project
|
|
|
|
If the cache contains project_id, a tuple with
|
|
project name and description is returned
|
|
else a tuple (None,None) is returned
|
|
"""
|
|
if self.project_details.get(project_id):
|
|
return self.project_details[project_id]
|
|
return ('', '')
|
|
|
|
def update_project_details(self, project_id):
|
|
"""Update project name and description from keystone.
|
|
|
|
:param project_id: ID of the project
|
|
|
|
Get the name and description of the project identified by
|
|
project_id from the keystone. If the value in cache doesn't
|
|
match values in keystone, update the cache and return 1,
|
|
to indicate that cache has been updated
|
|
"""
|
|
if self.keystone is None:
|
|
self._get_keystone_client()
|
|
if self.keystone:
|
|
project = self.keystone.projects.get(project_id)
|
|
if project:
|
|
prj_details = self.get_project_details(project_id)
|
|
if (prj_details[0] != project.name or
|
|
prj_details[1] != project.description):
|
|
self.project_details[project_id] = (
|
|
project.name, project.description)
|
|
LOG.debug("Project updated %s " % (
|
|
str(self.project_details[project_id])))
|
|
return self.project_details[project_id]
|
|
return None
|
|
|
|
def purge_gbp(self, project_id):
|
|
class TempArg(object):
|
|
pass
|
|
|
|
if self.gbp is None:
|
|
self._get_keystone_client()
|
|
if self.gbp:
|
|
LOG.debug("Calling gbp purge() API")
|
|
temp_arg = TempArg()
|
|
temp_arg.tenant = project_id
|
|
self.gbp.purge(temp_arg)
|