Move agent cleanup scripts to cmd module
Ensure naming consistency across the various entry points. This patch better separates active elements of Neutron agents from operator's utilities. Along with [1,2,3], this is done to better delineate what the agent module inner boundaries are about. More to follow to finish off the cleanup. [1] https://review.openstack.org/#/c/146024/ [2] https://review.openstack.org/#/c/145979/ [3] https://review.openstack.org/#/c/146239/ Change-Id: I1d2d2938aa7fa1c60e0f0dc70997778a1930efef
This commit is contained in:
parent
efe5e47e03
commit
d05b9790e8
|
@ -16,7 +16,7 @@
|
|||
import mock
|
||||
|
||||
from neutron.agent.linux import interface
|
||||
from neutron.agent import netns_cleanup_util as util
|
||||
from neutron.cmd import netns_cleanup as util
|
||||
from neutron.tests import base
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ import mock
|
|||
|
||||
from neutron.agent.linux import ip_lib
|
||||
from neutron.agent.linux import ovs_lib
|
||||
from neutron.agent import ovs_cleanup_util as util
|
||||
from neutron.cmd import ovs_cleanup as util
|
||||
from neutron.openstack.common import uuidutils
|
||||
from neutron.tests import base
|
||||
|
||||
|
@ -47,7 +47,7 @@ class TestOVSCleanup(base.BaseTestCase):
|
|||
conf.external_network_bridge = 'br-ex'
|
||||
with contextlib.nested(
|
||||
mock.patch('neutron.common.config.setup_logging'),
|
||||
mock.patch('neutron.agent.ovs_cleanup_util.setup_conf',
|
||||
mock.patch('neutron.cmd.ovs_cleanup.setup_conf',
|
||||
return_value=conf),
|
||||
mock.patch('neutron.agent.linux.ovs_lib.get_bridges',
|
||||
return_value=bridges),
|
|
@ -108,12 +108,12 @@ console_scripts =
|
|||
neutron-metadata-agent = neutron.agent.metadata_agent:main
|
||||
neutron-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main
|
||||
neutron-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main
|
||||
neutron-netns-cleanup = neutron.agent.netns_cleanup_util:main
|
||||
neutron-netns-cleanup = neutron.cmd.netns_cleanup:main
|
||||
neutron-ns-metadata-proxy = neutron.agent.metadata.namespace_proxy:main
|
||||
neutron-nsx-manage = neutron.plugins.vmware.shell:main
|
||||
neutron-nvsd-agent = neutron.plugins.oneconvergence.agent.nvsd_neutron_agent:main
|
||||
neutron-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main
|
||||
neutron-ovs-cleanup = neutron.agent.ovs_cleanup_util:main
|
||||
neutron-ovs-cleanup = neutron.cmd.ovs_cleanup:main
|
||||
neutron-restproxy-agent = neutron.plugins.bigswitch.agent.restproxy_agent:main
|
||||
neutron-server = neutron.server:main
|
||||
neutron-rootwrap = oslo.rootwrap.cmd:main
|
||||
|
|
Loading…
Reference in New Issue