diff --git a/neutron/db/_resource_extend.py b/neutron/db/_resource_extend.py deleted file mode 100644 index 496b079ffb5..00000000000 --- a/neutron/db/_resource_extend.py +++ /dev/null @@ -1,27 +0,0 @@ -# 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. - -""" -NOTE: This module shall not be used by external projects. It will be moved - to neutron-lib in due course, and then it can be used from there. -""" - -from neutron_lib.db import resource_extend - - -_resource_extend_functions = resource_extend._resource_extend_functions -_DECORATED_EXTEND_METHODS = resource_extend._DECORATED_EXTEND_METHODS -register_funcs = resource_extend.register_funcs -get_funcs = resource_extend.get_funcs -apply_funcs = resource_extend.apply_funcs -extends = resource_extend.extends -has_resource_extenders = resource_extend.has_resource_extenders diff --git a/neutron/db/address_scope_db.py b/neutron/db/address_scope_db.py index e1631d92423..e502dd37152 100644 --- a/neutron/db/address_scope_db.py +++ b/neutron/db/address_scope_db.py @@ -16,12 +16,12 @@ from neutron_lib.api.definitions import address_scope as apidef from neutron_lib.api.definitions import network as net_def from neutron_lib import constants from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib.db import utils as db_utils from neutron_lib.exceptions import address_scope as api_err from oslo_utils import uuidutils from neutron._i18n import _ -from neutron.db import _resource_extend as resource_extend from neutron.extensions import address_scope as ext_address_scope from neutron.objects import address_scope as obj_addr_scope from neutron.objects import base as base_obj diff --git a/neutron/db/allowedaddresspairs_db.py b/neutron/db/allowedaddresspairs_db.py index 01164229eb5..d38dbdcee62 100644 --- a/neutron/db/allowedaddresspairs_db.py +++ b/neutron/db/allowedaddresspairs_db.py @@ -17,12 +17,12 @@ from neutron_lib.api.definitions import allowedaddresspairs as addr_apidef from neutron_lib.api.definitions import port as port_def from neutron_lib.api import validators from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib.db import utils as db_utils from neutron_lib.exceptions import allowedaddresspairs as addr_exc from neutron_lib.objects import exceptions from neutron.common import utils -from neutron.db import _resource_extend as resource_extend from neutron.objects.port.extensions import (allowedaddresspairs as obj_addr_pair) diff --git a/neutron/db/availability_zone/network.py b/neutron/db/availability_zone/network.py index 1473bcb8d92..14b20cdb7c2 100644 --- a/neutron/db/availability_zone/network.py +++ b/neutron/db/availability_zone/network.py @@ -14,9 +14,9 @@ from neutron_lib.api.definitions import availability_zone as az_def from neutron_lib.api.definitions import network as net_def from neutron_lib.api.validators import availability_zone as az_validator +from neutron_lib.db import resource_extend from neutron_lib.plugins import directory -from neutron.db import _resource_extend as resource_extend from neutron.extensions import network_availability_zone as net_az diff --git a/neutron/db/availability_zone/router.py b/neutron/db/availability_zone/router.py index 9a5f157f9da..2ccc3e9c96c 100644 --- a/neutron/db/availability_zone/router.py +++ b/neutron/db/availability_zone/router.py @@ -17,10 +17,10 @@ from neutron_lib.api import extensions from neutron_lib.callbacks import events from neutron_lib.callbacks import registry from neutron_lib.callbacks import resources +from neutron_lib.db import resource_extend from neutron_lib.plugins import constants from neutron_lib.plugins import directory -from neutron.db import _resource_extend as resource_extend from neutron.db import l3_attrs_db diff --git a/neutron/db/common_db_mixin.py b/neutron/db/common_db_mixin.py index 84288a6d235..b2e7628561d 100644 --- a/neutron/db/common_db_mixin.py +++ b/neutron/db/common_db_mixin.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. +from neutron_lib.db import resource_extend from neutron_lib.db import utils as db_utils from neutron.db import _model_query -from neutron.db import _resource_extend # TODO(HenryG): Deprecate and schedule for removal @@ -25,7 +25,7 @@ class CommonDbMixin(object): @staticmethod def register_dict_extend_funcs(resource, funcs): - _resource_extend.register_funcs(resource, funcs) + resource_extend.register_funcs(resource, funcs) @staticmethod def _model_query(context, model): diff --git a/neutron/db/db_base_plugin_common.py b/neutron/db/db_base_plugin_common.py index 36c427cc96d..c488acf780f 100644 --- a/neutron/db/db_base_plugin_common.py +++ b/neutron/db/db_base_plugin_common.py @@ -24,6 +24,7 @@ from neutron_lib.api.definitions import subnetpool as subnetpool_def from neutron_lib.api import validators from neutron_lib import constants from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib.db import utils as db_utils from neutron_lib import exceptions as n_exc from neutron_lib.utils import net @@ -34,7 +35,6 @@ from sqlalchemy.orm import exc from neutron.common import constants as n_const from neutron.common import exceptions from neutron.db import _model_query as model_query -from neutron.db import _resource_extend as resource_extend from neutron.db import common_db_mixin from neutron.db import models_v2 from neutron.objects import base as base_obj diff --git a/neutron/db/db_base_plugin_v2.py b/neutron/db/db_base_plugin_v2.py index f15a7e71ce8..d41fe6919d7 100644 --- a/neutron/db/db_base_plugin_v2.py +++ b/neutron/db/db_base_plugin_v2.py @@ -27,6 +27,7 @@ from neutron_lib.callbacks import resources from neutron_lib import constants from neutron_lib import context as ctx from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib.db import utils as ndb_utils from neutron_lib import exceptions as exc from neutron_lib.exceptions import l3 as l3_exc @@ -46,7 +47,6 @@ from neutron.common import exceptions as n_exc from neutron.common import ipv6_utils from neutron.common import utils from neutron.db import _model_query as model_query -from neutron.db import _resource_extend as resource_extend from neutron.db import db_base_plugin_common from neutron.db import ipam_pluggable_backend from neutron.db import models_v2 diff --git a/neutron/db/dns_db.py b/neutron/db/dns_db.py index 57b14164fae..b4ccb644d00 100644 --- a/neutron/db/dns_db.py +++ b/neutron/db/dns_db.py @@ -17,13 +17,13 @@ from neutron_lib.api.definitions import dns as dns_apidef from neutron_lib.api.definitions import l3 as l3_apidef from neutron_lib.api import extensions from neutron_lib.api import validators +from neutron_lib.db import resource_extend from neutron_lib import exceptions as n_exc from neutron_lib.exceptions import dns as dns_exc from oslo_config import cfg from oslo_log import log as logging from neutron._i18n import _ -from neutron.db import _resource_extend as resource_extend from neutron.objects import floatingip as fip_obj from neutron.objects import network from neutron.objects import ports as port_obj diff --git a/neutron/db/external_net_db.py b/neutron/db/external_net_db.py index a825fe38964..2c0a593feb2 100644 --- a/neutron/db/external_net_db.py +++ b/neutron/db/external_net_db.py @@ -20,6 +20,7 @@ from neutron_lib.callbacks import events from neutron_lib.callbacks import registry from neutron_lib.callbacks import resources from neutron_lib import constants +from neutron_lib.db import resource_extend from neutron_lib.db import utils as db_utils from neutron_lib import exceptions as n_exc from neutron_lib.exceptions import external_net as extnet_exc @@ -29,7 +30,6 @@ from sqlalchemy.sql import expression as expr from neutron._i18n import _ from neutron.db import _model_query as model_query -from neutron.db import _resource_extend as resource_extend from neutron.db import models_v2 from neutron.extensions import rbac as rbac_ext from neutron.objects import network as net_obj diff --git a/neutron/db/extradhcpopt_db.py b/neutron/db/extradhcpopt_db.py index ce526cef7e1..01d8f1d4512 100644 --- a/neutron/db/extradhcpopt_db.py +++ b/neutron/db/extradhcpopt_db.py @@ -16,8 +16,8 @@ from neutron_lib.api.definitions import extra_dhcp_opt as edo_ext from neutron_lib.api.definitions import port as port_def from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend -from neutron.db import _resource_extend as resource_extend from neutron.objects.port.extensions import extra_dhcp_opt as obj_extra_dhcp diff --git a/neutron/db/extraroute_db.py b/neutron/db/extraroute_db.py index a6c1d06fea8..038acc1583a 100644 --- a/neutron/db/extraroute_db.py +++ b/neutron/db/extraroute_db.py @@ -20,6 +20,7 @@ from neutron_lib.api.definitions import l3 as l3_apidef from neutron_lib.callbacks import events from neutron_lib.callbacks import registry from neutron_lib.callbacks import resources +from neutron_lib.db import resource_extend from neutron_lib.exceptions import extraroute as xroute_exc from neutron_lib.utils import helpers from oslo_config import cfg @@ -28,7 +29,6 @@ from oslo_log import log as logging from neutron._i18n import _ from neutron.common import utils from neutron.conf.db import extraroute_db -from neutron.db import _resource_extend as resource_extend from neutron.db import l3_db from neutron.objects import router as l3_obj diff --git a/neutron/db/l3_attrs_db.py b/neutron/db/l3_attrs_db.py index d31d51c5758..e6d4e298b19 100644 --- a/neutron/db/l3_attrs_db.py +++ b/neutron/db/l3_attrs_db.py @@ -14,10 +14,10 @@ from neutron_lib.api.definitions import l3 as l3_apidef from neutron_lib.api.validators import availability_zone as az_validator +from neutron_lib.db import resource_extend from oslo_config import cfg from neutron._i18n import _ -from neutron.db import _resource_extend as resource_extend from neutron.db.models import l3_attrs diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py index dbec9759c18..aa1049ecf66 100644 --- a/neutron/db/l3_db.py +++ b/neutron/db/l3_db.py @@ -27,6 +27,7 @@ from neutron_lib.callbacks import resources from neutron_lib import constants from neutron_lib import context as n_ctx from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib.db import utils as lib_db_utils from neutron_lib import exceptions as n_exc from neutron_lib.exceptions import l3 as l3_exc @@ -45,7 +46,6 @@ from neutron.common import ipv6_utils from neutron.common import rpc as n_rpc from neutron.common import utils from neutron.db import _model_query as model_query -from neutron.db import _resource_extend as resource_extend from neutron.db import _utils as db_utils from neutron.db.models import l3 as l3_models from neutron.db import models_v2 diff --git a/neutron/db/l3_fip_port_details.py b/neutron/db/l3_fip_port_details.py index 4352544617c..d414f5ed972 100644 --- a/neutron/db/l3_fip_port_details.py +++ b/neutron/db/l3_fip_port_details.py @@ -13,8 +13,7 @@ # from neutron_lib.api.definitions import l3 as l3_apidef - -from neutron.db import _resource_extend as resource_extend +from neutron_lib.db import resource_extend def _make_port_details_dict(port): diff --git a/neutron/db/l3_fip_qos.py b/neutron/db/l3_fip_qos.py index c4fbad0c026..e100fdf3b66 100644 --- a/neutron/db/l3_fip_qos.py +++ b/neutron/db/l3_fip_qos.py @@ -13,9 +13,9 @@ # from neutron_lib.api.definitions import l3 as l3_apidef +from neutron_lib.db import resource_extend from neutron_lib.services.qos import constants as qos_consts -from neutron.db import _resource_extend as resource_extend from neutron.objects.qos import policy as policy_object diff --git a/neutron/db/l3_gateway_ip_qos.py b/neutron/db/l3_gateway_ip_qos.py index be8caabca3b..3fa7bfa547b 100644 --- a/neutron/db/l3_gateway_ip_qos.py +++ b/neutron/db/l3_gateway_ip_qos.py @@ -18,10 +18,10 @@ from neutron_lib.api.definitions import l3 as l3_apidef from neutron_lib.api.definitions import qos_gateway_ip from neutron_lib.api import extensions +from neutron_lib.db import resource_extend from neutron_lib.services.qos import constants as qos_consts from oslo_log import log as logging -from neutron.db import _resource_extend as resource_extend from neutron.db import l3_db from neutron.db import l3_gwmode_db from neutron.objects.qos import policy as policy_object diff --git a/neutron/db/l3_gwmode_db.py b/neutron/db/l3_gwmode_db.py index 31242815536..925465ff779 100644 --- a/neutron/db/l3_gwmode_db.py +++ b/neutron/db/l3_gwmode_db.py @@ -17,12 +17,12 @@ from neutron_lib.api.definitions import l3 as l3_apidef from neutron_lib.callbacks import events from neutron_lib.callbacks import registry from neutron_lib.callbacks import resources +from neutron_lib.db import resource_extend from oslo_config import cfg import sqlalchemy as sa from sqlalchemy import sql from neutron.conf.db import l3_gwmode_db -from neutron.db import _resource_extend as resource_extend from neutron.db import l3_db from neutron.db.models import l3 as l3_models diff --git a/neutron/db/portbindings_base.py b/neutron/db/portbindings_base.py index 58c6243645d..3d4c7c1ee7d 100644 --- a/neutron/db/portbindings_base.py +++ b/neutron/db/portbindings_base.py @@ -14,10 +14,9 @@ # under the License. from neutron_lib.api.definitions import port as port_def +from neutron_lib.db import resource_extend from neutron_lib.plugins import directory -from neutron.db import _resource_extend as resource_extend - @resource_extend.has_resource_extenders class PortBindingBaseMixin(object): diff --git a/neutron/db/portbindings_db.py b/neutron/db/portbindings_db.py index 5e7f8af7716..ecfaaba9f88 100644 --- a/neutron/db/portbindings_db.py +++ b/neutron/db/portbindings_db.py @@ -17,10 +17,10 @@ from neutron_lib.api.definitions import port as port_def from neutron_lib.api.definitions import portbindings from neutron_lib.api import validators from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib.plugins import directory from neutron.db import _model_query as model_query -from neutron.db import _resource_extend as resource_extend from neutron.db.models import portbinding as pmodels from neutron.db import models_v2 from neutron.db import portbindings_base diff --git a/neutron/db/portsecurity_db.py b/neutron/db/portsecurity_db.py index aa95acf4b66..626b0ffb504 100644 --- a/neutron/db/portsecurity_db.py +++ b/neutron/db/portsecurity_db.py @@ -16,10 +16,10 @@ from neutron_lib.api.definitions import network as net_def from neutron_lib.api.definitions import port as port_def from neutron_lib.api.definitions import port_security as psec from neutron_lib.api import validators +from neutron_lib.db import resource_extend from neutron_lib.plugins import directory from neutron_lib.utils import net -from neutron.db import _resource_extend as resource_extend from neutron.db import portsecurity_db_common diff --git a/neutron/db/securitygroups_db.py b/neutron/db/securitygroups_db.py index 3b8e0131192..9116df6ec2b 100644 --- a/neutron/db/securitygroups_db.py +++ b/neutron/db/securitygroups_db.py @@ -21,6 +21,7 @@ from neutron_lib.callbacks import registry from neutron_lib.callbacks import resources from neutron_lib import constants from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib.db import utils as db_utils from neutron_lib import exceptions as n_exc from neutron_lib.utils import helpers @@ -33,7 +34,6 @@ from neutron._i18n import _ from neutron.common import constants as n_const from neutron.common import utils from neutron.db import _model_query as model_query -from neutron.db import _resource_extend as resource_extend from neutron.db.models import securitygroup as sg_models from neutron.extensions import securitygroup as ext_sg from neutron.objects import base as base_obj diff --git a/neutron/db/standardattrdescription_db.py b/neutron/db/standardattrdescription_db.py index f2294dea933..0cf18a55721 100644 --- a/neutron/db/standardattrdescription_db.py +++ b/neutron/db/standardattrdescription_db.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from neutron.db import _resource_extend as resource_extend +from neutron_lib.db import resource_extend + from neutron.db import standard_attr diff --git a/neutron/db/subnet_service_type_mixin.py b/neutron/db/subnet_service_type_mixin.py index 4bd52a1371f..56051e45144 100644 --- a/neutron/db/subnet_service_type_mixin.py +++ b/neutron/db/subnet_service_type_mixin.py @@ -14,8 +14,7 @@ # under the License. from neutron_lib.api.definitions import subnet as subnet_def - -from neutron.db import _resource_extend as resource_extend +from neutron_lib.db import resource_extend @resource_extend.has_resource_extenders diff --git a/neutron/db/vlantransparent_db.py b/neutron/db/vlantransparent_db.py index 066371027aa..cca7a9bea8c 100644 --- a/neutron/db/vlantransparent_db.py +++ b/neutron/db/vlantransparent_db.py @@ -14,8 +14,7 @@ from neutron_lib.api.definitions import network as net_def from neutron_lib.api.definitions import vlantransparent as vlan_apidef - -from neutron.db import _resource_extend as resource_extend +from neutron_lib.db import resource_extend @resource_extend.has_resource_extenders diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py index 83861db4437..4f05cb5890d 100644 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@ -36,6 +36,7 @@ from neutron_lib.callbacks import registry from neutron_lib.callbacks import resources from neutron_lib import constants as const from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib.db import utils as db_utils from neutron_lib import exceptions as exc from neutron_lib.exceptions import allowedaddresspairs as addr_exc @@ -70,7 +71,6 @@ from neutron.common import exceptions as n_exc from neutron.common import rpc as n_rpc from neutron.common import utils from neutron.db import _model_query as model_query -from neutron.db import _resource_extend as resource_extend from neutron.db import address_scope_db from neutron.db import agents_db from neutron.db import agentschedulers_db diff --git a/neutron/services/auto_allocate/db.py b/neutron/services/auto_allocate/db.py index 49c42075022..41c5b98dc3b 100644 --- a/neutron/services/auto_allocate/db.py +++ b/neutron/services/auto_allocate/db.py @@ -21,6 +21,7 @@ from neutron_lib.callbacks import events from neutron_lib.callbacks import registry from neutron_lib.callbacks import resources from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib.db import utils as db_utils from neutron_lib import exceptions as n_exc from neutron_lib.objects import exceptions as obj_exc @@ -31,7 +32,6 @@ from oslo_log import log as logging from neutron._i18n import _ from neutron.common import exceptions as c_exc -from neutron.db import _resource_extend as resource_extend from neutron.db import common_db_mixin from neutron.objects import auto_allocate as auto_allocate_obj from neutron.objects import base as base_obj diff --git a/neutron/services/l3_router/l3_router_plugin.py b/neutron/services/l3_router/l3_router_plugin.py index be15b4cc340..c6cb74fc13b 100644 --- a/neutron/services/l3_router/l3_router_plugin.py +++ b/neutron/services/l3_router/l3_router_plugin.py @@ -16,6 +16,7 @@ from neutron_lib.agent import topics from neutron_lib.api.definitions import l3 as l3_apidef from neutron_lib import constants as n_const +from neutron_lib.db import resource_extend from neutron_lib.plugins import constants as plugin_constants from neutron_lib.services import base as service_base from oslo_config import cfg @@ -26,7 +27,6 @@ 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 rpc as n_rpc -from neutron.db import _resource_extend as resource_extend from neutron.db import common_db_mixin from neutron.db import dns_db from neutron.db import extraroute_db diff --git a/neutron/services/portforwarding/pf_plugin.py b/neutron/services/portforwarding/pf_plugin.py index 96f3e3bb962..b52ec6358de 100644 --- a/neutron/services/portforwarding/pf_plugin.py +++ b/neutron/services/portforwarding/pf_plugin.py @@ -24,6 +24,7 @@ from neutron_lib.callbacks import registry from neutron_lib.callbacks import resources from neutron_lib import constants as lib_consts from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib.db import utils as db_utils from neutron_lib import exceptions as lib_exc from neutron_lib.exceptions import l3 as lib_l3_exc @@ -36,7 +37,6 @@ from neutron._i18n import _ from neutron.api.rpc.callbacks import events as rpc_events from neutron.api.rpc.handlers import resources_rpc from neutron.common import utils -from neutron.db import _resource_extend as resource_extend from neutron.db import db_base_plugin_common from neutron.db import l3_dvr_db from neutron.extensions import floating_ip_port_forwarding as fip_pf diff --git a/neutron/services/qos/qos_plugin.py b/neutron/services/qos/qos_plugin.py index 82fa3364580..d9bc59e9da4 100644 --- a/neutron/services/qos/qos_plugin.py +++ b/neutron/services/qos/qos_plugin.py @@ -24,13 +24,13 @@ from neutron_lib.callbacks import resources as callbacks_resources from neutron_lib import constants as nl_constants from neutron_lib import context from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib import exceptions as lib_exc from neutron_lib.placement import constants as pl_constants from neutron_lib.placement import utils as pl_utils from neutron_lib.services.qos import constants as qos_consts from neutron.common import exceptions as n_exc -from neutron.db import _resource_extend as resource_extend from neutron.db import db_base_plugin_common from neutron.extensions import qos from neutron.objects import base as base_obj diff --git a/neutron/services/revisions/revision_plugin.py b/neutron/services/revisions/revision_plugin.py index 4a63e9fc36c..b56f52871d0 100644 --- a/neutron/services/revisions/revision_plugin.py +++ b/neutron/services/revisions/revision_plugin.py @@ -12,6 +12,7 @@ # under the License. from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib.services import base as service_base from oslo_log import log as logging import sqlalchemy @@ -20,7 +21,6 @@ from sqlalchemy.orm import session as se import webob.exc from neutron._i18n import _ -from neutron.db import _resource_extend as resource_extend from neutron.db import standard_attr LOG = logging.getLogger(__name__) diff --git a/neutron/services/segments/db.py b/neutron/services/segments/db.py index cca4ccadd64..0ab163d3ad3 100644 --- a/neutron/services/segments/db.py +++ b/neutron/services/segments/db.py @@ -19,6 +19,7 @@ from neutron_lib.callbacks import registry from neutron_lib.callbacks import resources from neutron_lib import constants from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib.db import utils as db_utils from neutron_lib import exceptions as n_exc from neutron_lib.plugins import directory @@ -28,7 +29,6 @@ from oslo_db import exception as db_exc from oslo_log import helpers as log_helpers from oslo_utils import uuidutils -from neutron.db import _resource_extend as resource_extend from neutron.db import common_db_mixin from neutron.db import segments_db as db from neutron.extensions import segment as extension diff --git a/neutron/services/segments/plugin.py b/neutron/services/segments/plugin.py index c36dab12796..b5368b2ea2a 100644 --- a/neutron/services/segments/plugin.py +++ b/neutron/services/segments/plugin.py @@ -28,6 +28,7 @@ from neutron_lib.callbacks import events from neutron_lib.callbacks import registry from neutron_lib.callbacks import resources from neutron_lib import constants +from neutron_lib.db import resource_extend from neutron_lib.exceptions import placement as placement_exc from neutron_lib.placement import client as placement_client from neutron_lib.plugins import directory @@ -38,7 +39,6 @@ from oslo_log import log from oslo_utils import excutils from neutron._i18n import _ -from neutron.db import _resource_extend as resource_extend from neutron.extensions import segment from neutron.notifiers import batch_notifier from neutron.objects import network as net_obj diff --git a/neutron/services/tag/tag_plugin.py b/neutron/services/tag/tag_plugin.py index 909e8d4d962..6f92e1f5cf1 100644 --- a/neutron/services/tag/tag_plugin.py +++ b/neutron/services/tag/tag_plugin.py @@ -13,13 +13,13 @@ # from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib.objects import exceptions as obj_exc from neutron_lib.plugins import directory from oslo_log import helpers as log_helpers from sqlalchemy.orm import exc from neutron.db import _model_query as model_query -from neutron.db import _resource_extend as resource_extend from neutron.db import common_db_mixin from neutron.db import standard_attr from neutron.extensions import tagging diff --git a/neutron/services/timestamp/timestamp_db.py b/neutron/services/timestamp/timestamp_db.py index d6604354e90..f3436b4e911 100644 --- a/neutron/services/timestamp/timestamp_db.py +++ b/neutron/services/timestamp/timestamp_db.py @@ -13,12 +13,12 @@ # under the License. from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib import exceptions as n_exc from oslo_utils import timeutils from sqlalchemy.orm import session as se from neutron.db import _model_query as model_query -from neutron.db import _resource_extend as resource_extend from neutron.db import standard_attr CHANGED_SINCE = 'changed_since' diff --git a/neutron/services/trunk/plugin.py b/neutron/services/trunk/plugin.py index ad31281df4f..c510b88c903 100644 --- a/neutron/services/trunk/plugin.py +++ b/neutron/services/trunk/plugin.py @@ -21,12 +21,12 @@ from neutron_lib.callbacks import registry from neutron_lib.callbacks import resources from neutron_lib import context from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib.plugins import directory from neutron_lib.services import base as service_base from oslo_log import log as logging from oslo_utils import uuidutils -from neutron.db import _resource_extend as resource_extend from neutron.db import common_db_mixin from neutron.db import db_base_plugin_common from neutron.objects import base as objects_base diff --git a/neutron/tests/functional/db/test_network.py b/neutron/tests/functional/db/test_network.py index 6e880d9dc44..efeb133a9b7 100644 --- a/neutron/tests/functional/db/test_network.py +++ b/neutron/tests/functional/db/test_network.py @@ -14,11 +14,11 @@ import mock from neutron_lib.api.definitions import external_net as extnet_apidef from neutron_lib import constants from neutron_lib import context +from neutron_lib.db import resource_extend from neutron_lib import exceptions as n_exc from oslo_config import cfg from oslo_utils import uuidutils -from neutron.db import _resource_extend as resource_extend from neutron.objects import network as network_obj from neutron.plugins.ml2 import plugin as ml2_plugin from neutron.tests.unit import testlib_api diff --git a/neutron/tests/unit/extensions/test_data_plane_status.py b/neutron/tests/unit/extensions/test_data_plane_status.py index 593fc0454cf..5da30eea977 100644 --- a/neutron/tests/unit/extensions/test_data_plane_status.py +++ b/neutron/tests/unit/extensions/test_data_plane_status.py @@ -17,9 +17,9 @@ from webob import exc as web_exc from neutron_lib.api.definitions import data_plane_status as dps_lib from neutron_lib.api.definitions import port as port_def from neutron_lib import constants +from neutron_lib.db import resource_extend from neutron_lib.tests.unit import fake_notifier -from neutron.db import _resource_extend as resource_extend from neutron.db import data_plane_status_db as dps_db from neutron.db import db_base_plugin_v2 from neutron.extensions import data_plane_status as dps_ext diff --git a/neutron/tests/unit/extensions/test_l3.py b/neutron/tests/unit/extensions/test_l3.py index 71d95fac7e1..80cea3fb6de 100644 --- a/neutron/tests/unit/extensions/test_l3.py +++ b/neutron/tests/unit/extensions/test_l3.py @@ -28,6 +28,7 @@ from neutron_lib.callbacks import registry from neutron_lib.callbacks import resources from neutron_lib import constants as lib_constants from neutron_lib import context +from neutron_lib.db import resource_extend from neutron_lib import exceptions as n_exc from neutron_lib.exceptions import l3 as l3_exc from neutron_lib.plugins import constants as plugin_constants @@ -42,7 +43,6 @@ from webob import exc from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api from neutron.api.rpc.handlers import l3_rpc -from neutron.db import _resource_extend as resource_extend from neutron.db import common_db_mixin from neutron.db import db_base_plugin_v2 from neutron.db import dns_db diff --git a/neutron/tests/unit/extensions/test_uplink_status_propagation.py b/neutron/tests/unit/extensions/test_uplink_status_propagation.py index 825b4f5f646..d57ea3d9e1c 100644 --- a/neutron/tests/unit/extensions/test_uplink_status_propagation.py +++ b/neutron/tests/unit/extensions/test_uplink_status_propagation.py @@ -12,8 +12,8 @@ import ddt from neutron_lib.api.definitions import uplink_status_propagation as apidef +from neutron_lib.db import resource_extend -from neutron.db import _resource_extend as resource_extend from neutron.db import db_base_plugin_v2 from neutron.db import uplink_status_propagation_db as usp_db from neutron.tests.unit.db import test_db_base_plugin_v2