diff --git a/neutron_lbaas/__init__.py b/neutron_lbaas/__init__.py index fa7a241e5..e69de29bb 100644 --- a/neutron_lbaas/__init__.py +++ b/neutron_lbaas/__init__.py @@ -1,23 +0,0 @@ -# Copyright 2011 OpenStack Foundation -# 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. - -import gettext -import six - - -if six.PY2: - gettext.install('neutron', unicode=1) -else: - gettext.install('neutron') diff --git a/neutron_lbaas/agent/agent.py b/neutron_lbaas/agent/agent.py index bbcc1bd2a..1ca9204ca 100644 --- a/neutron_lbaas/agent/agent.py +++ b/neutron_lbaas/agent/agent.py @@ -26,6 +26,7 @@ from neutron.common import rpc as n_rpc from oslo_config import cfg from oslo_service import service +from neutron_lbaas._i18n import _ from neutron_lbaas.agent import agent_manager as manager from neutron_lbaas.services.loadbalancer import constants diff --git a/neutron_lbaas/agent/agent_manager.py b/neutron_lbaas/agent/agent_manager.py index af3240fdf..c1796801e 100644 --- a/neutron_lbaas/agent/agent_manager.py +++ b/neutron_lbaas/agent/agent_manager.py @@ -25,7 +25,7 @@ from oslo_service import loopingcall from oslo_service import periodic_task from oslo_utils import importutils -from neutron_lbaas._i18n import _LE, _LI +from neutron_lbaas._i18n import _, _LE, _LI from neutron_lbaas.agent import agent_api from neutron_lbaas.drivers.common import agent_driver_base from neutron_lbaas.services.loadbalancer import constants as lb_const diff --git a/neutron_lbaas/common/keystone.py b/neutron_lbaas/common/keystone.py index 6240e47ed..8d29dcdd4 100644 --- a/neutron_lbaas/common/keystone.py +++ b/neutron_lbaas/common/keystone.py @@ -19,7 +19,7 @@ from oslo_config import cfg from oslo_log import log as logging from oslo_utils import excutils -from neutron_lbaas._i18n import _LE +from neutron_lbaas._i18n import _, _LE LOG = logging.getLogger(__name__) diff --git a/neutron_lbaas/db/loadbalancer/loadbalancer_db.py b/neutron_lbaas/db/loadbalancer/loadbalancer_db.py index e0c04323c..cdc4af6b0 100644 --- a/neutron_lbaas/db/loadbalancer/loadbalancer_db.py +++ b/neutron_lbaas/db/loadbalancer/loadbalancer_db.py @@ -33,7 +33,7 @@ from sqlalchemy import orm from sqlalchemy.orm import exc from sqlalchemy.orm import validates -from neutron_lbaas._i18n import _LE +from neutron_lbaas._i18n import _, _LE from neutron_lbaas.extensions import loadbalancer from neutron_lbaas.services.loadbalancer import constants as lb_const diff --git a/neutron_lbaas/db/loadbalancer/loadbalancer_dbv2.py b/neutron_lbaas/db/loadbalancer/loadbalancer_dbv2.py index 08069fd42..f3a505d97 100644 --- a/neutron_lbaas/db/loadbalancer/loadbalancer_dbv2.py +++ b/neutron_lbaas/db/loadbalancer/loadbalancer_dbv2.py @@ -29,6 +29,7 @@ from oslo_utils import uuidutils from sqlalchemy import orm from sqlalchemy.orm import exc +from neutron_lbaas._i18n import _ from neutron_lbaas import agent_scheduler from neutron_lbaas.db.loadbalancer import models from neutron_lbaas.extensions import loadbalancerv2 diff --git a/neutron_lbaas/db/loadbalancer/models.py b/neutron_lbaas/db/loadbalancer/models.py index 48015c546..80c7c17d6 100644 --- a/neutron_lbaas/db/loadbalancer/models.py +++ b/neutron_lbaas/db/loadbalancer/models.py @@ -22,6 +22,7 @@ import sqlalchemy as sa from sqlalchemy.ext import orderinglist from sqlalchemy import orm +from neutron_lbaas._i18n import _ from neutron_lbaas.services.loadbalancer import constants as lb_const diff --git a/neutron_lbaas/drivers/common/agent_callbacks.py b/neutron_lbaas/drivers/common/agent_callbacks.py index 7704838eb..d58f5f7e6 100644 --- a/neutron_lbaas/drivers/common/agent_callbacks.py +++ b/neutron_lbaas/drivers/common/agent_callbacks.py @@ -18,7 +18,7 @@ from neutron.plugins.common import constants from oslo_log import log as logging import oslo_messaging as messaging -from neutron_lbaas._i18n import _LW +from neutron_lbaas._i18n import _, _LW from neutron_lbaas.db.loadbalancer import loadbalancer_dbv2 from neutron_lbaas.db.loadbalancer import models as db_models from neutron_lbaas.services.loadbalancer import data_models diff --git a/neutron_lbaas/drivers/common/agent_driver_base.py b/neutron_lbaas/drivers/common/agent_driver_base.py index 49492acc8..92b9d0c15 100644 --- a/neutron_lbaas/drivers/common/agent_driver_base.py +++ b/neutron_lbaas/drivers/common/agent_driver_base.py @@ -20,6 +20,7 @@ from oslo_config import cfg import oslo_messaging as messaging from oslo_utils import importutils +from neutron_lbaas._i18n import _ from neutron_lbaas.drivers.common import agent_callbacks from neutron_lbaas.drivers import driver_base from neutron_lbaas.extensions import lbaas_agentschedulerv2 diff --git a/neutron_lbaas/drivers/haproxy/namespace_driver.py b/neutron_lbaas/drivers/haproxy/namespace_driver.py index cdf7313c8..a9086e1dc 100644 --- a/neutron_lbaas/drivers/haproxy/namespace_driver.py +++ b/neutron_lbaas/drivers/haproxy/namespace_driver.py @@ -27,7 +27,7 @@ from oslo_config import cfg from oslo_log import log as logging from oslo_utils import excutils -from neutron_lbaas._i18n import _LI, _LE, _LW +from neutron_lbaas._i18n import _, _LI, _LE, _LW from neutron_lbaas.agent import agent_device_driver from neutron_lbaas.services.loadbalancer import constants as lb_const from neutron_lbaas.services.loadbalancer import data_models diff --git a/neutron_lbaas/drivers/kemptechnologies/config.py b/neutron_lbaas/drivers/kemptechnologies/config.py index 53ce575df..58075c327 100644 --- a/neutron_lbaas/drivers/kemptechnologies/config.py +++ b/neutron_lbaas/drivers/kemptechnologies/config.py @@ -13,6 +13,9 @@ from oslo_config import cfg +from neutron_lbaas._i18n import _ + + KEMP_OPTS = [ cfg.StrOpt('lm_address', default='192.168.0.1', help=_('Management address of the LoadMaster appliance.')), diff --git a/neutron_lbaas/drivers/netscaler/netscaler_driver_v2.py b/neutron_lbaas/drivers/netscaler/netscaler_driver_v2.py index 5ae23bde3..7ae052a76 100644 --- a/neutron_lbaas/drivers/netscaler/netscaler_driver_v2.py +++ b/neutron_lbaas/drivers/netscaler/netscaler_driver_v2.py @@ -23,7 +23,7 @@ from neutron import context as ncontext from neutron.plugins.common import constants from oslo_service import service -from neutron_lbaas._i18n import _LE +from neutron_lbaas._i18n import _, _LE from neutron_lbaas.drivers import driver_base from neutron_lbaas.drivers.driver_mixins import BaseManagerMixin from neutron_lbaas.services.loadbalancer.drivers.netscaler import ncc_client diff --git a/neutron_lbaas/drivers/octavia/driver.py b/neutron_lbaas/drivers/octavia/driver.py index 7fe666365..03435691d 100644 --- a/neutron_lbaas/drivers/octavia/driver.py +++ b/neutron_lbaas/drivers/octavia/driver.py @@ -23,6 +23,7 @@ from oslo_serialization import jsonutils from oslo_utils import excutils import requests +from neutron_lbaas._i18n import _ from neutron_lbaas.common import keystone from neutron_lbaas.drivers import driver_base diff --git a/neutron_lbaas/drivers/radware/base_v2_driver.py b/neutron_lbaas/drivers/radware/base_v2_driver.py index 331f94ba0..2509cfe6c 100644 --- a/neutron_lbaas/drivers/radware/base_v2_driver.py +++ b/neutron_lbaas/drivers/radware/base_v2_driver.py @@ -15,6 +15,7 @@ from oslo_config import cfg from oslo_log import helpers as log_helpers +from neutron_lbaas._i18n import _ from neutron_lbaas.drivers import driver_base diff --git a/neutron_lbaas/extensions/lbaas_agentscheduler.py b/neutron_lbaas/extensions/lbaas_agentscheduler.py index b18a8e3fd..cc7b778fd 100644 --- a/neutron_lbaas/extensions/lbaas_agentscheduler.py +++ b/neutron_lbaas/extensions/lbaas_agentscheduler.py @@ -25,6 +25,7 @@ from neutron.plugins.common import constants as plugin_const from neutron import policy from neutron import wsgi +from neutron_lbaas._i18n import _ from neutron_lbaas.extensions import loadbalancer LOADBALANCER_POOL = 'loadbalancer-pool' diff --git a/neutron_lbaas/extensions/lbaas_agentschedulerv2.py b/neutron_lbaas/extensions/lbaas_agentschedulerv2.py index 7ba5e80ac..e8febbf0d 100644 --- a/neutron_lbaas/extensions/lbaas_agentschedulerv2.py +++ b/neutron_lbaas/extensions/lbaas_agentschedulerv2.py @@ -24,6 +24,7 @@ from neutron.plugins.common import constants as plugin_const from neutron import policy from neutron import wsgi +from neutron_lbaas._i18n import _ from neutron_lbaas.extensions import loadbalancer from neutron_lbaas.extensions import loadbalancerv2 from neutron_lbaas.services.loadbalancer import constants as lb_const diff --git a/neutron_lbaas/extensions/loadbalancer.py b/neutron_lbaas/extensions/loadbalancer.py index 9d93424b5..eb34bc4a2 100644 --- a/neutron_lbaas/extensions/loadbalancer.py +++ b/neutron_lbaas/extensions/loadbalancer.py @@ -26,6 +26,8 @@ from neutron.common import exceptions as nexception from neutron import manager from neutron.plugins.common import constants from neutron.services import service_base + +from neutron_lbaas._i18n import _ from neutron_lbaas.extensions import loadbalancerv2 from neutron_lbaas.services.loadbalancer import constants as lb_const diff --git a/neutron_lbaas/extensions/loadbalancerv2.py b/neutron_lbaas/extensions/loadbalancerv2.py index 4979df6dd..e2d33b3ba 100644 --- a/neutron_lbaas/extensions/loadbalancerv2.py +++ b/neutron_lbaas/extensions/loadbalancerv2.py @@ -29,6 +29,7 @@ from neutron import manager from neutron.plugins.common import constants from neutron.services import service_base +from neutron_lbaas._i18n import _ from neutron_lbaas.services.loadbalancer import constants as lb_const LOADBALANCERV2_PREFIX = "/lbaas" diff --git a/neutron_lbaas/services/loadbalancer/agent/agent.py b/neutron_lbaas/services/loadbalancer/agent/agent.py index 5f2341b36..deb77c6d4 100644 --- a/neutron_lbaas/services/loadbalancer/agent/agent.py +++ b/neutron_lbaas/services/loadbalancer/agent/agent.py @@ -24,6 +24,7 @@ from neutron.common import rpc as n_rpc from oslo_config import cfg from oslo_service import service +from neutron_lbaas._i18n import _ from neutron_lbaas.services.loadbalancer.agent import agent_manager as manager from neutron_lbaas.services.loadbalancer import constants as l_const diff --git a/neutron_lbaas/services/loadbalancer/agent/agent_manager.py b/neutron_lbaas/services/loadbalancer/agent/agent_manager.py index 41e387ccd..f16908675 100644 --- a/neutron_lbaas/services/loadbalancer/agent/agent_manager.py +++ b/neutron_lbaas/services/loadbalancer/agent/agent_manager.py @@ -25,7 +25,7 @@ from oslo_service import loopingcall from oslo_service import periodic_task from oslo_utils import importutils -from neutron_lbaas._i18n import _LE, _LI +from neutron_lbaas._i18n import _, _LE, _LI from neutron_lbaas.services.loadbalancer.agent import agent_api from neutron_lbaas.services.loadbalancer import constants as l_const diff --git a/neutron_lbaas/services/loadbalancer/drivers/common/agent_driver_base.py b/neutron_lbaas/services/loadbalancer/drivers/common/agent_driver_base.py index 8b71f186c..2b7ecfdf4 100644 --- a/neutron_lbaas/services/loadbalancer/drivers/common/agent_driver_base.py +++ b/neutron_lbaas/services/loadbalancer/drivers/common/agent_driver_base.py @@ -26,7 +26,7 @@ from oslo_log import log as logging import oslo_messaging from oslo_utils import importutils -from neutron_lbaas._i18n import _LW +from neutron_lbaas._i18n import _, _LW from neutron_lbaas.db.loadbalancer import loadbalancer_db from neutron_lbaas.extensions import lbaas_agentscheduler from neutron_lbaas.services.loadbalancer import constants as l_const diff --git a/neutron_lbaas/services/loadbalancer/drivers/haproxy/jinja_cfg.py b/neutron_lbaas/services/loadbalancer/drivers/haproxy/jinja_cfg.py index bafee027d..8ec25adad 100644 --- a/neutron_lbaas/services/loadbalancer/drivers/haproxy/jinja_cfg.py +++ b/neutron_lbaas/services/loadbalancer/drivers/haproxy/jinja_cfg.py @@ -21,6 +21,7 @@ from neutron.common import utils as n_utils from neutron.plugins.common import constants as plugin_constants from oslo_config import cfg +from neutron_lbaas._i18n import _ from neutron_lbaas.common import cert_manager from neutron_lbaas.common.tls_utils import cert_parser from neutron_lbaas.services.loadbalancer import constants diff --git a/neutron_lbaas/services/loadbalancer/drivers/haproxy/namespace_driver.py b/neutron_lbaas/services/loadbalancer/drivers/haproxy/namespace_driver.py index b5b2ee644..c91013248 100644 --- a/neutron_lbaas/services/loadbalancer/drivers/haproxy/namespace_driver.py +++ b/neutron_lbaas/services/loadbalancer/drivers/haproxy/namespace_driver.py @@ -26,7 +26,7 @@ from oslo_config import cfg from oslo_log import log as logging from oslo_utils import excutils -from neutron_lbaas._i18n import _LE, _LW +from neutron_lbaas._i18n import _, _LE, _LW from neutron_lbaas.services.loadbalancer.agent import agent_device_driver from neutron_lbaas.services.loadbalancer import constants as lb_const from neutron_lbaas.services.loadbalancer.drivers.haproxy import cfg as hacfg diff --git a/neutron_lbaas/services/loadbalancer/drivers/netscaler/ncc_client.py b/neutron_lbaas/services/loadbalancer/drivers/netscaler/ncc_client.py index 67768838a..eb2abad05 100644 --- a/neutron_lbaas/services/loadbalancer/drivers/netscaler/ncc_client.py +++ b/neutron_lbaas/services/loadbalancer/drivers/netscaler/ncc_client.py @@ -19,7 +19,7 @@ from neutron.common import exceptions as n_exc from oslo_log import log as logging from oslo_serialization import jsonutils -from neutron_lbaas._i18n import _LE, _LI +from neutron_lbaas._i18n import _, _LE, _LI LOG = logging.getLogger(__name__) diff --git a/neutron_lbaas/services/loadbalancer/drivers/netscaler/netscaler_driver.py b/neutron_lbaas/services/loadbalancer/drivers/netscaler/netscaler_driver.py index 149831bc3..4c058860f 100644 --- a/neutron_lbaas/services/loadbalancer/drivers/netscaler/netscaler_driver.py +++ b/neutron_lbaas/services/loadbalancer/drivers/netscaler/netscaler_driver.py @@ -17,7 +17,7 @@ from neutron.plugins.common import constants from oslo_config import cfg from oslo_log import log as logging -from neutron_lbaas._i18n import _LI +from neutron_lbaas._i18n import _, _LI from neutron_lbaas.db.loadbalancer import loadbalancer_db from neutron_lbaas.services.loadbalancer.drivers import abstract_driver from neutron_lbaas.services.loadbalancer.drivers.netscaler import ncc_client diff --git a/neutron_lbaas/services/loadbalancer/drivers/radware/driver.py b/neutron_lbaas/services/loadbalancer/drivers/radware/driver.py index d497a6b95..e903cba44 100644 --- a/neutron_lbaas/services/loadbalancer/drivers/radware/driver.py +++ b/neutron_lbaas/services/loadbalancer/drivers/radware/driver.py @@ -33,7 +33,7 @@ from oslo_serialization import jsonutils from oslo_utils import excutils from six.moves import queue as Queue -from neutron_lbaas._i18n import _LE, _LI, _LW +from neutron_lbaas._i18n import _, _LE, _LI, _LW from neutron_lbaas.db.loadbalancer import loadbalancer_db as lb_db from neutron_lbaas.extensions import loadbalancer from neutron_lbaas.services.loadbalancer.drivers import abstract_driver diff --git a/neutron_lbaas/services/loadbalancer/drivers/radware/exceptions.py b/neutron_lbaas/services/loadbalancer/drivers/radware/exceptions.py index bb16cb755..ea4254c9a 100644 --- a/neutron_lbaas/services/loadbalancer/drivers/radware/exceptions.py +++ b/neutron_lbaas/services/loadbalancer/drivers/radware/exceptions.py @@ -15,6 +15,8 @@ from neutron.common import exceptions +from neutron_lbaas._i18n import _ + class RadwareLBaasException(exceptions.NeutronException): message = _('An unknown exception occurred in Radware LBaaS provider.') diff --git a/neutron_lbaas/tests/tempest/v2/scenario/base.py b/neutron_lbaas/tests/tempest/v2/scenario/base.py index b51732118..cf14d7c95 100644 --- a/neutron_lbaas/tests/tempest/v2/scenario/base.py +++ b/neutron_lbaas/tests/tempest/v2/scenario/base.py @@ -22,6 +22,7 @@ from six.moves.urllib import error from six.moves.urllib import request as urllib2 from tempest_lib import exceptions as lib_exc +from neutron_lbaas._i18n import _ from neutron_lbaas.tests.tempest.lib.common import commands from neutron_lbaas.tests.tempest.lib import config from neutron_lbaas.tests.tempest.lib import exceptions diff --git a/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancer.py b/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancer.py index 9f81b2cdf..414e486e6 100644 --- a/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancer.py +++ b/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancer.py @@ -32,6 +32,7 @@ from neutron.tests.unit.db import test_db_base_plugin_v2 import testtools import webob.exc +from neutron_lbaas._i18n import _ from neutron_lbaas.db.loadbalancer import loadbalancer_db as ldb import neutron_lbaas.extensions from neutron_lbaas.extensions import loadbalancer diff --git a/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py b/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py index 081fd7b3f..65408b61c 100644 --- a/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py +++ b/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py @@ -34,6 +34,7 @@ import testtools import webob.exc from neutron import manager +from neutron_lbaas._i18n import _ from neutron_lbaas.common.cert_manager import cert_manager from neutron_lbaas.common import exceptions from neutron_lbaas.db.loadbalancer import models