From 1d9813765d9d8b159bff73e4117806fa5b1e43be Mon Sep 17 00:00:00 2001 From: Eugene Nikanorov Date: Thu, 13 Jun 2013 13:40:05 +0400 Subject: [PATCH] Rename agent_loadbalancer directory to loadbalancer Rename agent_loadbalancer directory to loadbalancer. and move plugings/services directory one level up. Fix tests and imports accordingly fixes bug 1179276 Change-Id: If9e027b00824d612dfdd03e47efa9c08e419f205 --- quantum/extensions/loadbalancer.py | 2 +- quantum/{plugins => }/services/__init__.py | 0 .../loadbalancer}/__init__.py | 0 .../loadbalancer}/constants.py | 0 .../loadbalancer}/drivers/__init__.py | 0 .../loadbalancer}/drivers/abstract_driver.py | 0 .../loadbalancer}/drivers/haproxy/__init__.py | 0 .../loadbalancer}/drivers/haproxy/agent.py | 2 +- .../loadbalancer}/drivers/haproxy/agent_api.py | 0 .../loadbalancer}/drivers/haproxy/agent_manager.py | 2 +- .../loadbalancer}/drivers/haproxy/cfg.py | 2 +- .../loadbalancer}/drivers/haproxy/namespace_driver.py | 4 +--- .../loadbalancer}/drivers/haproxy/plugin_driver.py | 4 +--- .../loadbalancer}/drivers/noop/__init__.py | 0 .../loadbalancer}/drivers/noop/noop_driver.py | 2 +- .../loadbalancer}/plugin.py | 3 +-- quantum/{plugins => }/services/service_base.py | 0 .../tests/unit/db/loadbalancer/test_db_loadbalancer.py | 4 ++-- quantum/tests/unit/dummy_plugin.py | 2 +- .../{agent_loadbalancer => loadbalancer}/__init__.py | 0 .../driver => loadbalancer/drivers}/__init__.py | 0 .../drivers}/haproxy/__init__.py | 0 .../drivers}/haproxy/test_agent.py | 2 +- .../drivers}/haproxy/test_agent_manager.py | 4 ++-- .../drivers}/haproxy/test_api.py | 2 +- .../drivers}/haproxy/test_cfg.py | 10 +++++----- .../drivers}/haproxy/test_namespace_driver.py | 2 +- .../drivers}/haproxy/test_plugin_driver.py | 2 +- .../loadbalancer}/test_loadbalancer_plugin.py | 0 29 files changed, 22 insertions(+), 27 deletions(-) rename quantum/{plugins => }/services/__init__.py (100%) rename quantum/{plugins/services/agent_loadbalancer => services/loadbalancer}/__init__.py (100%) rename quantum/{plugins/services/agent_loadbalancer => services/loadbalancer}/constants.py (100%) rename quantum/{plugins/services/agent_loadbalancer => services/loadbalancer}/drivers/__init__.py (100%) rename quantum/{plugins/services/agent_loadbalancer => services/loadbalancer}/drivers/abstract_driver.py (100%) rename quantum/{plugins/services/agent_loadbalancer => services/loadbalancer}/drivers/haproxy/__init__.py (100%) rename quantum/{plugins/services/agent_loadbalancer => services/loadbalancer}/drivers/haproxy/agent.py (96%) rename quantum/{plugins/services/agent_loadbalancer => services/loadbalancer}/drivers/haproxy/agent_api.py (100%) rename quantum/{plugins/services/agent_loadbalancer => services/loadbalancer}/drivers/haproxy/agent_manager.py (99%) rename quantum/{plugins/services/agent_loadbalancer => services/loadbalancer}/drivers/haproxy/cfg.py (99%) rename quantum/{plugins/services/agent_loadbalancer => services/loadbalancer}/drivers/haproxy/namespace_driver.py (98%) rename quantum/{plugins/services/agent_loadbalancer => services/loadbalancer}/drivers/haproxy/plugin_driver.py (99%) rename quantum/{plugins/services/agent_loadbalancer => services/loadbalancer}/drivers/noop/__init__.py (100%) rename quantum/{plugins/services/agent_loadbalancer => services/loadbalancer}/drivers/noop/noop_driver.py (97%) rename quantum/{plugins/services/agent_loadbalancer => services/loadbalancer}/plugin.py (98%) rename quantum/{plugins => }/services/service_base.py (100%) rename quantum/tests/unit/services/{agent_loadbalancer => loadbalancer}/__init__.py (100%) rename quantum/tests/unit/services/{agent_loadbalancer/driver => loadbalancer/drivers}/__init__.py (100%) rename quantum/tests/unit/services/{agent_loadbalancer/driver => loadbalancer/drivers}/haproxy/__init__.py (100%) rename quantum/tests/unit/services/{agent_loadbalancer/driver => loadbalancer/drivers}/haproxy/test_agent.py (96%) rename quantum/tests/unit/services/{agent_loadbalancer/driver => loadbalancer/drivers}/haproxy/test_agent_manager.py (98%) rename quantum/tests/unit/services/{agent_loadbalancer/driver => loadbalancer/drivers}/haproxy/test_api.py (98%) rename quantum/tests/unit/services/{agent_loadbalancer/driver => loadbalancer/drivers}/haproxy/test_cfg.py (96%) rename quantum/tests/unit/services/{agent_loadbalancer/driver => loadbalancer/drivers}/haproxy/test_namespace_driver.py (99%) rename quantum/tests/unit/services/{agent_loadbalancer/driver => loadbalancer/drivers}/haproxy/test_plugin_driver.py (99%) rename quantum/tests/unit/{ => services/loadbalancer}/test_loadbalancer_plugin.py (100%) diff --git a/quantum/extensions/loadbalancer.py b/quantum/extensions/loadbalancer.py index 6c7c22b49..7a844523b 100644 --- a/quantum/extensions/loadbalancer.py +++ b/quantum/extensions/loadbalancer.py @@ -25,7 +25,7 @@ from quantum.api.v2 import base from quantum.common import exceptions as qexception from quantum import manager from quantum.plugins.common import constants -from quantum.plugins.services.service_base import ServicePluginBase +from quantum.services.service_base import ServicePluginBase # Loadbalancer Exceptions diff --git a/quantum/plugins/services/__init__.py b/quantum/services/__init__.py similarity index 100% rename from quantum/plugins/services/__init__.py rename to quantum/services/__init__.py diff --git a/quantum/plugins/services/agent_loadbalancer/__init__.py b/quantum/services/loadbalancer/__init__.py similarity index 100% rename from quantum/plugins/services/agent_loadbalancer/__init__.py rename to quantum/services/loadbalancer/__init__.py diff --git a/quantum/plugins/services/agent_loadbalancer/constants.py b/quantum/services/loadbalancer/constants.py similarity index 100% rename from quantum/plugins/services/agent_loadbalancer/constants.py rename to quantum/services/loadbalancer/constants.py diff --git a/quantum/plugins/services/agent_loadbalancer/drivers/__init__.py b/quantum/services/loadbalancer/drivers/__init__.py similarity index 100% rename from quantum/plugins/services/agent_loadbalancer/drivers/__init__.py rename to quantum/services/loadbalancer/drivers/__init__.py diff --git a/quantum/plugins/services/agent_loadbalancer/drivers/abstract_driver.py b/quantum/services/loadbalancer/drivers/abstract_driver.py similarity index 100% rename from quantum/plugins/services/agent_loadbalancer/drivers/abstract_driver.py rename to quantum/services/loadbalancer/drivers/abstract_driver.py diff --git a/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/__init__.py b/quantum/services/loadbalancer/drivers/haproxy/__init__.py similarity index 100% rename from quantum/plugins/services/agent_loadbalancer/drivers/haproxy/__init__.py rename to quantum/services/loadbalancer/drivers/haproxy/__init__.py diff --git a/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/agent.py b/quantum/services/loadbalancer/drivers/haproxy/agent.py similarity index 96% rename from quantum/plugins/services/agent_loadbalancer/drivers/haproxy/agent.py rename to quantum/services/loadbalancer/drivers/haproxy/agent.py index 3aee11b73..c098ef386 100644 --- a/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/agent.py +++ b/quantum/services/loadbalancer/drivers/haproxy/agent.py @@ -23,7 +23,7 @@ from quantum.agent.common import config from quantum.agent.linux import interface from quantum.openstack.common.rpc import service as rpc_service from quantum.openstack.common import service -from quantum.plugins.services.agent_loadbalancer.drivers.haproxy import ( +from quantum.services.loadbalancer.drivers.haproxy import ( agent_manager as manager, plugin_driver ) diff --git a/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/agent_api.py b/quantum/services/loadbalancer/drivers/haproxy/agent_api.py similarity index 100% rename from quantum/plugins/services/agent_loadbalancer/drivers/haproxy/agent_api.py rename to quantum/services/loadbalancer/drivers/haproxy/agent_api.py diff --git a/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/agent_manager.py b/quantum/services/loadbalancer/drivers/haproxy/agent_manager.py similarity index 99% rename from quantum/plugins/services/agent_loadbalancer/drivers/haproxy/agent_manager.py rename to quantum/services/loadbalancer/drivers/haproxy/agent_manager.py index ee35e4e19..f6f129226 100644 --- a/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/agent_manager.py +++ b/quantum/services/loadbalancer/drivers/haproxy/agent_manager.py @@ -25,7 +25,7 @@ from quantum import context from quantum.openstack.common import importutils from quantum.openstack.common import log as logging from quantum.openstack.common import periodic_task -from quantum.plugins.services.agent_loadbalancer.drivers.haproxy import ( +from quantum.services.loadbalancer.drivers.haproxy import ( agent_api, plugin_driver ) diff --git a/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/cfg.py b/quantum/services/loadbalancer/drivers/haproxy/cfg.py similarity index 99% rename from quantum/plugins/services/agent_loadbalancer/drivers/haproxy/cfg.py rename to quantum/services/loadbalancer/drivers/haproxy/cfg.py index c85700493..718a3d4f2 100644 --- a/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/cfg.py +++ b/quantum/services/loadbalancer/drivers/haproxy/cfg.py @@ -22,7 +22,7 @@ from oslo.config import cfg from quantum.agent.linux import utils from quantum.plugins.common import constants as qconstants -from quantum.plugins.services.agent_loadbalancer import constants +from quantum.services.loadbalancer import constants PROTOCOL_MAP = { diff --git a/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/namespace_driver.py b/quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py similarity index 98% rename from quantum/plugins/services/agent_loadbalancer/drivers/haproxy/namespace_driver.py rename to quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py index a9f6a621b..30c556c50 100644 --- a/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/namespace_driver.py +++ b/quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py @@ -25,9 +25,7 @@ from quantum.agent.linux import ip_lib from quantum.agent.linux import utils from quantum.common import exceptions from quantum.openstack.common import log as logging -from quantum.plugins.services.agent_loadbalancer.drivers.haproxy import ( - cfg as hacfg -) +from quantum.services.loadbalancer.drivers.haproxy import cfg as hacfg LOG = logging.getLogger(__name__) NS_PREFIX = 'qlbaas-' diff --git a/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/plugin_driver.py b/quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py similarity index 99% rename from quantum/plugins/services/agent_loadbalancer/drivers/haproxy/plugin_driver.py rename to quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py index 9dd04686c..76426cbbd 100644 --- a/quantum/plugins/services/agent_loadbalancer/drivers/haproxy/plugin_driver.py +++ b/quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py @@ -27,9 +27,7 @@ from quantum.openstack.common import log as logging from quantum.openstack.common import rpc from quantum.openstack.common.rpc import proxy from quantum.plugins.common import constants -from quantum.plugins.services.agent_loadbalancer.drivers import ( - abstract_driver -) +from quantum.services.loadbalancer.drivers import abstract_driver LOG = logging.getLogger(__name__) diff --git a/quantum/plugins/services/agent_loadbalancer/drivers/noop/__init__.py b/quantum/services/loadbalancer/drivers/noop/__init__.py similarity index 100% rename from quantum/plugins/services/agent_loadbalancer/drivers/noop/__init__.py rename to quantum/services/loadbalancer/drivers/noop/__init__.py diff --git a/quantum/plugins/services/agent_loadbalancer/drivers/noop/noop_driver.py b/quantum/services/loadbalancer/drivers/noop/noop_driver.py similarity index 97% rename from quantum/plugins/services/agent_loadbalancer/drivers/noop/noop_driver.py rename to quantum/services/loadbalancer/drivers/noop/noop_driver.py index 44a0a2bf2..5ce2e0a13 100644 --- a/quantum/plugins/services/agent_loadbalancer/drivers/noop/noop_driver.py +++ b/quantum/services/loadbalancer/drivers/noop/noop_driver.py @@ -18,7 +18,7 @@ from quantum.openstack.common import log as logging -from quantum.plugins.services.agent_loadbalancer.drivers import ( +from quantum.services.loadbalancer.drivers import ( abstract_driver ) diff --git a/quantum/plugins/services/agent_loadbalancer/plugin.py b/quantum/services/loadbalancer/plugin.py similarity index 98% rename from quantum/plugins/services/agent_loadbalancer/plugin.py rename to quantum/services/loadbalancer/plugin.py index edaf0a0dc..1f67d62fe 100644 --- a/quantum/plugins/services/agent_loadbalancer/plugin.py +++ b/quantum/services/loadbalancer/plugin.py @@ -25,8 +25,7 @@ from quantum.plugins.common import constants LOG = logging.getLogger(__name__) -DEFAULT_DRIVER = ("quantum.plugins.services.agent_loadbalancer" - ".drivers.haproxy" +DEFAULT_DRIVER = ("quantum.services.loadbalancer.drivers.haproxy" ".plugin_driver.HaproxyOnHostPluginDriver") lbaas_plugin_opts = [ diff --git a/quantum/plugins/services/service_base.py b/quantum/services/service_base.py similarity index 100% rename from quantum/plugins/services/service_base.py rename to quantum/services/service_base.py diff --git a/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py b/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py index f8b360b3f..cd9152920 100644 --- a/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py +++ b/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py @@ -28,7 +28,7 @@ from quantum.db.loadbalancer import loadbalancer_db as ldb import quantum.extensions from quantum.extensions import loadbalancer from quantum.plugins.common import constants -from quantum.plugins.services.agent_loadbalancer import ( +from quantum.services.loadbalancer import ( plugin as loadbalancer_plugin ) from quantum.tests.unit import test_db_plugin @@ -38,7 +38,7 @@ LOG = logging.getLogger(__name__) DB_CORE_PLUGIN_KLASS = 'quantum.db.db_base_plugin_v2.QuantumDbPluginV2' DB_LB_PLUGIN_KLASS = ( - "quantum.plugins.services.agent_loadbalancer." + "quantum.services.loadbalancer." "plugin.LoadBalancerPlugin" ) ROOTDIR = os.path.dirname(__file__) + '../../../..' diff --git a/quantum/tests/unit/dummy_plugin.py b/quantum/tests/unit/dummy_plugin.py index b4bbb01ac..c0e807652 100644 --- a/quantum/tests/unit/dummy_plugin.py +++ b/quantum/tests/unit/dummy_plugin.py @@ -23,7 +23,7 @@ from quantum.extensions import servicetype from quantum import manager from quantum.openstack.common import uuidutils from quantum.plugins.common import constants -from quantum.plugins.services.service_base import ServicePluginBase +from quantum.services.service_base import ServicePluginBase DUMMY_PLUGIN_NAME = "dummy_plugin" diff --git a/quantum/tests/unit/services/agent_loadbalancer/__init__.py b/quantum/tests/unit/services/loadbalancer/__init__.py similarity index 100% rename from quantum/tests/unit/services/agent_loadbalancer/__init__.py rename to quantum/tests/unit/services/loadbalancer/__init__.py diff --git a/quantum/tests/unit/services/agent_loadbalancer/driver/__init__.py b/quantum/tests/unit/services/loadbalancer/drivers/__init__.py similarity index 100% rename from quantum/tests/unit/services/agent_loadbalancer/driver/__init__.py rename to quantum/tests/unit/services/loadbalancer/drivers/__init__.py diff --git a/quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/__init__.py b/quantum/tests/unit/services/loadbalancer/drivers/haproxy/__init__.py similarity index 100% rename from quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/__init__.py rename to quantum/tests/unit/services/loadbalancer/drivers/haproxy/__init__.py diff --git a/quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_agent.py b/quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_agent.py similarity index 96% rename from quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_agent.py rename to quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_agent.py index ad136d5b6..b5a0a0049 100644 --- a/quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_agent.py +++ b/quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_agent.py @@ -20,7 +20,7 @@ import contextlib import mock from oslo.config import cfg -from quantum.plugins.services.agent_loadbalancer.drivers.haproxy import agent +from quantum.services.loadbalancer.drivers.haproxy import agent from quantum.tests import base diff --git a/quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_agent_manager.py b/quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_agent_manager.py similarity index 98% rename from quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_agent_manager.py rename to quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_agent_manager.py index ed5d9ecbf..580857819 100644 --- a/quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_agent_manager.py +++ b/quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_agent_manager.py @@ -20,7 +20,7 @@ import contextlib import mock -from quantum.plugins.services.agent_loadbalancer.drivers.haproxy import ( +from quantum.services.loadbalancer.drivers.haproxy import ( agent_manager as manager ) from quantum.tests import base @@ -147,7 +147,7 @@ class TestManager(base.BaseTestCase): self.mock_importer = mock.patch.object(manager, 'importutils').start() rpc_mock_cls = mock.patch( - 'quantum.plugins.services.agent_loadbalancer.drivers' + 'quantum.services.loadbalancer.drivers' '.haproxy.agent_api.LbaasAgentApi' ).start() diff --git a/quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_api.py b/quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_api.py similarity index 98% rename from quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_api.py rename to quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_api.py index 70521439f..5022727f6 100644 --- a/quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_api.py +++ b/quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_api.py @@ -18,7 +18,7 @@ import mock -from quantum.plugins.services.agent_loadbalancer.drivers.haproxy import ( +from quantum.services.loadbalancer.drivers.haproxy import ( agent_api as api ) from quantum.tests import base diff --git a/quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_cfg.py b/quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_cfg.py similarity index 96% rename from quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_cfg.py rename to quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_cfg.py index 0e6637369..8920d83ac 100644 --- a/quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_cfg.py +++ b/quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_cfg.py @@ -22,20 +22,20 @@ import mock from oslo.config import cfg as config -from quantum.plugins.services.agent_loadbalancer.drivers.haproxy import cfg +from quantum.services.loadbalancer.drivers.haproxy import cfg from quantum.tests import base class TestHaproxyCfg(base.BaseTestCase): def test_save_config(self): with contextlib.nested( - mock.patch('quantum.plugins.services.agent_loadbalancer.' + mock.patch('quantum.services.loadbalancer.' 'drivers.haproxy.cfg._build_global'), - mock.patch('quantum.plugins.services.agent_loadbalancer.' + mock.patch('quantum.services.loadbalancer.' 'drivers.haproxy.cfg._build_defaults'), - mock.patch('quantum.plugins.services.agent_loadbalancer.' + mock.patch('quantum.services.loadbalancer.' 'drivers.haproxy.cfg._build_frontend'), - mock.patch('quantum.plugins.services.agent_loadbalancer.' + mock.patch('quantum.services.loadbalancer.' 'drivers.haproxy.cfg._build_backend'), mock.patch('quantum.agent.linux.utils.replace_file') ) as (b_g, b_d, b_f, b_b, replace): diff --git a/quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_namespace_driver.py b/quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_namespace_driver.py similarity index 99% rename from quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_namespace_driver.py rename to quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_namespace_driver.py index bd201034e..48e3d7df1 100644 --- a/quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_namespace_driver.py +++ b/quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_namespace_driver.py @@ -20,7 +20,7 @@ import contextlib import mock from quantum.common import exceptions -from quantum.plugins.services.agent_loadbalancer.drivers.haproxy import ( +from quantum.services.loadbalancer.drivers.haproxy import ( namespace_driver ) from quantum.tests import base diff --git a/quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_plugin_driver.py b/quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_plugin_driver.py similarity index 99% rename from quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_plugin_driver.py rename to quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_plugin_driver.py index 217da560e..8129f4d86 100644 --- a/quantum/tests/unit/services/agent_loadbalancer/driver/haproxy/test_plugin_driver.py +++ b/quantum/tests/unit/services/loadbalancer/drivers/haproxy/test_plugin_driver.py @@ -24,7 +24,7 @@ from quantum.db.loadbalancer import loadbalancer_db as ldb from quantum import manager from quantum.openstack.common import uuidutils from quantum.plugins.common import constants -from quantum.plugins.services.agent_loadbalancer.drivers.haproxy import ( +from quantum.services.loadbalancer.drivers.haproxy import ( plugin_driver ) from quantum.tests import base diff --git a/quantum/tests/unit/test_loadbalancer_plugin.py b/quantum/tests/unit/services/loadbalancer/test_loadbalancer_plugin.py similarity index 100% rename from quantum/tests/unit/test_loadbalancer_plugin.py rename to quantum/tests/unit/services/loadbalancer/test_loadbalancer_plugin.py -- 2.45.2