diff --git a/placement/db/sqlalchemy/api.py b/placement/db/sqlalchemy/api.py index e4dabb76b..c5bed043c 100644 --- a/placement/db/sqlalchemy/api.py +++ b/placement/db/sqlalchemy/api.py @@ -67,7 +67,7 @@ import nova.conf import nova.context from placement.db.sqlalchemy import models from placement import exception -from nova.i18n import _ +from placement.i18n import _ from placement import safe_utils profiler_sqlalchemy = importutils.try_import('osprofiler.sqlalchemy') diff --git a/placement/db/sqlalchemy/api_migrations/migrate_repo/versions/030_require_cell_setup.py b/placement/db/sqlalchemy/api_migrations/migrate_repo/versions/030_require_cell_setup.py index d49c2a208..f425f3d9b 100644 --- a/placement/db/sqlalchemy/api_migrations/migrate_repo/versions/030_require_cell_setup.py +++ b/placement/db/sqlalchemy/api_migrations/migrate_repo/versions/030_require_cell_setup.py @@ -14,7 +14,7 @@ from oslo_log import log as logging from sqlalchemy import MetaData, Table, func, select from placement import exception -from nova.i18n import _ +from placement.i18n import _ from placement import objects LOG = logging.getLogger(__name__) diff --git a/placement/db/sqlalchemy/migration.py b/placement/db/sqlalchemy/migration.py index b7e2a6a49..4ef88c188 100644 --- a/placement/db/sqlalchemy/migration.py +++ b/placement/db/sqlalchemy/migration.py @@ -27,7 +27,7 @@ from sqlalchemy.sql import null from placement import db_api as placement_db from placement.db.sqlalchemy import api as db_session from placement import exception -from nova.i18n import _ +from placement.i18n import _ INIT_VERSION = {} INIT_VERSION['main'] = 215 diff --git a/placement/db/sqlalchemy/utils.py b/placement/db/sqlalchemy/utils.py index ee5bd6338..acfd43855 100644 --- a/placement/db/sqlalchemy/utils.py +++ b/placement/db/sqlalchemy/utils.py @@ -23,7 +23,7 @@ from sqlalchemy.types import NullType from placement.db.sqlalchemy import api as db from placement import exception -from nova.i18n import _ +from placement.i18n import _ LOG = logging.getLogger(__name__) diff --git a/placement/exception.py b/placement/exception.py index 7973fb28b..dccc53a61 100644 --- a/placement/exception.py +++ b/placement/exception.py @@ -18,7 +18,7 @@ from oslo_log import log as logging -from nova.i18n import _ +from placement.i18n import _ LOG = logging.getLogger(__name__) diff --git a/placement/handler.py b/placement/handler.py index 4ee2980b9..60b9e7e60 100644 --- a/placement/handler.py +++ b/placement/handler.py @@ -40,7 +40,7 @@ from placement.handlers import root from placement.handlers import trait from placement.handlers import usage from placement import util -from nova.i18n import _ +from placement.i18n import _ LOG = logging.getLogger(__name__) diff --git a/placement/handlers/aggregate.py b/placement/handlers/aggregate.py index 770ac3904..9f44cef9d 100644 --- a/placement/handlers/aggregate.py +++ b/placement/handlers/aggregate.py @@ -25,7 +25,7 @@ from placement.policies import aggregate as policies from placement.schemas import aggregate as schema from placement import util from placement import wsgi_wrapper -from nova.i18n import _ +from placement.i18n import _ _INCLUDE_GENERATION_VERSION = (1, 19) diff --git a/placement/handlers/allocation.py b/placement/handlers/allocation.py index 7a4097ec4..b6184a8eb 100644 --- a/placement/handlers/allocation.py +++ b/placement/handlers/allocation.py @@ -30,7 +30,7 @@ from placement.policies import allocation as policies from placement.schemas import allocation as schema from placement import util from placement import wsgi_wrapper -from nova.i18n import _ +from placement.i18n import _ LOG = logging.getLogger(__name__) diff --git a/placement/handlers/allocation_candidate.py b/placement/handlers/allocation_candidate.py index e025b7d87..b70089e0c 100644 --- a/placement/handlers/allocation_candidate.py +++ b/placement/handlers/allocation_candidate.py @@ -28,7 +28,7 @@ from placement.policies import allocation_candidate as \ from placement.schemas import allocation_candidate as schema from placement import util from placement import wsgi_wrapper -from nova.i18n import _ +from placement.i18n import _ def _transform_allocation_requests_dict(alloc_reqs): diff --git a/placement/handlers/inventory.py b/placement/handlers/inventory.py index 1987fb233..100874163 100644 --- a/placement/handlers/inventory.py +++ b/placement/handlers/inventory.py @@ -28,7 +28,7 @@ from placement.schemas import inventory as schema from placement import util from placement import wsgi_wrapper from placement.db import constants as db_const -from nova.i18n import _ +from placement.i18n import _ # NOTE(cdent): We keep our own representation of inventory defaults diff --git a/placement/handlers/reshaper.py b/placement/handlers/reshaper.py index 6571f24fb..25c8cfb16 100644 --- a/placement/handlers/reshaper.py +++ b/placement/handlers/reshaper.py @@ -35,7 +35,7 @@ from placement.schemas import reshaper as schema from placement import util from placement import wsgi_wrapper # TODO(cdent): placement needs its own version of this -from nova.i18n import _ +from placement.i18n import _ @wsgi_wrapper.PlacementWsgify diff --git a/placement/handlers/resource_class.py b/placement/handlers/resource_class.py index 7af6d4b6b..6294c82ee 100644 --- a/placement/handlers/resource_class.py +++ b/placement/handlers/resource_class.py @@ -23,7 +23,7 @@ from placement.policies import resource_class as policies from placement.schemas import resource_class as schema from placement import util from placement import wsgi_wrapper -from nova.i18n import _ +from placement.i18n import _ def _serialize_links(environ, rc): diff --git a/placement/handlers/resource_provider.py b/placement/handlers/resource_provider.py index 585d3620f..042f74828 100644 --- a/placement/handlers/resource_provider.py +++ b/placement/handlers/resource_provider.py @@ -28,7 +28,7 @@ from placement.policies import resource_provider as policies from placement.schemas import resource_provider as rp_schema from placement import util from placement import wsgi_wrapper -from nova.i18n import _ +from placement.i18n import _ def _serialize_links(environ, resource_provider): diff --git a/placement/handlers/trait.py b/placement/handlers/trait.py index caf60e720..89f724e45 100644 --- a/placement/handlers/trait.py +++ b/placement/handlers/trait.py @@ -25,7 +25,7 @@ from placement.policies import trait as policies from placement.schemas import trait as schema from placement import util from placement import wsgi_wrapper -from nova.i18n import _ +from placement.i18n import _ def _normalize_traits_qs_param(qs): diff --git a/placement/handlers/usage.py b/placement/handlers/usage.py index a12c661e4..64f7a57ce 100644 --- a/placement/handlers/usage.py +++ b/placement/handlers/usage.py @@ -23,7 +23,7 @@ from placement.policies import usage as policies from placement.schemas import usage as schema from placement import util from placement import wsgi_wrapper -from nova.i18n import _ +from placement.i18n import _ def _serialize_usages(resource_provider, usage): diff --git a/placement/i18n.py b/placement/i18n.py index a738adaa7..4574496a8 100644 --- a/placement/i18n.py +++ b/placement/i18n.py @@ -20,23 +20,13 @@ See https://docs.openstack.org/oslo.i18n/latest/user/index.html . import oslo_i18n -DOMAIN = 'nova' +DOMAIN = 'placement' _translators = oslo_i18n.TranslatorFactory(domain=DOMAIN) # The primary translation function using the well-known name "_" _ = _translators.primary -# Translators for log levels. -# -# The abbreviated names are meant to reflect the usual use of a short -# name like '_'. The "L" is for "log" and the other letter comes from -# the level. -_LI = _translators.log_info -_LW = _translators.log_warning -_LE = _translators.log_error -_LC = _translators.log_critical - def translate(value, user_locale): return oslo_i18n.translate(value, user_locale) diff --git a/placement/objects/resource_provider.py b/placement/objects/resource_provider.py index c53944942..1975c6298 100644 --- a/placement/objects/resource_provider.py +++ b/placement/objects/resource_provider.py @@ -44,7 +44,7 @@ from placement.objects import project as project_obj from placement.objects import user as user_obj from placement import resource_class_cache as rc_cache from placement.db.sqlalchemy import api_models as models -from nova.i18n import _ +from placement.i18n import _ from placement import rc_fields _TRAIT_TBL = models.Trait.__table__ diff --git a/placement/util.py b/placement/util.py index b6799d674..c4a50d3a9 100644 --- a/placement/util.py +++ b/placement/util.py @@ -32,7 +32,7 @@ import placement.microversion from placement.objects import consumer as consumer_obj from placement.objects import project as project_obj from placement.objects import user as user_obj -from nova.i18n import _ +from placement.i18n import _ CONF = cfg.CONF LOG = logging.getLogger(__name__) diff --git a/placement/utils.py b/placement/utils.py index 498617e73..f31e0352f 100644 --- a/placement/utils.py +++ b/placement/utils.py @@ -53,7 +53,7 @@ from six.moves import reload_module import nova.conf from placement import debugger from placement import exception -from nova.i18n import _, _LE, _LI, _LW +from placement.i18n import _ import nova.network from placement import safe_utils