Explicitly import _() in Cinder code

To ensure that logs are properly translated and logged to
the Cinder log files (using the Cinder message catalogs)
we need to explicitly import _() in any python files that
use the _() function.

Closes-bug: 1306275
Related-Blueprint: i18n-enablement
Change-Id: I3cf1f1d63d5f8bd8ffd007104691f914e3fd8538

cinder/api/auth.py

@@ -15,6 +15,7 @@
 #    under the License.
 
 from cinder.api.middleware import auth
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 

cinder/api/common.py

@@ -23,6 +23,7 @@ import webob
 
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import utils
 

cinder/api/contrib/admin_actions.py

@@ -19,6 +19,7 @@ from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder import db
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import strutils
 from cinder import rpc

cinder/api/contrib/backups.py

@@ -26,6 +26,7 @@ from cinder.api.views import backups as backup_views
 from cinder.api import xmlutil
 from cinder import backup as backupAPI
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import utils
 

cinder/api/contrib/extended_snapshot_attributes.py

@@ -21,6 +21,7 @@ from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import volume
 

cinder/api/contrib/hosts.py

@@ -25,6 +25,7 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import db
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder import utils

cinder/api/contrib/qos_specs_manage.py

@@ -23,6 +23,7 @@ from cinder.api.openstack import wsgi
 from cinder.api.views import qos_specs as view_qos_specs
 from cinder.api import xmlutil
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import strutils
 from cinder import rpc

cinder/api/contrib/quota_classes.py

@@ -20,6 +20,7 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import db
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder import quota
 
 

cinder/api/contrib/scheduler_hints.py

@@ -17,6 +17,7 @@ import webob.exc
 from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder.api.v2 import volumes
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

cinder/api/contrib/services.py

@@ -22,6 +22,7 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import db
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder import utils

cinder/api/contrib/snapshot_actions.py

@@ -17,6 +17,7 @@ import webob
 from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder import db
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

cinder/api/contrib/types_extra_specs.py

@@ -23,6 +23,7 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import db
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder import rpc
 from cinder.volume import volume_types
 

cinder/api/contrib/types_manage.py

@@ -23,6 +23,7 @@ from cinder.api.openstack import wsgi
 from cinder.api.v1 import types
 from cinder.api.views import types as views_types
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder import rpc
 from cinder.volume import volume_types
 

cinder/api/contrib/volume_actions.py

@@ -20,6 +20,7 @@ from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import strutils
 from cinder import utils

cinder/api/contrib/volume_manage.py

@@ -20,6 +20,7 @@ from cinder.api.openstack import wsgi
 from cinder.api.v2.views import volumes as volume_views
 from cinder.api.v2 import volumes
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import uuidutils
 from cinder import utils

cinder/api/contrib/volume_transfer.py

@@ -23,6 +23,7 @@ from cinder.api.views import transfers as transfer_view
 from cinder.api import xmlutil
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import transfer as transferAPI
 from cinder import utils

cinder/api/contrib/volume_type_encryption.py

@@ -22,6 +22,7 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import db
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder import rpc
 from cinder.volume import volume_types
 

cinder/api/contrib/volume_unmanage.py

@@ -18,6 +18,7 @@ from webob import exc
 from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import volume
 

cinder/api/extensions.py

@@ -24,6 +24,7 @@ import cinder.api.openstack
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 import cinder.policy

cinder/api/middleware/fault.py

@@ -19,6 +19,7 @@ import webob.exc
 
 from cinder.api.openstack import wsgi
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder import wsgi as base_wsgi

cinder/api/middleware/sizelimit.py

@@ -21,6 +21,7 @@ from oslo.config import cfg
 import webob.dec
 import webob.exc
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import wsgi
 

cinder/api/openstack/__init__.py

@@ -21,6 +21,7 @@ WSGI middleware for OpenStack API controllers.
 import routes
 
 from cinder.api.openstack import wsgi
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import wsgi as base_wsgi
 

cinder/api/openstack/urlmap.py

@@ -15,6 +15,7 @@
 #    under the License.
 
 from cinder.api import urlmap
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 

cinder/api/openstack/volume/__init__.py

@@ -15,6 +15,7 @@
 #    under the License.
 
 from cinder.api.v1.router import APIRouter as v1_router
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

cinder/api/openstack/volume/versions.py

@@ -15,6 +15,7 @@
 #    under the License.
 
 from cinder.api import versions
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 

cinder/api/openstack/wsgi.py

@@ -26,6 +26,7 @@ from xml.parsers import expat
 
 from cinder import exception
 from cinder.openstack.common import gettextutils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder import utils

cinder/api/sizelimit.py

@@ -15,6 +15,7 @@
 #    under the License.
 
 from cinder.api.middleware import sizelimit
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

cinder/api/v1/snapshot_metadata.py

@@ -18,6 +18,7 @@ import webob
 from cinder.api import common
 from cinder.api.openstack import wsgi
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder import volume
 from webob import exc
 

cinder/api/v1/snapshots.py

@@ -22,6 +22,7 @@ from cinder.api import common
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import strutils
 from cinder import utils

cinder/api/v1/volume_metadata.py

@@ -18,6 +18,7 @@ import webob
 from cinder.api import common
 from cinder.api.openstack import wsgi
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder import volume
 from webob import exc
 

cinder/api/v1/volumes.py

@@ -23,6 +23,7 @@ from cinder.api import common
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import uuidutils
 from cinder import utils

cinder/api/v2/limits.py

@@ -30,6 +30,7 @@ import webob.exc
 from cinder.api.openstack import wsgi
 from cinder.api.views import limits as limits_views
 from cinder.api import xmlutil
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import jsonutils
 from cinder import quota

cinder/api/v2/snapshot_metadata.py

@@ -18,6 +18,7 @@ import webob
 from cinder.api import common
 from cinder.api.openstack import wsgi
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder import volume
 from webob import exc
 

cinder/api/v2/snapshots.py

@@ -22,6 +22,7 @@ from cinder.api import common
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import strutils
 from cinder import utils

cinder/api/v2/types.py

@@ -21,6 +21,7 @@ from cinder.api.openstack import wsgi
 from cinder.api.views import types as views_types
 from cinder.api import xmlutil
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.volume import volume_types
 
 

cinder/api/v2/volume_metadata.py

@@ -18,6 +18,7 @@ import webob
 from cinder.api import common
 from cinder.api.openstack import wsgi
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder import volume
 
 

cinder/api/v2/volumes.py

@@ -25,6 +25,7 @@ from cinder.api.openstack import wsgi
 from cinder.api.v2.views import volumes as volume_views
 from cinder.api import xmlutil
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import uuidutils
 from cinder import utils

cinder/api/xmlutil.py

@@ -17,6 +17,7 @@ import os.path
 
 from lxml import etree
 
+from cinder.openstack.common.gettextutils import _
 from cinder import utils
 
 

cinder/backup/api.py

@@ -26,6 +26,7 @@ from cinder.backup import rpcapi as backup_rpcapi
 from cinder import context
 from cinder.db import base
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import utils
 

cinder/backup/driver.py

@@ -17,6 +17,7 @@
 
 from cinder.db import base
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from oslo.config import cfg

cinder/backup/drivers/ceph.py

@@ -54,6 +54,7 @@ from oslo.config import cfg
 from cinder.backup.driver import BackupDriver
 from cinder import exception
 from cinder.openstack.common import excutils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import strutils
 from cinder.openstack.common import units

cinder/backup/drivers/swift.py

@@ -42,6 +42,7 @@ from oslo.config import cfg
 from cinder.backup.driver import BackupDriver
 from cinder import exception
 from cinder.openstack.common import excutils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder.openstack.common import units

cinder/backup/drivers/tsm.py

@@ -33,6 +33,7 @@ from oslo.config import cfg
 
 from cinder.backup.driver import BackupDriver
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder import utils

cinder/backup/manager.py

@@ -41,6 +41,7 @@ from cinder import context
 from cinder import exception
 from cinder import manager
 from cinder.openstack.common import excutils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder import utils

cinder/brick/iscsi/iscsi.py

@@ -27,6 +27,7 @@ import time
 from cinder.brick import exception
 from cinder.brick import executor
 from cinder.openstack.common import fileutils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils as putils
 

cinder/common/sqlalchemyutils.py

@@ -21,6 +21,7 @@
 import sqlalchemy
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 

cinder/context.py

@@ -20,6 +20,7 @@
 import copy
 import uuid
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import local
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils

cinder/db/sqlalchemy/api.py

@@ -38,6 +38,7 @@ from cinder import exception
 from cinder.openstack.common.db import exception as db_exc
 from cinder.openstack.common.db import options
 from cinder.openstack.common.db.sqlalchemy import session as db_session
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder.openstack.common import uuidutils

cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py

@@ -16,6 +16,7 @@
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey
 from sqlalchemy import Integer, MetaData, String, Table
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 

cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py

@@ -16,6 +16,7 @@ from migrate import ForeignKeyConstraint
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import MetaData, Integer, String, Table, ForeignKey
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py

@@ -15,6 +15,7 @@
 from sqlalchemy import Column, DateTime, Text, Boolean
 from sqlalchemy import MetaData, Integer, String, Table, ForeignKey
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py

@@ -16,6 +16,7 @@
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import MetaData, Integer, String, Table
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py

@@ -13,6 +13,7 @@
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import Integer, MetaData, String, Table, ForeignKey
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py

@@ -13,6 +13,7 @@
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import MetaData, String, Table, ForeignKey
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py

@@ -13,6 +13,7 @@
 from sqlalchemy import Boolean, Column, DateTime, Integer
 from sqlalchemy import MetaData, String, Table
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py

@@ -15,6 +15,7 @@
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey
 from sqlalchemy import Integer, MetaData, String, Table
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py

@@ -16,6 +16,7 @@
 from sqlalchemy import Column, ForeignKey, MetaData, Table
 from sqlalchemy import Boolean, DateTime, Integer, String
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 

cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py

@@ -18,6 +18,7 @@ from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import ForeignKey, MetaData, String, Table
 from migrate import ForeignKeyConstraint
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py

@@ -13,6 +13,7 @@
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import Integer, MetaData, String, Table, ForeignKey
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

cinder/db/sqlalchemy/migration.py

@@ -24,6 +24,7 @@ import sqlalchemy
 
 from cinder.db.sqlalchemy.api import get_engine
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 
 INIT_VERSION = 000
 _REPOSITORY = None

cinder/flow_utils.py

@@ -18,6 +18,7 @@ from taskflow import states
 from taskflow import task
 from taskflow.utils import misc
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

cinder/image/glance.py

@@ -31,6 +31,7 @@ from oslo.config import cfg
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils

cinder/image/image_utils.py

@@ -32,6 +32,7 @@ from oslo.config import cfg
 
 from cinder import exception
 from cinder.openstack.common import fileutils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import imageutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils

cinder/quota.py

@@ -24,6 +24,7 @@ from oslo.config import cfg
 from cinder import context
 from cinder import db
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils

cinder/quota_utils.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import quota
 

cinder/scheduler/driver.py

@@ -22,6 +22,7 @@ Scheduler base class that all Schedulers should inherit from
 from oslo.config import cfg
 
 from cinder import db
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import timeutils
 from cinder.volume import rpcapi as volume_rpcapi

cinder/scheduler/filter_scheduler.py

@@ -23,6 +23,7 @@ Weighing Functions.
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.scheduler import driver
 from cinder.scheduler import scheduler_options

cinder/scheduler/filters/capacity_filter.py

@@ -18,6 +18,7 @@
 
 import math
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common.scheduler import filters
 

cinder/scheduler/flows/create_volume.py

@@ -16,6 +16,7 @@ from taskflow.patterns import linear_flow
 from cinder import exception
 from cinder import flow_utils
 from cinder.openstack.common import excutils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import rpc
 from cinder import utils

cinder/scheduler/host_manager.py

@@ -23,6 +23,7 @@ from oslo.config import cfg
 
 from cinder import db
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common.scheduler import filters
 from cinder.openstack.common.scheduler import weights

cinder/scheduler/manager.py

@@ -28,6 +28,7 @@ from cinder import exception
 from cinder import flow_utils
 from cinder import manager
 from cinder.openstack.common import excutils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder import quota

cinder/scheduler/scheduler_options.py

@@ -26,6 +26,7 @@ import os
 
 from oslo.config import cfg
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 

cinder/service.py

@@ -28,6 +28,7 @@ from oslo import messaging
 from cinder import context
 from cinder import db
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall

cinder/tests/api/contrib/test_backups.py

@@ -28,6 +28,7 @@ import cinder.backup
 from cinder import context
 from cinder import db
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder import test

cinder/tests/brick/test_brick_connector.py

@@ -19,6 +19,7 @@ import time
 from cinder.brick import exception
 from cinder.brick.initiator import connector
 from cinder.brick.initiator import host_driver
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall
 from cinder.openstack.common import processutils as putils

cinder/tests/brick/test_brick_remotefs.py

@@ -18,6 +18,7 @@ import mox
 
 from cinder.brick import exception
 from cinder.brick.remotefs import remotefs
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import test
 

cinder/tests/fake_driver.py

@@ -12,6 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.tests.brick.fake_lvm import FakeBrickLVM
 from cinder.volume import driver

cinder/tests/integrated/api/client.py

@@ -17,6 +17,7 @@ import requests
 
 import six.moves.urllib.parse as urlparse
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 

cinder/tests/test_backup_ceph.py

@@ -27,6 +27,7 @@ from cinder.backup.drivers import ceph
 from cinder import context
 from cinder import db
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils

cinder/tests/test_glusterfs.py

@@ -34,6 +34,7 @@ from cinder import context
 from cinder import db
 from cinder import exception
 from cinder.image import image_utils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import imageutils
 from cinder.openstack.common import processutils as putils
 from cinder.openstack.common import units

cinder/tests/test_ibm_xiv_ds8k.py

@@ -23,6 +23,7 @@ import mox
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder import test
 from cinder.volume import configuration as conf
 from cinder.volume.drivers.ibm import xiv_ds8k

cinder/tests/test_misc.py

@@ -18,6 +18,7 @@ import os
 
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder import test
 
 

cinder/tests/test_netapp.py

@@ -25,6 +25,7 @@ from lxml import etree
 import six
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import test
 from cinder.volume import configuration as conf

cinder/tests/test_netapp_nfs.py

@@ -25,6 +25,7 @@ import os
 from cinder import context
 from cinder import exception
 from cinder.image import image_utils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import test
 from cinder.volume import configuration as conf

cinder/tests/test_rbd.py

@@ -24,6 +24,7 @@ import tempfile
 from cinder import db
 from cinder import exception
 from cinder.image import image_utils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder.openstack.common import units

cinder/tests/test_storwize_svc.py

@@ -26,6 +26,7 @@ import time
 from cinder import context
 from cinder import exception
 from cinder.openstack.common import excutils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils

cinder/tests/test_volume_types.py

@@ -24,6 +24,7 @@ from cinder import db
 from cinder.db.sqlalchemy import api as db_api
 from cinder.db.sqlalchemy import models
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import test
 from cinder.tests import conf_fixture

cinder/tests/zonemanager/test_brcd_fc_zone_driver.py

@@ -24,6 +24,7 @@ import paramiko
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder import test

cinder/transfer/api.py

@@ -27,6 +27,7 @@ from oslo.config import cfg
 from cinder.db import base
 from cinder import exception
 from cinder.openstack.common import excutils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import quota
 from cinder.volume import api as volume_api

cinder/utils.py

@@ -43,6 +43,7 @@ from xml.sax import saxutils
 
 from cinder.brick.initiator import connector
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import lockutils
 from cinder.openstack.common import log as logging

cinder/volume/api.py

@@ -32,6 +32,7 @@ from cinder import flow_utils
 from cinder.image import glance
 from cinder import keymgr
 from cinder.openstack.common import excutils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder.openstack.common import uuidutils

cinder/volume/drivers/block_device.py

@@ -21,6 +21,7 @@ from cinder import context
 from cinder.db.sqlalchemy import api
 from cinder import exception
 from cinder.image import image_utils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.volume import driver
 from cinder.volume import utils as volutils

cinder/volume/drivers/coraid.py

@@ -30,6 +30,7 @@ from oslo.config import cfg
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import lockutils
 from cinder.openstack.common import log as logging

cinder/volume/drivers/emc/emc_cli_iscsi.py

@@ -18,6 +18,7 @@ iSCSI Drivers for EMC VNX array based on CLI.
 """
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume import driver

cinder/volume/drivers/emc/emc_smis_common.py

@@ -26,6 +26,7 @@ from oslo.config import cfg
 from xml.dom.minidom import parseString
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import units
 from cinder.volume import volume_types

cinder/volume/drivers/emc/emc_smis_iscsi.py

@@ -20,6 +20,7 @@ ISCSI Drivers for EMC VNX and VMAX arrays based on SMI-S.
 
 from cinder import context
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.volume import driver
 from cinder.volume.drivers.emc import emc_smis_common

cinder/volume/drivers/emc/emc_vnx_cli.py

@@ -22,6 +22,7 @@ import time
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall
 from cinder.openstack.common import processutils

cinder/volume/drivers/eqlx.py

@@ -25,6 +25,7 @@ from oslo.config import cfg
 
 from cinder import exception
 from cinder.openstack.common import excutils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder import utils

cinder/volume/drivers/glusterfs.py

@@ -29,6 +29,7 @@ from cinder import db
 from cinder import exception
 from cinder.image import image_utils
 from cinder.openstack.common import fileutils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder.openstack.common import units

cinder/volume/drivers/hds/hds.py

@@ -24,6 +24,7 @@ from xml.etree import ElementTree as ETree
 
 from cinder import exception
 from cinder.openstack.common import excutils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume import driver