diff --git a/neutron/agent/common/utils.py b/neutron/agent/common/utils.py index 0c35b1ffe73..ebc13634750 100644 --- a/neutron/agent/common/utils.py +++ b/neutron/agent/common/utils.py @@ -20,8 +20,8 @@ from oslo_log import log as logging from oslo_utils import timeutils from neutron._i18n import _LE -from neutron.agent.common import config from neutron.common import utils as neutron_utils +from neutron.conf.agent import common as config from neutron.conf.agent.database import agents_db diff --git a/neutron/agent/dhcp_agent.py b/neutron/agent/dhcp_agent.py index ff34405019e..6096a137ba0 100644 --- a/neutron/agent/dhcp_agent.py +++ b/neutron/agent/dhcp_agent.py @@ -19,10 +19,10 @@ import sys from oslo_config import cfg from oslo_service import service -from neutron.agent.common import config from neutron.agent.linux import interface from neutron.common import config as common_config from neutron.common import topics +from neutron.conf.agent import common as config from neutron.conf.agent import dhcp as dhcp_config from neutron.conf.agent.metadata import config as meta_conf from neutron import service as neutron_service diff --git a/neutron/agent/l3_agent.py b/neutron/agent/l3_agent.py index 810bae56f94..0c8c052087a 100644 --- a/neutron/agent/l3_agent.py +++ b/neutron/agent/l3_agent.py @@ -19,13 +19,13 @@ import sys from oslo_config import cfg from oslo_service import service -from neutron.agent.common import config from neutron.agent.linux import external_process from neutron.agent.linux import interface from neutron.agent.linux import pd from neutron.agent.linux import ra from neutron.common import config as common_config from neutron.common import topics +from neutron.conf.agent import common as config from neutron.conf.agent.l3 import config as l3_config from neutron.conf.agent.l3 import ha as ha_conf from neutron.conf.agent.metadata import config as meta_conf diff --git a/neutron/agent/linux/external_process.py b/neutron/agent/linux/external_process.py index 4e4946228d9..dcb36cd9162 100644 --- a/neutron/agent/linux/external_process.py +++ b/neutron/agent/linux/external_process.py @@ -24,10 +24,11 @@ from oslo_utils import fileutils import six from neutron._i18n import _, _LW, _LE -from neutron.agent.common import config as agent_cfg from neutron.agent.linux import ip_lib from neutron.agent.linux import utils +from neutron.conf.agent import common as agent_cfg + LOG = logging.getLogger(__name__) diff --git a/neutron/agent/linux/iptables_manager.py b/neutron/agent/linux/iptables_manager.py index a01803ec3bc..a741087bf0b 100644 --- a/neutron/agent/linux/iptables_manager.py +++ b/neutron/agent/linux/iptables_manager.py @@ -32,11 +32,11 @@ from oslo_utils import excutils import six from neutron._i18n import _, _LE, _LW -from neutron.agent.common import config from neutron.agent.linux import iptables_comments as ic from neutron.agent.linux import utils as linux_utils from neutron.common import exceptions as n_exc from neutron.common import utils +from neutron.conf.agent import common as config LOG = logging.getLogger(__name__) diff --git a/neutron/agent/linux/utils.py b/neutron/agent/linux/utils.py index 65b1d99c60c..b6e16a99eeb 100644 --- a/neutron/agent/linux/utils.py +++ b/neutron/agent/linux/utils.py @@ -34,9 +34,9 @@ from oslo_utils import fileutils from six.moves import http_client as httplib from neutron._i18n import _, _LE -from neutron.agent.common import config from neutron.agent.linux import xenapi_root_helper from neutron.common import utils +from neutron.conf.agent import common as config from neutron import wsgi diff --git a/neutron/agent/metadata_agent.py b/neutron/agent/metadata_agent.py index 74214680c3a..75b2040b896 100644 --- a/neutron/agent/metadata_agent.py +++ b/neutron/agent/metadata_agent.py @@ -17,11 +17,11 @@ import sys from oslo_config import cfg from oslo_log import log as logging -from neutron.agent.common import config as agent_conf from neutron.agent.metadata import agent from neutron.common import cache_utils as cache from neutron.common import config from neutron.common import utils +from neutron.conf.agent import common as agent_conf from neutron.conf.agent.metadata import config as meta LOG = logging.getLogger(__name__) diff --git a/neutron/cmd/netns_cleanup.py b/neutron/cmd/netns_cleanup.py index 1dd391cbd47..d6e660d9ae8 100644 --- a/neutron/cmd/netns_cleanup.py +++ b/neutron/cmd/netns_cleanup.py @@ -24,7 +24,6 @@ from oslo_log import log as logging from oslo_utils import importutils from neutron._i18n import _LE, _LW -from neutron.agent.common import config as agent_config from neutron.agent.common import ovs_lib from neutron.agent.l3 import dvr_fip_ns from neutron.agent.l3 import dvr_snat_ns @@ -36,6 +35,7 @@ from neutron.agent.linux import ip_lib from neutron.agent.linux import utils from neutron.common import config from neutron.conf.agent import cmd +from neutron.conf.agent import common as agent_config from neutron.conf.agent import dhcp as dhcp_config diff --git a/neutron/cmd/ovs_cleanup.py b/neutron/cmd/ovs_cleanup.py index feec533d2d9..34c1887e514 100644 --- a/neutron/cmd/ovs_cleanup.py +++ b/neutron/cmd/ovs_cleanup.py @@ -17,12 +17,12 @@ from oslo_config import cfg from oslo_log import log as logging from neutron._i18n import _LI -from neutron.agent.common import config as agent_config from neutron.agent.common import ovs_lib from neutron.agent.linux import interface from neutron.agent.linux import ip_lib from neutron.common import config from neutron.conf.agent import cmd +from neutron.conf.agent import common as agent_config from neutron.conf.agent.l3 import config as l3_config diff --git a/neutron/agent/common/config.py b/neutron/conf/agent/common.py similarity index 99% rename from neutron/agent/common/config.py rename to neutron/conf/agent/common.py index 9bffe7a76b5..33dedcceded 100644 --- a/neutron/agent/common/config.py +++ b/neutron/conf/agent/common.py @@ -131,7 +131,7 @@ def get_log_args(conf, log_file_name, **kwargs): return cmd_args -def register_root_helper(conf): +def register_root_helper(conf=cfg.CONF): conf.register_opts(ROOT_HELPER_OPTS, 'AGENT') diff --git a/neutron/conf/agent/l3/config.py b/neutron/conf/agent/l3/config.py index 1331fcd648d..3b93f862898 100644 --- a/neutron/conf/agent/l3/config.py +++ b/neutron/conf/agent/l3/config.py @@ -18,7 +18,7 @@ from neutron_lib import constants from oslo_config import cfg from neutron._i18n import _ -from neutron.agent.common import config +from neutron.conf.agent import common as config OPTS = [ diff --git a/neutron/debug/shell.py b/neutron/debug/shell.py index dd4d1c4858a..d60534c994d 100644 --- a/neutron/debug/shell.py +++ b/neutron/debug/shell.py @@ -20,9 +20,9 @@ from oslo_utils import importutils from neutron._i18n import _ from neutron._i18n import _LW -from neutron.agent.common import config from neutron.agent.common import utils from neutron.agent.linux import interface +from neutron.conf.agent import common as config from neutron.debug import debug_agent from neutronclient.common import exceptions as exc from neutronclient import shell diff --git a/neutron/opts.py b/neutron/opts.py index 3cd9caf4548..395c0206dc8 100644 --- a/neutron/opts.py +++ b/neutron/opts.py @@ -17,7 +17,7 @@ import operator from keystoneauth1 import loading as ks_loading from oslo_config import cfg -import neutron.agent.common.config +import neutron.agent.agent_extensions_manager import neutron.agent.linux.interface import neutron.agent.linux.pd import neutron.agent.linux.ra @@ -25,6 +25,7 @@ import neutron.agent.ovsdb.api import neutron.agent.securitygroups_rpc import neutron.common.cache_utils import neutron.conf.agent.agent_extensions_manager +import neutron.conf.agent.common import neutron.conf.agent.dhcp import neutron.conf.agent.l3.config import neutron.conf.agent.l3.ha @@ -80,15 +81,15 @@ def list_agent_opts(): return [ ('agent', itertools.chain( - neutron.agent.common.config.ROOT_HELPER_OPTS, - neutron.agent.common.config.AGENT_STATE_OPTS, - neutron.agent.common.config.IPTABLES_OPTS, - neutron.agent.common.config.PROCESS_MONITOR_OPTS, - neutron.agent.common.config.AVAILABILITY_ZONE_OPTS) + neutron.conf.agent.common.ROOT_HELPER_OPTS, + neutron.conf.agent.common.AGENT_STATE_OPTS, + neutron.conf.agent.common.IPTABLES_OPTS, + neutron.conf.agent.common.PROCESS_MONITOR_OPTS, + neutron.conf.agent.common.AVAILABILITY_ZONE_OPTS) ), ('DEFAULT', itertools.chain( - neutron.agent.common.config.INTERFACE_DRIVER_OPTS, + neutron.conf.agent.common.INTERFACE_DRIVER_OPTS, neutron.conf.agent.metadata.config.SHARED_OPTS) ) ] @@ -154,17 +155,17 @@ def list_base_agent_opts(): ('DEFAULT', itertools.chain( neutron.agent.linux.interface.OPTS, - neutron.agent.common.config.INTERFACE_DRIVER_OPTS, + neutron.conf.agent.common.INTERFACE_DRIVER_OPTS, neutron.conf.agent.ovs_conf.OPTS) ), - ('agent', neutron.agent.common.config.AGENT_STATE_OPTS), + ('agent', neutron.conf.agent.common.AGENT_STATE_OPTS), ('ovs', neutron.agent.ovsdb.api.OPTS), ] def list_az_agent_opts(): return [ - ('agent', neutron.agent.common.config.AVAILABILITY_ZONE_OPTS), + ('agent', neutron.conf.agent.common.AVAILABILITY_ZONE_OPTS), ] @@ -231,7 +232,7 @@ def list_metadata_agent_opts(): meta_conf.UNIX_DOMAIN_METADATA_PROXY_OPTS, neutron.conf.cache_utils.cache_opts) ), - ('agent', neutron.agent.common.config.AGENT_STATE_OPTS) + ('agent', neutron.conf.agent.common.AGENT_STATE_OPTS) ] diff --git a/neutron/plugins/ml2/drivers/agent/config.py b/neutron/plugins/ml2/drivers/agent/config.py index efbdfc758a0..7dc728e46d1 100644 --- a/neutron/plugins/ml2/drivers/agent/config.py +++ b/neutron/plugins/ml2/drivers/agent/config.py @@ -16,7 +16,7 @@ from oslo_config import cfg -from neutron.agent.common import config +from neutron.conf.agent import common as config from neutron.conf.plugins.ml2.drivers import agent agent.register_agent_opts() diff --git a/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py b/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py index 10b3d17dc26..2f967e3882c 100644 --- a/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py +++ b/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py @@ -17,7 +17,7 @@ from oslo_config import cfg from neutron._i18n import _ -from neutron.agent.common import config +from neutron.conf.agent import common as config from neutron.conf.plugins.ml2.drivers.mech_sriov import agent_common as \ agent_common_config diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py b/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py index 366c97fddcf..3ea4f0c3e04 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py @@ -14,7 +14,7 @@ from oslo_config import cfg -from neutron.agent.common import config +from neutron.conf.agent import common as config from neutron.conf.plugins.ml2.drivers import ovs_conf ovs_conf.register_ovs_agent_opts() diff --git a/neutron/services/metering/agents/metering_agent.py b/neutron/services/metering/agents/metering_agent.py index 14a7a1d39bd..a4fcb874c45 100644 --- a/neutron/services/metering/agents/metering_agent.py +++ b/neutron/services/metering/agents/metering_agent.py @@ -26,13 +26,13 @@ from oslo_utils import importutils from oslo_utils import timeutils from neutron._i18n import _, _LE, _LI, _LW -from neutron.agent.common import config from neutron.agent import rpc as agent_rpc from neutron.common import config as common_config from neutron.common import constants as n_const from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils +from neutron.conf.agent import common as config from neutron.conf.services import metering_agent from neutron import manager from neutron import service as neutron_service diff --git a/neutron/services/metering/drivers/iptables/iptables_driver.py b/neutron/services/metering/drivers/iptables/iptables_driver.py index 860fc73a7cc..3c4971b43fb 100644 --- a/neutron/services/metering/drivers/iptables/iptables_driver.py +++ b/neutron/services/metering/drivers/iptables/iptables_driver.py @@ -19,7 +19,6 @@ from oslo_utils import importutils import six from neutron._i18n import _, _LE, _LI -from neutron.agent.common import config from neutron.agent.l3 import dvr_snat_ns from neutron.agent.l3 import namespaces from neutron.agent.linux import interface @@ -27,6 +26,7 @@ from neutron.agent.linux import ip_lib from neutron.agent.linux import iptables_manager from neutron.common import constants from neutron.common import ipv6_utils +from neutron.conf.agent import common as config from neutron.services.metering.drivers import abstract_driver diff --git a/neutron/tests/common/net_helpers.py b/neutron/tests/common/net_helpers.py index 8b63b31d51d..73829413023 100644 --- a/neutron/tests/common/net_helpers.py +++ b/neutron/tests/common/net_helpers.py @@ -33,7 +33,6 @@ from oslo_config import cfg from oslo_utils import uuidutils import six -from neutron.agent.common import config from neutron.agent.common import ovs_lib from neutron.agent.linux import bridge_lib from neutron.agent.linux import interface @@ -41,6 +40,7 @@ from neutron.agent.linux import ip_lib from neutron.agent.linux import iptables_firewall from neutron.agent.linux import utils from neutron.common import utils as common_utils +from neutron.conf.agent import common as config from neutron.db import db_base_plugin_common from neutron.plugins.ml2.drivers.linuxbridge.agent import \ linuxbridge_neutron_agent as linuxbridge_agent diff --git a/neutron/tests/functional/agent/l2/base.py b/neutron/tests/functional/agent/l2/base.py index cf4aac6d1e0..e7373315471 100644 --- a/neutron/tests/functional/agent/l2/base.py +++ b/neutron/tests/functional/agent/l2/base.py @@ -23,12 +23,12 @@ from neutron_lib.utils import net from oslo_config import cfg from oslo_utils import uuidutils -from neutron.agent.common import config as agent_config from neutron.agent.common import ovs_lib from neutron.agent.l2 import l2_agent_extensions_manager as ext_manager from neutron.agent.linux import interface from neutron.agent.linux import polling from neutron.common import utils +from neutron.conf.agent import common as agent_config from neutron.conf import common as common_config from neutron.conf.plugins.ml2.drivers import ovs_conf from neutron.plugins.common import constants as p_const diff --git a/neutron/tests/functional/agent/l3/framework.py b/neutron/tests/functional/agent/l3/framework.py index 27e8b8af2ec..0c41e3c734d 100644 --- a/neutron/tests/functional/agent/l3/framework.py +++ b/neutron/tests/functional/agent/l3/framework.py @@ -25,7 +25,6 @@ from oslo_utils import uuidutils import testtools import textwrap -from neutron.agent.common import config as agent_config from neutron.agent.common import ovs_lib from neutron.agent.l3 import agent as neutron_l3_agent from neutron.agent.l3 import namespaces @@ -35,6 +34,7 @@ from neutron.agent.linux import external_process from neutron.agent.linux import ip_lib from neutron.agent.linux import keepalived from neutron.common import utils as common_utils +from neutron.conf.agent import common as agent_config from neutron.conf import common as common_config from neutron.tests.common import l3_test_common from neutron.tests.common import net_helpers diff --git a/neutron/tests/functional/agent/linux/test_dhcp.py b/neutron/tests/functional/agent/linux/test_dhcp.py index 459e387edb5..009f335fb9b 100644 --- a/neutron/tests/functional/agent/linux/test_dhcp.py +++ b/neutron/tests/functional/agent/linux/test_dhcp.py @@ -15,11 +15,11 @@ import mock from oslo_config import cfg -from neutron.agent.common import config from neutron.agent.linux import dhcp from neutron.agent.linux import interface from neutron.agent.linux import ip_lib from neutron.common import utils as common_utils +from neutron.conf.agent import common as config from neutron.conf.agent import dhcp as dhcp_conf from neutron.conf import common as common_conf from neutron.tests import base as tests_base diff --git a/neutron/tests/functional/agent/linux/test_ip_lib.py b/neutron/tests/functional/agent/linux/test_ip_lib.py index 12222c5f43d..7b6c23dc456 100644 --- a/neutron/tests/functional/agent/linux/test_ip_lib.py +++ b/neutron/tests/functional/agent/linux/test_ip_lib.py @@ -23,10 +23,10 @@ from oslo_log import log as logging from oslo_utils import importutils import testtools -from neutron.agent.common import config from neutron.agent.linux import interface from neutron.agent.linux import ip_lib from neutron.common import utils +from neutron.conf.agent import common as config from neutron.tests.common import net_helpers from neutron.tests.functional import base as functional_base diff --git a/neutron/tests/functional/agent/test_dhcp_agent.py b/neutron/tests/functional/agent/test_dhcp_agent.py index 86780202d5a..f30bb9d308b 100644 --- a/neutron/tests/functional/agent/test_dhcp_agent.py +++ b/neutron/tests/functional/agent/test_dhcp_agent.py @@ -24,7 +24,6 @@ from neutron_lib import constants as lib_const from oslo_config import fixture as fixture_config from oslo_utils import uuidutils -from neutron.agent.common import config from neutron.agent.common import ovs_lib from neutron.agent.dhcp import agent from neutron.agent import dhcp_agent @@ -34,6 +33,7 @@ from neutron.agent.linux import interface from neutron.agent.linux import ip_lib from neutron.agent.linux import utils from neutron.common import utils as common_utils +from neutron.conf.agent import common as config from neutron.tests.common import net_helpers from neutron.tests.functional.agent.linux import helpers from neutron.tests.functional import base diff --git a/neutron/tests/functional/base.py b/neutron/tests/functional/base.py index 2d3e0df4ff1..08d5f58f3ca 100644 --- a/neutron/tests/functional/base.py +++ b/neutron/tests/functional/base.py @@ -17,8 +17,8 @@ import os from oslo_config import cfg -from neutron.agent.common import config from neutron.agent.linux import utils +from neutron.conf.agent import common as config from neutron.tests import base from neutron.tests.common import base as common_base from neutron.tests.common import helpers diff --git a/neutron/tests/unit/agent/common/test_ovs_lib.py b/neutron/tests/unit/agent/common/test_ovs_lib.py index 48eab0f6fb3..fa44ac44285 100644 --- a/neutron/tests/unit/agent/common/test_ovs_lib.py +++ b/neutron/tests/unit/agent/common/test_ovs_lib.py @@ -21,9 +21,9 @@ from oslo_utils import uuidutils import tenacity import testtools -from neutron.agent.common import config from neutron.agent.common import ovs_lib from neutron.agent.common import utils +from neutron.conf.agent import common as config from neutron.plugins.common import constants from neutron.plugins.ml2.drivers.openvswitch.agent.common \ import constants as p_const diff --git a/neutron/tests/unit/agent/common/test_utils.py b/neutron/tests/unit/agent/common/test_utils.py index 12eda7a2a0b..64dc6be22e4 100644 --- a/neutron/tests/unit/agent/common/test_utils.py +++ b/neutron/tests/unit/agent/common/test_utils.py @@ -15,9 +15,9 @@ import mock -from neutron.agent.common import config from neutron.agent.common import utils from neutron.agent.linux import interface +from neutron.conf.agent import common as config from neutron.tests import base from neutron.tests.unit import testlib_api diff --git a/neutron/tests/unit/agent/dhcp/test_agent.py b/neutron/tests/unit/agent/dhcp/test_agent.py index 00cf7513d63..02c32480041 100644 --- a/neutron/tests/unit/agent/dhcp/test_agent.py +++ b/neutron/tests/unit/agent/dhcp/test_agent.py @@ -26,7 +26,6 @@ from oslo_config import cfg import oslo_messaging import testtools -from neutron.agent.common import config from neutron.agent.dhcp import agent as dhcp_agent from neutron.agent import dhcp_agent as entry from neutron.agent.linux import dhcp @@ -35,6 +34,7 @@ from neutron.agent.metadata import driver as metadata_driver from neutron.common import config as common_config from neutron.common import constants as n_const from neutron.common import utils +from neutron.conf.agent import common as config from neutron.conf.agent import dhcp as dhcp_config from neutron.tests import base diff --git a/neutron/tests/unit/agent/l3/test_agent.py b/neutron/tests/unit/agent/l3/test_agent.py index eecb42a5180..ba2f11e5467 100644 --- a/neutron/tests/unit/agent/l3/test_agent.py +++ b/neutron/tests/unit/agent/l3/test_agent.py @@ -30,7 +30,6 @@ from oslo_utils import uuidutils import six from testtools import matchers -from neutron.agent.common import config as agent_config from neutron.agent.l3 import agent as l3_agent from neutron.agent.l3 import dvr_edge_router as dvr_router from neutron.agent.l3 import dvr_snat_ns @@ -49,6 +48,7 @@ from neutron.agent.metadata import driver as metadata_driver from neutron.agent import rpc as agent_rpc from neutron.common import constants as n_const from neutron.common import exceptions as n_exc +from neutron.conf.agent import common as agent_config from neutron.conf.agent.l3 import config as l3_config from neutron.conf.agent.l3 import ha as ha_conf from neutron.conf import common as base_config diff --git a/neutron/tests/unit/agent/l3/test_dvr_local_router.py b/neutron/tests/unit/agent/l3/test_dvr_local_router.py index 0069f09f054..6e6291afc34 100644 --- a/neutron/tests/unit/agent/l3/test_dvr_local_router.py +++ b/neutron/tests/unit/agent/l3/test_dvr_local_router.py @@ -19,7 +19,6 @@ from oslo_config import cfg from oslo_log import log from oslo_utils import uuidutils -from neutron.agent.common import config as agent_config from neutron.agent.l3 import agent as l3_agent from neutron.agent.l3 import dvr_local_router as dvr_router from neutron.agent.l3 import link_local_allocator as lla @@ -29,6 +28,7 @@ from neutron.agent.linux import interface from neutron.agent.linux import ip_lib from neutron.common import constants as n_const from neutron.common import utils as common_utils +from neutron.conf.agent import common as agent_config from neutron.conf.agent.l3 import config as l3_config from neutron.conf.agent.l3 import ha as ha_conf from neutron.conf import common as base_config diff --git a/neutron/tests/unit/agent/l3/test_router_info.py b/neutron/tests/unit/agent/l3/test_router_info.py index 5706dc97bb5..f13773fab7a 100644 --- a/neutron/tests/unit/agent/l3/test_router_info.py +++ b/neutron/tests/unit/agent/l3/test_router_info.py @@ -14,10 +14,10 @@ import mock from neutron_lib import constants as lib_constants from oslo_utils import uuidutils -from neutron.agent.common import config as agent_config from neutron.agent.l3 import router_info from neutron.agent.linux import ip_lib from neutron.common import exceptions as n_exc +from neutron.conf.agent import common as config from neutron.tests import base @@ -28,7 +28,7 @@ class TestRouterInfo(base.BaseTestCase): def setUp(self): super(TestRouterInfo, self).setUp() - conf = agent_config.setup_conf() + conf = config.setup_conf() self.ip_cls_p = mock.patch('neutron.agent.linux.ip_lib.IPWrapper') ip_cls = self.ip_cls_p.start() diff --git a/neutron/tests/unit/agent/linux/test_dhcp.py b/neutron/tests/unit/agent/linux/test_dhcp.py index e2f1c7a75cc..407386ee787 100644 --- a/neutron/tests/unit/agent/linux/test_dhcp.py +++ b/neutron/tests/unit/agent/linux/test_dhcp.py @@ -23,10 +23,10 @@ import oslo_messaging from oslo_utils import fileutils import testtools -from neutron.agent.common import config from neutron.agent.linux import dhcp from neutron.agent.linux import external_process from neutron.common import constants as n_const +from neutron.conf.agent import common as config from neutron.conf.agent import dhcp as dhcp_config from neutron.conf import common as base_config from neutron.extensions import extra_dhcp_opt as edo_ext diff --git a/neutron/tests/unit/agent/linux/test_interface.py b/neutron/tests/unit/agent/linux/test_interface.py index 69d6d4ce233..3c9d3c139d6 100644 --- a/neutron/tests/unit/agent/linux/test_interface.py +++ b/neutron/tests/unit/agent/linux/test_interface.py @@ -16,11 +16,11 @@ import mock from neutron_lib import constants -from neutron.agent.common import config from neutron.agent.common import ovs_lib from neutron.agent.linux import interface from neutron.agent.linux import ip_lib from neutron.agent.linux import utils +from neutron.conf.agent import common as config from neutron.tests import base diff --git a/neutron/tests/unit/agent/linux/test_iptables_firewall.py b/neutron/tests/unit/agent/linux/test_iptables_firewall.py index f7a3a8833fd..06f28e5e0cf 100644 --- a/neutron/tests/unit/agent/linux/test_iptables_firewall.py +++ b/neutron/tests/unit/agent/linux/test_iptables_firewall.py @@ -21,7 +21,6 @@ from oslo_config import cfg import six import testtools -from neutron.agent.common import config as a_cfg from neutron.agent import firewall from neutron.agent.linux import ip_conntrack from neutron.agent.linux import ipset_manager @@ -29,6 +28,7 @@ from neutron.agent.linux import iptables_comments as ic from neutron.agent.linux import iptables_firewall from neutron.common import exceptions as n_exc from neutron.common import utils +from neutron.conf.agent import common as agent_config from neutron.conf.agent import securitygroups_rpc as security_config from neutron.tests import base from neutron.tests.unit.api.v2 import test_base @@ -71,8 +71,8 @@ COMMIT class BaseIptablesFirewallTestCase(base.BaseTestCase): def setUp(self): super(BaseIptablesFirewallTestCase, self).setUp() - cfg.CONF.register_opts(a_cfg.ROOT_HELPER_OPTS, 'AGENT') security_config.register_securitygroups_opts() + agent_config.register_root_helper(cfg.CONF) cfg.CONF.set_override('comment_iptables_rules', False, 'AGENT') self.utils_exec_p = mock.patch( 'neutron.agent.linux.utils.execute') diff --git a/neutron/tests/unit/agent/metadata/test_driver.py b/neutron/tests/unit/agent/metadata/test_driver.py index 05e587d302a..df2dacc8554 100644 --- a/neutron/tests/unit/agent/metadata/test_driver.py +++ b/neutron/tests/unit/agent/metadata/test_driver.py @@ -19,11 +19,11 @@ import mock from oslo_config import cfg from oslo_utils import uuidutils -from neutron.agent.common import config as agent_config from neutron.agent.l3 import agent as l3_agent from neutron.agent.l3 import router_info from neutron.agent.metadata import driver as metadata_driver from neutron.common import constants +from neutron.conf.agent import common as agent_config from neutron.conf.agent.l3 import config as l3_config from neutron.conf.agent.l3 import ha as ha_conf from neutron.conf.agent.metadata import config as meta_conf diff --git a/neutron/tests/unit/conf/agent/__init__.py b/neutron/tests/unit/conf/agent/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/neutron/tests/unit/agent/common/test_config.py b/neutron/tests/unit/conf/agent/test_common.py similarity index 96% rename from neutron/tests/unit/agent/common/test_config.py rename to neutron/tests/unit/conf/agent/test_common.py index b5a580efd24..b5053bf94e2 100644 --- a/neutron/tests/unit/agent/common/test_config.py +++ b/neutron/tests/unit/conf/agent/test_common.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from neutron.agent.common import config +from neutron.conf.agent import common as config from neutron.tests import base diff --git a/neutron/tests/unit/debug/test_commands.py b/neutron/tests/unit/debug/test_commands.py index d564c0ffbe5..2876f503994 100644 --- a/neutron/tests/unit/debug/test_commands.py +++ b/neutron/tests/unit/debug/test_commands.py @@ -18,9 +18,9 @@ import socket import mock from oslo_config import cfg -from neutron.agent.common import config from neutron.agent.linux import interface from neutron.common import config as common_config +from neutron.conf.agent import common as config from neutron.debug import commands from neutron.debug import debug_agent from neutron.extensions import portbindings