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

diff --git a/cinder/api/auth.py b/cinder/api/auth.py
index 4b5e3379d137e4d04984ffb30481d2561e2bab7f..df9c130c24ac379af759c31d2183c53f6c61af67 100644 (file)
--- a/cinder/api/auth.py
+++ b/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
 
 

diff --git a/cinder/api/common.py b/cinder/api/common.py
index fb5d4fb19b08abb0a50caffbe266815b747ca580..5574352a765dc03872c74ebc106be9f0bc62ed63 100644 (file)
--- a/cinder/api/common.py
+++ b/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
 

diff --git a/cinder/api/contrib/admin_actions.py b/cinder/api/contrib/admin_actions.py
index 64e833d9ced761f47e22b9e7686a57d008dd626c..99e513345073e94912b5d5c56df5cf2f6441acf8 100644 (file)
--- a/cinder/api/contrib/admin_actions.py
+++ b/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

diff --git a/cinder/api/contrib/backups.py b/cinder/api/contrib/backups.py
index 28ee136ef3049aa71246f9338d9d52cfa0f2a470..d04c94fd16de428d0086231871634cd1046bcf40 100644 (file)
--- a/cinder/api/contrib/backups.py
+++ b/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
 

diff --git a/cinder/api/contrib/extended_snapshot_attributes.py b/cinder/api/contrib/extended_snapshot_attributes.py
index 85676ced4e1d204341f9969f409118cf48fce1c3..f21cfd393c063466070efea6e3920f0dec2c3b8e 100644 (file)
--- a/cinder/api/contrib/extended_snapshot_attributes.py
+++ b/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
 

diff --git a/cinder/api/contrib/hosts.py b/cinder/api/contrib/hosts.py
index 1fd5858d91954ccd01c9822c4d2c28fedfb8545e..e5c76c8591927d5137d263a6e316748814ef0f1e 100644 (file)
--- a/cinder/api/contrib/hosts.py
+++ b/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

diff --git a/cinder/api/contrib/qos_specs_manage.py b/cinder/api/contrib/qos_specs_manage.py
index 8420c2a4c4ffa76ade308bfad3e9f850b5968d13..5abbd7a3e44d28f2a985c2e017dc479410d48f08 100644 (file)
--- a/cinder/api/contrib/qos_specs_manage.py
+++ b/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

diff --git a/cinder/api/contrib/quota_classes.py b/cinder/api/contrib/quota_classes.py
index ffa1bf7f95f845de7b3f32a1f0baeb08f7c6a24c..a5df4a1c0aa776eb70d92fad3686e590ce7dbee0 100644 (file)
--- a/cinder/api/contrib/quota_classes.py
+++ b/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
 
 

diff --git a/cinder/api/contrib/scheduler_hints.py b/cinder/api/contrib/scheduler_hints.py
index b01601f1e5ad7f26c6431adf5d875f0d767ba3f5..c7d8cf96fd0d1ccdbed7a5eb9bf8b1384753e174 100644 (file)
--- a/cinder/api/contrib/scheduler_hints.py
+++ b/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__)

diff --git a/cinder/api/contrib/services.py b/cinder/api/contrib/services.py
index 574ccdfdcee53a3f3ecf9b1b06a0fb0a1fb57bd4..7bec9c3e1479bbc5362212b2cf4b3198f1a61ed1 100644 (file)
--- a/cinder/api/contrib/services.py
+++ b/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

diff --git a/cinder/api/contrib/snapshot_actions.py b/cinder/api/contrib/snapshot_actions.py
index eec07f8231dcb16521e9db1d4b4978399fd666cf..e50e7fb25cbce2ca09dba2b330bcf8da3fb233c4 100644 (file)
--- a/cinder/api/contrib/snapshot_actions.py
+++ b/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__)

diff --git a/cinder/api/contrib/types_extra_specs.py b/cinder/api/contrib/types_extra_specs.py
index 85d5a34d051e0ad56c68e9796a675ccd0b2f754a..175f87aef973c76864085fa98f9c6e55ee683dd9 100644 (file)
--- a/cinder/api/contrib/types_extra_specs.py
+++ b/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
 

diff --git a/cinder/api/contrib/types_manage.py b/cinder/api/contrib/types_manage.py
index f3ade54b3f1e513f0677718ad4060a7bcf0a12d5..7a175f4355de3b9f8252b989fdee3e6725120a84 100644 (file)
--- a/cinder/api/contrib/types_manage.py
+++ b/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
 

diff --git a/cinder/api/contrib/volume_actions.py b/cinder/api/contrib/volume_actions.py
index 2d14e4a457e6c9ed58c89a724184112618ddc648..31c039f9a00f115f5dcb1a6bb69ea177bfee7445 100644 (file)
--- a/cinder/api/contrib/volume_actions.py
+++ b/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

diff --git a/cinder/api/contrib/volume_manage.py b/cinder/api/contrib/volume_manage.py
index d51ee8e9d999dcc6247fc5d6b28b2dc8d08913bf..b5bc35ed8222c0a7362921c3c4bc2af9ee022b1d 100755 (executable)
--- a/cinder/api/contrib/volume_manage.py
+++ b/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

diff --git a/cinder/api/contrib/volume_transfer.py b/cinder/api/contrib/volume_transfer.py
index d6c740b428c2fc060dfeb4604ac670c98f53c011..c2aab33dabec3ee9d4f570ad9fc77ae44f71c0fd 100644 (file)
--- a/cinder/api/contrib/volume_transfer.py
+++ b/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

diff --git a/cinder/api/contrib/volume_type_encryption.py b/cinder/api/contrib/volume_type_encryption.py
index 3368a5b81e4e06d7a194d125b4c6263775ca2e8f..c29cbd190126bc62ca066151e87daa938867889a 100644 (file)
--- a/cinder/api/contrib/volume_type_encryption.py
+++ b/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
 

diff --git a/cinder/api/contrib/volume_unmanage.py b/cinder/api/contrib/volume_unmanage.py
index ab8ff76bdf5d5b32237cbc1e22ff2bffb04fbcc7..3b30e85bcb01cb0ebe4d88f2317fea3d0fbaba2c 100755 (executable)
--- a/cinder/api/contrib/volume_unmanage.py
+++ b/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
 

diff --git a/cinder/api/extensions.py b/cinder/api/extensions.py
index 2f3e4f1ea9ed998d016bcdf1b09a9349fb45ab18..899fe4401eb898d9fc1e32919e6454f4db31f9ed 100644 (file)
--- a/cinder/api/extensions.py
+++ b/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

diff --git a/cinder/api/middleware/fault.py b/cinder/api/middleware/fault.py
index dd1566d42ff1a0630631397da54a57e674c786e0..0472bef4fa4ba2e41d7d2333fbad3499f8611507 100644 (file)
--- a/cinder/api/middleware/fault.py
+++ b/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

diff --git a/cinder/api/middleware/sizelimit.py b/cinder/api/middleware/sizelimit.py
index 4c3717b2b848d242440734f2603f73724ce0d6b2..85fccb56b40570ebe6864daf0284c7d0db32716c 100644 (file)
--- a/cinder/api/middleware/sizelimit.py
+++ b/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
 

diff --git a/cinder/api/openstack/__init__.py b/cinder/api/openstack/__init__.py
index c8d992ed75e0dbf4ed0fb987e0495f02ee8eb870..ea046fed797354452c232527257216233e6df1ce 100644 (file)
--- a/cinder/api/openstack/__init__.py
+++ b/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
 

diff --git a/cinder/api/openstack/urlmap.py b/cinder/api/openstack/urlmap.py
index d4bfe6d83edf4e7dc8d4fdc7fca4d4c42e90947e..92bd1540637f31efffde69a7efdfa3afa5520400 100644 (file)
--- a/cinder/api/openstack/urlmap.py
+++ b/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
 
 

diff --git a/cinder/api/openstack/volume/__init__.py b/cinder/api/openstack/volume/__init__.py
index 90a52cbd7bcea94b16632aeac6b3e9fd47574989..90894c0944e3567a668db37fb5ce097c473c5cd7 100644 (file)
--- a/cinder/api/openstack/volume/__init__.py
+++ b/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__)

diff --git a/cinder/api/openstack/volume/versions.py b/cinder/api/openstack/volume/versions.py
index c2db50a89cf96a7ec0653119e648eaeeb31c477d..e8596dc1747ea3c9215e2e52b3a7fdb6dadcb786 100644 (file)
--- a/cinder/api/openstack/volume/versions.py
+++ b/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
 
 

diff --git a/cinder/api/openstack/wsgi.py b/cinder/api/openstack/wsgi.py
index 5bd8e4b440fe646e5a79e60b897c160753f19339..9fb59b2f6f9bc3c5024738bdbf3c00e2a974280a 100644 (file)
--- a/cinder/api/openstack/wsgi.py
+++ b/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

diff --git a/cinder/api/sizelimit.py b/cinder/api/sizelimit.py
index 1f7359ff0ad7ab9d9b01444c5f3e1b4a90d4e6d2..dd19efd01d571d5b6123ce6677200ab63eef43ce 100644 (file)
--- a/cinder/api/sizelimit.py
+++ b/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__)

diff --git a/cinder/api/v1/snapshot_metadata.py b/cinder/api/v1/snapshot_metadata.py
index b2df8b68f3071e113d807f0d4e25e384e2923f05..17bc5ae816e8274533759dbe2dc0582a5a793327 100644 (file)
--- a/cinder/api/v1/snapshot_metadata.py
+++ b/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
 

diff --git a/cinder/api/v1/snapshots.py b/cinder/api/v1/snapshots.py
index e9a5295d60fd632affd77981e74832f96f51baac..4ab3c946f3929acf7c656acd23ca24989446face 100644 (file)
--- a/cinder/api/v1/snapshots.py
+++ b/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

diff --git a/cinder/api/v1/volume_metadata.py b/cinder/api/v1/volume_metadata.py
index 1b916d5675f7953212c33cf17e6c3a9edd779c49..b01ec6f015d7093456c91f19f94f548080f371bb 100644 (file)
--- a/cinder/api/v1/volume_metadata.py
+++ b/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
 

diff --git a/cinder/api/v1/volumes.py b/cinder/api/v1/volumes.py
index 6021473d6b48d41d7fce7540cc680f35b151ca28..9a07a78910c26af87d49bfee12ae19edc9d35e10 100644 (file)
--- a/cinder/api/v1/volumes.py
+++ b/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

diff --git a/cinder/api/v2/limits.py b/cinder/api/v2/limits.py
index d8f17d424ac6cec05a89e6e452bed19354382b14..a373bf9cd750be3955fc0737e9aad3dfac0fe12e 100644 (file)
--- a/cinder/api/v2/limits.py
+++ b/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

diff --git a/cinder/api/v2/snapshot_metadata.py b/cinder/api/v2/snapshot_metadata.py
index b2df8b68f3071e113d807f0d4e25e384e2923f05..17bc5ae816e8274533759dbe2dc0582a5a793327 100644 (file)
--- a/cinder/api/v2/snapshot_metadata.py
+++ b/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
 

diff --git a/cinder/api/v2/snapshots.py b/cinder/api/v2/snapshots.py
index f231ac9c3c093c98c751474c3fd239f0230e29c9..01522de2a748034969526a60462386caa801bcbf 100644 (file)
--- a/cinder/api/v2/snapshots.py
+++ b/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

diff --git a/cinder/api/v2/types.py b/cinder/api/v2/types.py
index 99d5ffd50d5e8c489eb9e8111aacced3fe5d3fe7..c25c9eb0219774bc584238fa269244fa0364bed9 100644 (file)
--- a/cinder/api/v2/types.py
+++ b/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
 
 

diff --git a/cinder/api/v2/volume_metadata.py b/cinder/api/v2/volume_metadata.py
index d2bc37d8537b7ab071342983dc952a5ffcbb1f4f..e11c6bbc89d0f98bfcebb8bca21528bd5a8f0259 100644 (file)
--- a/cinder/api/v2/volume_metadata.py
+++ b/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
 
 

diff --git a/cinder/api/v2/volumes.py b/cinder/api/v2/volumes.py
index d8b0c19b17ff3402a3a690dc36c8e99ecead78a4..dbe531dcf3b48c30ef4f7f2e523d3a0dc3895589 100644 (file)
--- a/cinder/api/v2/volumes.py
+++ b/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

diff --git a/cinder/api/xmlutil.py b/cinder/api/xmlutil.py
index cf96968d6f0f8f1d1109a61eff8625032f397ed3..3b356b3d2fc691390a94c8724966e8cd3d6f6bca 100644 (file)
--- a/cinder/api/xmlutil.py
+++ b/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
 
 

diff --git a/cinder/backup/api.py b/cinder/backup/api.py
index e0c9a31debd7039ec85afdb1b29eec875be21a4f..d84080fe1557de5c2505d0bc38b51070cc19c043 100644 (file)
--- a/cinder/backup/api.py
+++ b/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
 

diff --git a/cinder/backup/driver.py b/cinder/backup/driver.py
index 533753ff64f8af17019f890886f8109e741265e0..b69ca53db8e061a5730f0016262fdf12f2c0fddc 100644 (file)
--- a/cinder/backup/driver.py
+++ b/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

diff --git a/cinder/backup/drivers/ceph.py b/cinder/backup/drivers/ceph.py
index 5fa735b5ce5b4180b404d561e9141eaee88ee8f3..a60ae691b49a61c99f2f25f0eb13a9d554ca2ac4 100644 (file)
--- a/cinder/backup/drivers/ceph.py
+++ b/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

diff --git a/cinder/backup/drivers/swift.py b/cinder/backup/drivers/swift.py
index a36e9cad98e50c45ac88b38cdc11756651c55135..9777a24fa17c0e7958e61847ef4af2429a0948ac 100644 (file)
--- a/cinder/backup/drivers/swift.py
+++ b/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

diff --git a/cinder/backup/drivers/tsm.py b/cinder/backup/drivers/tsm.py
index cc61dea5a9c7b0fde142e83123070a143a2a55c8..520b808dd2f652dcd6721f7fefcd21d52c2450a2 100644 (file)
--- a/cinder/backup/drivers/tsm.py
+++ b/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

diff --git a/cinder/backup/manager.py b/cinder/backup/manager.py
index 7efa42f82a272b8cac43dab0174889d59fb53b58..fb8d266c8bdd3f5e2eca23b212f99e4546d0a5f4 100644 (file)
--- a/cinder/backup/manager.py
+++ b/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

diff --git a/cinder/brick/iscsi/iscsi.py b/cinder/brick/iscsi/iscsi.py
index 7f2a1e92563196b893fc7bbcedb89a8ff1ca3e89..90a2ad825b010aa3d112cc0e370e5beb29c81fc6 100644 (file)
--- a/cinder/brick/iscsi/iscsi.py
+++ b/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
 

diff --git a/cinder/common/sqlalchemyutils.py b/cinder/common/sqlalchemyutils.py
index dca0bd5aa36482e07dbc0f4f0c1721d536bbbfad..f2c5f4534bb655e7900b65b9c14dabfb9bf73f4b 100644 (file)
--- a/cinder/common/sqlalchemyutils.py
+++ b/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
 
 

diff --git a/cinder/context.py b/cinder/context.py
index 04c0c3e5c296df8300ae0400d02853dbfad58ff4..6b2c6c3d82d167dae823b727d65b71fc15c68284 100644 (file)
--- a/cinder/context.py
+++ b/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

diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py
index aacc9c5127e8b4f488dcb6568f18ff1c4cc4bd01..2f23a4793be936e86be3b9aaac3ddaf389b0e85f 100644 (file)
--- a/cinder/db/sqlalchemy/api.py
+++ b/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

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py b/cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py
index da71b1f871934005ae2c151baf87f51f20a33b21..40a54fcb2f1d1ee9a609f67353d9837dfa2ac603 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py
+++ b/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
 
 

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py b/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
index 4217d1a6942959dab847a098117260cc0f59f0cb..4f3d65d61a5af65b5f4b5dcd3423e0d3a72055cc 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
+++ b/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__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py b/cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py
index 7aae5d66256c21fb266462ab0a7d69efde9d5580..ba37edb76e17addf57bb99a461eac431d9e8bcf8 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py
+++ b/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__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py b/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py
index a786c61485f2cc0323688845783ca78bd1f7320a..95ef42ea279c60df67716b94ea4db2adb4a5ed7d 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py
+++ b/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__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py b/cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py
index 69a2fe7150c1a6512f5370e986abee5bef5d67bb..b1afc52a902040159f5efe3d858a8489c621d2d3 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py
+++ b/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__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py b/cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py
index 8b1b1b8ee825a403e262c1cee00d378b269fa9d7..248bee45e0d829b4489279bb47b12215c4790e01 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py
+++ b/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__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py b/cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py
index 63848efaa2db012f8ca5f8aea402a03408f44672..b69ff346e997771765037eae8bafbfb9cf4a6585 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py
+++ b/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__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py b/cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py
index 6dfb68ea21faee65f0f267516a5f96fa04a76a8e..f20b6fd0ce6106d5490aaad97f086d5008287781 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py
+++ b/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__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py b/cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py
index 4558667ff28f0126e33b71108dc6c93b180fde85..0d42b293d342a3fd69b7165a821545e2aa70b947 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py
+++ b/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
 
 

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py b/cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py
index 6957f5da0727d9a48f4e8cd54b557a216990f266..45220b4828a3177dc2748c36396fc482b44da188 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py
+++ b/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__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py b/cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py
index 701ff8a5b36f2dd2e6201ceb6863263d873a1bb2..e9fd7ba124e80eae16de1b8197bf9f3956f37b11 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py
+++ b/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__)

diff --git a/cinder/db/sqlalchemy/migration.py b/cinder/db/sqlalchemy/migration.py
index ebfdff8cb119a7378aeafb7d4dc7660b8a7275e1..6a7ae61ca741d944e19f3598c394083e10e63c97 100644 (file)
--- a/cinder/db/sqlalchemy/migration.py
+++ b/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

diff --git a/cinder/flow_utils.py b/cinder/flow_utils.py
index f30a1f54bc424a7adf6ca5445112083ec0c3fd0e..12020fe7ab6848c2e617dd3b3f754b267abf03a0 100644 (file)
--- a/cinder/flow_utils.py
+++ b/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__)

diff --git a/cinder/image/glance.py b/cinder/image/glance.py
index 105df91055bbbb9a57e81f1207f3e6316868c97f..3f4f339ac448612d2a4c24b1ced030982870d749 100644 (file)
--- a/cinder/image/glance.py
+++ b/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

diff --git a/cinder/image/image_utils.py b/cinder/image/image_utils.py
index 92879e421ba0a1d5c52042c08f761b321b141536..6add9a8f30e6ed2678b8adcf339537692fdd8881 100644 (file)
--- a/cinder/image/image_utils.py
+++ b/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

diff --git a/cinder/quota.py b/cinder/quota.py
index 3cdc6f918536d51caf096451332120cc040ee28c..472976d5b3ed3e903d2356fa0557531c8959e50f 100644 (file)
--- a/cinder/quota.py
+++ b/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

diff --git a/cinder/quota_utils.py b/cinder/quota_utils.py
index 4a81077dc60d31e025383366fdc424b357598c9b..bce6e4016ee7692794ef7f080aded32a063e7d47 100644 (file)
--- a/cinder/quota_utils.py
+++ b/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
 

diff --git a/cinder/scheduler/driver.py b/cinder/scheduler/driver.py
index b64f776467f065407c190a531c934164545bea59..5d5ddd178d593524ad31861e389628582774180b 100644 (file)
--- a/cinder/scheduler/driver.py
+++ b/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

diff --git a/cinder/scheduler/filter_scheduler.py b/cinder/scheduler/filter_scheduler.py
index 7af95d5b8263f2950a05e7902a6ddff3c17fc04d..caf4a700c102f69bcaf00d980cdea15303123a9d 100644 (file)
--- a/cinder/scheduler/filter_scheduler.py
+++ b/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

diff --git a/cinder/scheduler/filters/capacity_filter.py b/cinder/scheduler/filters/capacity_filter.py
index b7b2bc039421c37a918c9608dcf368841369380d..1210fb3aa7cb11b9905d3b2bb5e1abcd9150483b 100644 (file)
--- a/cinder/scheduler/filters/capacity_filter.py
+++ b/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
 

diff --git a/cinder/scheduler/flows/create_volume.py b/cinder/scheduler/flows/create_volume.py
index e4260b57222a7a2d34ada9583337d2549a72a18a..b8b04703ad2d1dd665a4ac3ee1a655217c66f3a0 100644 (file)
--- a/cinder/scheduler/flows/create_volume.py
+++ b/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

diff --git a/cinder/scheduler/host_manager.py b/cinder/scheduler/host_manager.py
index ec1027d896a363aeb882e5e692a1c840c096438e..0f83e963a2c18063aa99f202253dca988dd0c707 100644 (file)
--- a/cinder/scheduler/host_manager.py
+++ b/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

diff --git a/cinder/scheduler/manager.py b/cinder/scheduler/manager.py
index 663ef89777329ab6b49005aae3f97f039c860ecb..5f872a9123d374b2af219b6df8030d0a3f53ccd5 100644 (file)
--- a/cinder/scheduler/manager.py
+++ b/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

diff --git a/cinder/scheduler/scheduler_options.py b/cinder/scheduler/scheduler_options.py
index 37484fe722b4780a3cb5eaea2f0058b556d39cd3..0d405fdf1101411eaca0569693d884b7a75111a6 100644 (file)
--- a/cinder/scheduler/scheduler_options.py
+++ b/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
 

diff --git a/cinder/service.py b/cinder/service.py
index 6a6e34efa08ca6846f227da7c5c4d60277eb5b8e..0dedc274ee29f2e044c7c2309c72c219e8e52341 100755 (executable)
--- a/cinder/service.py
+++ b/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

diff --git a/cinder/tests/api/contrib/test_backups.py b/cinder/tests/api/contrib/test_backups.py
index 6fe3a6f36ecb862c3c38152b608fc2aaf5fa1535..088b15dad024ab927fb8e2783c67e83f6983f8cc 100644 (file)
--- a/cinder/tests/api/contrib/test_backups.py
+++ b/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

diff --git a/cinder/tests/brick/test_brick_connector.py b/cinder/tests/brick/test_brick_connector.py
index 3728a00b6f69cbe63c2d2ae247ecac3c7f98b7c3..6e280816617ed42f0c2d673d2c19871c37f0f3f1 100644 (file)
--- a/cinder/tests/brick/test_brick_connector.py
+++ b/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

diff --git a/cinder/tests/brick/test_brick_remotefs.py b/cinder/tests/brick/test_brick_remotefs.py
index a352948aa7a594a9bfaa830086d33ad3bc6f22af..f152af716e9c8d69ae09f1e2862fc3c046b6b141 100644 (file)
--- a/cinder/tests/brick/test_brick_remotefs.py
+++ b/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
 

diff --git a/cinder/tests/fake_driver.py b/cinder/tests/fake_driver.py
index 735608bd8cfe73bcd73b67642c8ccf9a0424e07f..e51d27f43975ac23a1aed177c1a20bfd49050a1b 100644 (file)
--- a/cinder/tests/fake_driver.py
+++ b/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

diff --git a/cinder/tests/integrated/api/client.py b/cinder/tests/integrated/api/client.py
index d74c72ace0883d3531dc439bd1520cd6bd8b6ad0..b50b3a10125ea3fe0cbb1710e5efc66d87bd255b 100644 (file)
--- a/cinder/tests/integrated/api/client.py
+++ b/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
 

diff --git a/cinder/tests/test_backup_ceph.py b/cinder/tests/test_backup_ceph.py
index a28ed2a54d21213d9541cd14ddb2915cfc867ce5..26aeede56307855803bc17b31442b8eb7d29f5f3 100644 (file)
--- a/cinder/tests/test_backup_ceph.py
+++ b/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

diff --git a/cinder/tests/test_glusterfs.py b/cinder/tests/test_glusterfs.py
index a05d455a351610b2808bf862e292f377dd70065b..3ed220b05b39628aaa5c3f2d5da676ad84557dbb 100644 (file)
--- a/cinder/tests/test_glusterfs.py
+++ b/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

diff --git a/cinder/tests/test_ibm_xiv_ds8k.py b/cinder/tests/test_ibm_xiv_ds8k.py
index 1ce1d7eae1baf8bb664335773cffcf78f5c191a1..588cb1fa7093b28fc6bcb64216c5ca1009a3a29f 100644 (file)
--- a/cinder/tests/test_ibm_xiv_ds8k.py
+++ b/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

diff --git a/cinder/tests/test_misc.py b/cinder/tests/test_misc.py
index 548b9646e552c413189a6a532e8b9c8583fefa6d..4c7815745590dd1a2ad587ec908bed847ddf64b9 100644 (file)
--- a/cinder/tests/test_misc.py
+++ b/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
 
 

diff --git a/cinder/tests/test_netapp.py b/cinder/tests/test_netapp.py
index 858e8d244c89371fa3dacc4f8466c055d5501602..652e66df7b6ea2112613065c55a4cf53d7e76a19 100644 (file)
--- a/cinder/tests/test_netapp.py
+++ b/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

diff --git a/cinder/tests/test_netapp_nfs.py b/cinder/tests/test_netapp_nfs.py
index 0078388ef1b7ba8a3ebfca11d80de30217e03fb2..dbe6c6d746d905ac87a82461ff697c7237d31366 100644 (file)
--- a/cinder/tests/test_netapp_nfs.py
+++ b/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

diff --git a/cinder/tests/test_rbd.py b/cinder/tests/test_rbd.py
index 589787e625eff8841c28237f2fe34a90ac73bcd5..0e572206f6cadea035f6b13033a7094bb0f0e6ad 100644 (file)
--- a/cinder/tests/test_rbd.py
+++ b/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

diff --git a/cinder/tests/test_storwize_svc.py b/cinder/tests/test_storwize_svc.py
index 6ac732c125d6dd33a8bf1d8fe4c425778d2cad03..6ac863ecd0bd7c5d31a674f9f00a86fe30f96759 100644 (file)
--- a/cinder/tests/test_storwize_svc.py
+++ b/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

diff --git a/cinder/tests/test_volume_types.py b/cinder/tests/test_volume_types.py
index f7433df28833d3268f1fbbd6380a14938b26115f..79ffd338f0cc4230d5f6993b27c8bb7cecfd7c9c 100644 (file)
--- a/cinder/tests/test_volume_types.py
+++ b/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

diff --git a/cinder/tests/zonemanager/test_brcd_fc_zone_driver.py b/cinder/tests/zonemanager/test_brcd_fc_zone_driver.py
index 9ca645ea9ad14de44426d18be7500d87d5b448d2..37d79a8b8590fe9d431ad0356bff3d548d83aa95 100644 (file)
--- a/cinder/tests/zonemanager/test_brcd_fc_zone_driver.py
+++ b/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

diff --git a/cinder/transfer/api.py b/cinder/transfer/api.py
index 1ec533aa5dbc0cf8f3c314fd32c0276a177c3b4e..870bd767a206afd4d6a3e2e751058a2a3c6d058b 100644 (file)
--- a/cinder/transfer/api.py
+++ b/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

diff --git a/cinder/utils.py b/cinder/utils.py
index d3fb33df246b738b8c41f4c825eccbc7fc60b73c..0807e94647aabefd27b70d95c762c7ed580b0d6c 100644 (file)
--- a/cinder/utils.py
+++ b/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

diff --git a/cinder/volume/api.py b/cinder/volume/api.py
index 41f15c16ac191fe98ea83c0183e4b8ad1af435a8..17ba2e3603a715f5bcf77960b260286e82594117 100644 (file)
--- a/cinder/volume/api.py
+++ b/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

diff --git a/cinder/volume/drivers/block_device.py b/cinder/volume/drivers/block_device.py
index 89a22b85933c8597b02a83f2f2f02b0aa5683dee..5f217f74d40c89464ba6f03c90ce71582357beba 100644 (file)
--- a/cinder/volume/drivers/block_device.py
+++ b/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

diff --git a/cinder/volume/drivers/coraid.py b/cinder/volume/drivers/coraid.py
index 6ee1be08826e6e03463268546e89e269fb173658..c05bbbf849cf484866f8e1a53c56ed9cc7a631ed 100644 (file)
--- a/cinder/volume/drivers/coraid.py
+++ b/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

diff --git a/cinder/volume/drivers/emc/emc_cli_iscsi.py b/cinder/volume/drivers/emc/emc_cli_iscsi.py
index ef7ce228bfd4892509b644e168c5fe708352bb3e..faaded813437d3759a8c46408b9670de5f3ad97c 100644 (file)
--- a/cinder/volume/drivers/emc/emc_cli_iscsi.py
+++ b/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

diff --git a/cinder/volume/drivers/emc/emc_smis_common.py b/cinder/volume/drivers/emc/emc_smis_common.py
index 9dbba5808e6e91087f4aaeba9c5d224e2d07f4b4..f3ff96a061c41c9efafcb7d2d139f3eda72a4bdd 100644 (file)
--- a/cinder/volume/drivers/emc/emc_smis_common.py
+++ b/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

diff --git a/cinder/volume/drivers/emc/emc_smis_iscsi.py b/cinder/volume/drivers/emc/emc_smis_iscsi.py
index c5a5c68415a1417965bbd38063ab2fa29909394f..60ab3f2a50de72b0a0d42aa7f4bad4b82bcadae7 100644 (file)
--- a/cinder/volume/drivers/emc/emc_smis_iscsi.py
+++ b/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

diff --git a/cinder/volume/drivers/emc/emc_vnx_cli.py b/cinder/volume/drivers/emc/emc_vnx_cli.py
index ce0b3edd4b542c3908f9d211c302571ecbca702d..0e93c2e2a623851a688520a3ec2b1eb61838ea90 100644 (file)
--- a/cinder/volume/drivers/emc/emc_vnx_cli.py
+++ b/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

diff --git a/cinder/volume/drivers/eqlx.py b/cinder/volume/drivers/eqlx.py
index f63e36b5e4c46c542ce3c8d5d8a4fed514382138..6eec44de0cbb5ffe9cf87771c0832d73dcfd4c76 100644 (file)
--- a/cinder/volume/drivers/eqlx.py
+++ b/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

diff --git a/cinder/volume/drivers/glusterfs.py b/cinder/volume/drivers/glusterfs.py
index 246b5501c2806025027fa534800cac70e2ec75d3..0345d0546906752fe84d186daee5f0145ec686ef 100644 (file)
--- a/cinder/volume/drivers/glusterfs.py
+++ b/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

diff --git a/cinder/volume/drivers/hds/hds.py b/cinder/volume/drivers/hds/hds.py
index 807ee1dce0d861560b9c4d7ea26733f0872a8781..136a2df801e8628b432a6c095f72911f24dca462 100644 (file)
--- a/cinder/volume/drivers/hds/hds.py
+++ b/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

diff --git a/cinder/volume/drivers/hds/iscsi.py b/cinder/volume/drivers/hds/iscsi.py
index 827b18f1c18ffe09010b419d2f5f2f8b67edea2a..e4a4e4fe8c3e5f551f2e782e04355161a066b3e5 100644 (file)
--- a/cinder/volume/drivers/hds/iscsi.py
+++ b/cinder/volume/drivers/hds/iscsi.py
@@ -23,6 +23,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.openstack.common import units
 from cinder import utils

diff --git a/cinder/volume/drivers/hds/nfs.py b/cinder/volume/drivers/hds/nfs.py
index 4002d35694ae77d823d56e96dee7ebff29afbc64..dbfa17054b9ea5d3784650352ce9e35142f076c7 100644 (file)
--- a/cinder/volume/drivers/hds/nfs.py
+++ b/cinder/volume/drivers/hds/nfs.py
@@ -26,6 +26,7 @@ from xml.etree import ElementTree as ETree
 from cinder import exception
 from cinder.image import image_utils
 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.openstack.common import units

diff --git a/cinder/volume/drivers/huawei/__init__.py b/cinder/volume/drivers/huawei/__init__.py
index 3f360422e3d620e42656067fa4fdd0fb289c6162..c9ca0798a1a9a7671dfdbd45aee874ae6f9b68eb 100644 (file)
--- a/cinder/volume/drivers/huawei/__init__.py
+++ b/cinder/volume/drivers/huawei/__init__.py
@@ -22,6 +22,7 @@ The product type and the protocol should be specified in config file before.
 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.volume.drivers.huawei import huawei_dorado
 from cinder.volume.drivers.huawei import huawei_hvs

diff --git a/cinder/volume/drivers/huawei/huawei_t.py b/cinder/volume/drivers/huawei/huawei_t.py
index b88e5e90a17b0e9613b2a4e59b53ec3e75533407..280599d432b44993a1c2644b57a91601750d2bc1 100644 (file)
--- a/cinder/volume/drivers/huawei/huawei_t.py
+++ b/cinder/volume/drivers/huawei/huawei_t.py
@@ -21,6 +21,7 @@ import re
 import time
 
 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.huawei import huawei_utils

diff --git a/cinder/volume/drivers/huawei/huawei_utils.py b/cinder/volume/drivers/huawei/huawei_utils.py
index 9a6faa147a471f9349cfc957723e9fdf70de1430..148eca589e20cb315838b09ff6e99c41f6e4305c 100644 (file)
--- a/cinder/volume/drivers/huawei/huawei_utils.py
+++ b/cinder/volume/drivers/huawei/huawei_utils.py
@@ -16,6 +16,7 @@
 
 from xml.etree import ElementTree as ET
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/volume/drivers/huawei/rest_common.py b/cinder/volume/drivers/huawei/rest_common.py
index 32949bbb4a65cec6e5b8cf27f8531111ee6f24ef..de6fabbcac8be81513520f7bdd001e13b473a243 100644 (file)
--- a/cinder/volume/drivers/huawei/rest_common.py
+++ b/cinder/volume/drivers/huawei/rest_common.py
@@ -27,6 +27,7 @@ from xml.etree import ElementTree as ET
 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 log as logging
 from cinder.openstack.common import units
 from cinder import utils

diff --git a/cinder/volume/drivers/huawei/ssh_common.py b/cinder/volume/drivers/huawei/ssh_common.py
index 131249f88f8f6db2dd5e7c9149e57d4d8e564a01..80a374ae6f046e4fa03421f19d553617d5b45c1f 100644 (file)
--- a/cinder/volume/drivers/huawei/ssh_common.py
+++ b/cinder/volume/drivers/huawei/ssh_common.py
@@ -30,6 +30,7 @@ from xml.etree import ElementTree as ET
 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 log as logging
 from cinder import utils
 from cinder.volume.drivers.huawei import huawei_utils

diff --git a/cinder/volume/drivers/ibm/gpfs.py b/cinder/volume/drivers/ibm/gpfs.py
index b8c625976c3567259b941a84698f7b83856a5a35..ea2308f7d6bac11735cea98afb832583df7d5ddb 100644 (file)
--- a/cinder/volume/drivers/ibm/gpfs.py
+++ b/cinder/volume/drivers/ibm/gpfs.py
@@ -26,6 +26,7 @@ from oslo.config import cfg
 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

diff --git a/cinder/volume/drivers/ibm/ibmnas.py b/cinder/volume/drivers/ibm/ibmnas.py
index 652d5bd2ac16cb0bcc469e08d5e94e3ccef923ef..d1313ee0f9c5369c4835ddb7f550342dc283d559 100644 (file)
--- a/cinder/volume/drivers/ibm/ibmnas.py
+++ b/cinder/volume/drivers/ibm/ibmnas.py
@@ -34,6 +34,7 @@ from oslo.config import cfg
 
 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 processutils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/ibm/storwize_svc/__init__.py b/cinder/volume/drivers/ibm/storwize_svc/__init__.py
index 10c744d4cae6e254106dd15a4a278ebac564e524..70659626c40d7f93e8c7ce43571f542c874c98e3 100644 (file)
--- a/cinder/volume/drivers/ibm/storwize_svc/__init__.py
+++ b/cinder/volume/drivers/ibm/storwize_svc/__init__.py
@@ -42,6 +42,7 @@ from oslo.config import cfg
 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 log as logging
 from cinder.openstack.common import loopingcall
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/ibm/storwize_svc/helpers.py b/cinder/volume/drivers/ibm/storwize_svc/helpers.py
index b47a4fd642d6ba2ff86593a65aba06000eec0935..a25f4831b196762639315a2b4bbbd93c8631a17f 100644 (file)
--- a/cinder/volume/drivers/ibm/storwize_svc/helpers.py
+++ b/cinder/volume/drivers/ibm/storwize_svc/helpers.py
@@ -24,6 +24,7 @@ from eventlet import greenthread
 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 log as logging
 from cinder.openstack.common import loopingcall
 from cinder.openstack.common import strutils

diff --git a/cinder/volume/drivers/ibm/storwize_svc/ssh.py b/cinder/volume/drivers/ibm/storwize_svc/ssh.py
index 0948384ce7e24928e57de76f2728522b44158f8c..5ca7ad9aca28743bb29eb5edb7ab49064841647e 100644 (file)
--- a/cinder/volume/drivers/ibm/storwize_svc/ssh.py
+++ b/cinder/volume/drivers/ibm/storwize_svc/ssh.py
@@ -17,6 +17,7 @@
 import re
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 

diff --git a/cinder/volume/drivers/lvm.py b/cinder/volume/drivers/lvm.py
index bdfe12d2413c9b4d7808bddfabfc6e8af35fe2ae..bcb26dfb3168d72d091858c8a1d595e2a3c7b9ee 100644 (file)
--- a/cinder/volume/drivers/lvm.py
+++ b/cinder/volume/drivers/lvm.py
@@ -29,6 +29,7 @@ from cinder.brick.local_dev import lvm as lvm
 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

diff --git a/cinder/volume/drivers/netapp/api.py b/cinder/volume/drivers/netapp/api.py
index 6494f12df034388ef38e828fc6755381ecdb2594..b04df272d1cc7e923dda7ad20f1d87c5c05798ef 100644 (file)
--- a/cinder/volume/drivers/netapp/api.py
+++ b/cinder/volume/drivers/netapp/api.py
@@ -22,6 +22,7 @@ Contains classes required to issue api calls to ONTAP and OnCommand DFM.
 from lxml import etree
 import urllib2
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/volume/drivers/netapp/common.py b/cinder/volume/drivers/netapp/common.py
index 7efd6e160024b862822d10d1fa8120826c7995e9..17365039426cf0088952b9046b686ffe17137a6c 100644 (file)
--- a/cinder/volume/drivers/netapp/common.py
+++ b/cinder/volume/drivers/netapp/common.py
@@ -20,6 +20,7 @@ Supports call to multiple storage systems of different families and protocols.
 """
 
 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.volume import driver

diff --git a/cinder/volume/drivers/netapp/eseries/client.py b/cinder/volume/drivers/netapp/eseries/client.py
index b5ecdd414d665eef89f13908da8b96de9d6ad9c6..b192b7189ebee97f97deaaf1941ac65c1a3f85ff 100644 (file)
--- a/cinder/volume/drivers/netapp/eseries/client.py
+++ b/cinder/volume/drivers/netapp/eseries/client.py
@@ -22,6 +22,7 @@ import requests
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/volume/drivers/netapp/eseries/iscsi.py b/cinder/volume/drivers/netapp/eseries/iscsi.py
index 3f9621ae9a29df2f82c6d52990064d6f95341ca2..39181cf28005539d5d6645a58954a9c58b0530b0 100644 (file)
--- a/cinder/volume/drivers/netapp/eseries/iscsi.py
+++ b/cinder/volume/drivers/netapp/eseries/iscsi.py
@@ -24,6 +24,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 units
 from cinder import utils as cinder_utils

diff --git a/cinder/volume/drivers/netapp/iscsi.py b/cinder/volume/drivers/netapp/iscsi.py
index 2011fe171d0401f230aa9e419f6953da2995cb71..630b87b8dc1f3db8be58699e3ea37bf6abdc79c3 100644 (file)
--- a/cinder/volume/drivers/netapp/iscsi.py
+++ b/cinder/volume/drivers/netapp/iscsi.py
@@ -28,6 +28,7 @@ import uuid
 
 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

diff --git a/cinder/volume/drivers/netapp/nfs.py b/cinder/volume/drivers/netapp/nfs.py
index 41622a370c9ba944abd74d6ab83716b5907d438b..8899a7c2f52ed2efd7cae75e82f418ad4ad7be07 100644 (file)
--- a/cinder/volume/drivers/netapp/nfs.py
+++ b/cinder/volume/drivers/netapp/nfs.py
@@ -28,6 +28,7 @@ import six.moves.urllib.parse as urlparse
 from cinder import exception
 from cinder.image import image_utils
 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.openstack.common import units

diff --git a/cinder/volume/drivers/netapp/ssc_utils.py b/cinder/volume/drivers/netapp/ssc_utils.py
index 492735b2f2572665d2ee44acdf67a63f7c4ad427..aee4244e5c988630f091087bd9c2a52caac068e3 100644 (file)
--- a/cinder/volume/drivers/netapp/ssc_utils.py
+++ b/cinder/volume/drivers/netapp/ssc_utils.py
@@ -21,6 +21,7 @@ import copy
 from threading import Timer
 
 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

diff --git a/cinder/volume/drivers/netapp/utils.py b/cinder/volume/drivers/netapp/utils.py
index c4d1836565f87d51cbd65a5ee918373f85c55f24..d29733beba129cdbefa4942371929486cf84e82a 100644 (file)
--- a/cinder/volume/drivers/netapp/utils.py
+++ b/cinder/volume/drivers/netapp/utils.py
@@ -28,6 +28,7 @@ import uuid
 
 from cinder import context
 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

diff --git a/cinder/volume/drivers/nexenta/iscsi.py b/cinder/volume/drivers/nexenta/iscsi.py
index 767689720d484e2e6e58537c88df4f9cd7bd3142..db35583adafa3f04f721f83f773abe1d64fae58f 100644 (file)
--- a/cinder/volume/drivers/nexenta/iscsi.py
+++ b/cinder/volume/drivers/nexenta/iscsi.py
@@ -23,6 +23,7 @@
 """
 
 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 import nexenta

diff --git a/cinder/volume/drivers/nexenta/jsonrpc.py b/cinder/volume/drivers/nexenta/jsonrpc.py
index 6f91a2b530b5e380a852b4c06c6fbecdcfa379cb..22248df032637beeb2e5fe31d2b75e85a6a68e9e 100644 (file)
--- a/cinder/volume/drivers/nexenta/jsonrpc.py
+++ b/cinder/volume/drivers/nexenta/jsonrpc.py
@@ -23,6 +23,7 @@
 
 import urllib2
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers import nexenta

diff --git a/cinder/volume/drivers/nexenta/nfs.py b/cinder/volume/drivers/nexenta/nfs.py
index 2d2f1bbc3bf7554d21d3251ef425cb6376e79c58..168d0169c5690f6b4cda5a2a5f8f7b71703382ed 100644 (file)
--- a/cinder/volume/drivers/nexenta/nfs.py
+++ b/cinder/volume/drivers/nexenta/nfs.py
@@ -28,6 +28,7 @@ import re
 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 units
 from cinder.volume.drivers import nexenta

diff --git a/cinder/volume/drivers/nexenta/utils.py b/cinder/volume/drivers/nexenta/utils.py
index 6b371af3fe6fff23105f5ca06f982b8faa11d7d4..9b92421ed363ed01788ee0f68c37e711e0f2a5dd 100644 (file)
--- a/cinder/volume/drivers/nexenta/utils.py
+++ b/cinder/volume/drivers/nexenta/utils.py
@@ -25,6 +25,7 @@ import re
 
 import six.moves.urllib.parse as urlparse
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import units
 
 

diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py
index 14992a129eab91096e08dd7a22f65fae4fc384a7..9c519aede0550a8a3d4e1b9f3528dbe416f4e587 100644 (file)
--- a/cinder/volume/drivers/nfs.py
+++ b/cinder/volume/drivers/nfs.py
@@ -22,6 +22,7 @@ from oslo.config import cfg
 from cinder.brick.remotefs import remotefs
 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 processutils as putils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/rbd.py b/cinder/volume/drivers/rbd.py
index 93874d84796cbd9de3066c06024abdc6bafe10f7..a2d28c525dfb700966d3042ac7313e527c5b9659 100644 (file)
--- a/cinder/volume/drivers/rbd.py
+++ b/cinder/volume/drivers/rbd.py
@@ -26,6 +26,7 @@ from oslo.config import cfg
 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 strutils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/san/hp/hp_3par_common.py b/cinder/volume/drivers/san/hp/hp_3par_common.py
index 38c67a08802be8d84b91023a69c6330386e37e5d..48cd899af28ce29cea03158f475336e338777f0e 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_3par_common.py
+++ b/cinder/volume/drivers/san/hp/hp_3par_common.py
@@ -53,6 +53,7 @@ from oslo.config import cfg
 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 log as logging
 from cinder.openstack.common import loopingcall
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py b/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py
index 22fe2170b1efa5a82b39d89ce33514b9b485d993..5127204d601552ddcda0e63da50eccdc16a8667c 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py
+++ b/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py
@@ -23,6 +23,7 @@ operations on the SAN.
 from lxml import etree
 
 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.openstack.common import units

diff --git a/cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py b/cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py
index ca92f65ca3f917e69454b9b254c7374dbfe112c4..43d8d8b04641b7f8836085b30e98fffceb1467fb 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py
+++ b/cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py
@@ -32,6 +32,7 @@ hplefthand_password for credentials to talk to the REST service on the
 LeftHand array.
 """
 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.driver import VolumeDriver

diff --git a/cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py b/cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py
index 1203b4b4450c56f60baea049aa8b890288811d6f..3353811f078851709b886a4cb0b428db45f09894 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py
+++ b/cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py
@@ -17,6 +17,7 @@
 
 from cinder import context
 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 import utils

diff --git a/cinder/volume/drivers/san/hp/hp_msa_common.py b/cinder/volume/drivers/san/hp/hp_msa_common.py
index da323dfad2439c960b1656d2af439fc56bbe63d6..1e2ab7a8265dfe51df6dbbd36ac4f3c29c4636ed 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_msa_common.py
+++ b/cinder/volume/drivers/san/hp/hp_msa_common.py
@@ -22,6 +22,7 @@ import uuid
 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.volume.drivers.san.hp import hp_msa_client as msa
 

diff --git a/cinder/volume/drivers/san/san.py b/cinder/volume/drivers/san/san.py
index 0151058f1407694956b84a79a74b9548074c3016..66810417bff095a1b49b6e29c8bedc7fa36c894b 100644 (file)
--- a/cinder/volume/drivers/san/san.py
+++ b/cinder/volume/drivers/san/san.py
@@ -26,6 +26,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

diff --git a/cinder/volume/drivers/san/solaris.py b/cinder/volume/drivers/san/solaris.py
index f291dc8c4c18e1325942a2b86ae46cafc91d8ba9..63d5cd43891d8798730548adedd955704bc76290 100644 (file)
--- a/cinder/volume/drivers/san/solaris.py
+++ b/cinder/volume/drivers/san/solaris.py
@@ -15,6 +15,7 @@
 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.volume.drivers.san.san import SanISCSIDriver
 

diff --git a/cinder/volume/drivers/scality.py b/cinder/volume/drivers/scality.py
index cb9597e265a409365392afe869c7b0e8f6fc50f0..c92ff4322fb16918ac8b0fcf13c69a8f30d2226c 100644 (file)
--- a/cinder/volume/drivers/scality.py
+++ b/cinder/volume/drivers/scality.py
@@ -26,6 +26,7 @@ import six.moves.urllib.parse as urlparse
 
 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 units
 from cinder.volume import driver

diff --git a/cinder/volume/drivers/sheepdog.py b/cinder/volume/drivers/sheepdog.py
index 6b647af7889919386fb9e95c31d93b962e84dac7..30993e55c9114d61ffcb45a1685e64e16d3699de 100644 (file)
--- a/cinder/volume/drivers/sheepdog.py
+++ b/cinder/volume/drivers/sheepdog.py
@@ -26,6 +26,7 @@ from oslo.config import cfg
 
 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 processutils
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/solidfire.py b/cinder/volume/drivers/solidfire.py
index 123ae9f53657d90c1a76f97fbee031da30cbf32b..ecec15ab8ed244a2d1b3d977a67a2568cbf54f75 100644 (file)
--- a/cinder/volume/drivers/solidfire.py
+++ b/cinder/volume/drivers/solidfire.py
@@ -26,6 +26,7 @@ from oslo.config import cfg
 
 from cinder import context
 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.openstack.common import units

diff --git a/cinder/volume/drivers/vmware/api.py b/cinder/volume/drivers/vmware/api.py
index 0084d189bca03c49ca198ac6f76193ab63eb539d..b2ce28f480da2b57a1078fa023d1053874ef0371 100644 (file)
--- a/cinder/volume/drivers/vmware/api.py
+++ b/cinder/volume/drivers/vmware/api.py
@@ -18,6 +18,7 @@ Session and API call management for VMware ESX/VC server.
 Provides abstraction over cinder.volume.drivers.vmware.vim.Vim SOAP calls.
 """
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall
 from cinder.volume.drivers.vmware import error_util

diff --git a/cinder/volume/drivers/vmware/error_util.py b/cinder/volume/drivers/vmware/error_util.py
index ca93d8c0d350cdea466ed3a35ef685aa57ddaaec..4bc4880dad5f73829a7d4f4fcda4be7729c977ed 100644 (file)
--- a/cinder/volume/drivers/vmware/error_util.py
+++ b/cinder/volume/drivers/vmware/error_util.py
@@ -18,6 +18,7 @@ Exception classes and SOAP response error checking module.
 """
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 
 NOT_AUTHENTICATED = 'NotAuthenticated'
 

diff --git a/cinder/volume/drivers/vmware/io_util.py b/cinder/volume/drivers/vmware/io_util.py
index f1991064da56b3d3b1b9a79be00bef5033ef0777..08dbd229127f9e38da0f4666e7195a7762122b37 100644 (file)
--- a/cinder/volume/drivers/vmware/io_util.py
+++ b/cinder/volume/drivers/vmware/io_util.py
@@ -25,6 +25,7 @@ from eventlet import greenthread
 from eventlet import queue
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/volume/drivers/vmware/read_write_util.py b/cinder/volume/drivers/vmware/read_write_util.py
index fd67037662739a667bebd2241ed3334d12ce575f..dd66947b23a2c79aebe205062d5e02e1801ac908 100644 (file)
--- a/cinder/volume/drivers/vmware/read_write_util.py
+++ b/cinder/volume/drivers/vmware/read_write_util.py
@@ -26,6 +26,7 @@ import urllib2
 
 import six.moves.urllib.parse as urlparse
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers.vmware import error_util
 from cinder.volume.drivers.vmware import vim_util

diff --git a/cinder/volume/drivers/vmware/vim.py b/cinder/volume/drivers/vmware/vim.py
index 82fc65ebd04e85a1f627553071550ce30b08009e..d9ce3257cc478fd88e6db7f82baab1879e3b8e97 100644 (file)
--- a/cinder/volume/drivers/vmware/vim.py
+++ b/cinder/volume/drivers/vmware/vim.py
@@ -22,6 +22,7 @@ import urllib2
 
 import suds
 
+from cinder.openstack.common.gettextutils import _
 from cinder.volume.drivers.vmware import error_util
 from cinder.volume.drivers.vmware import vim_util
 

diff --git a/cinder/volume/drivers/vmware/vmdk.py b/cinder/volume/drivers/vmware/vmdk.py
index 4ced19cfcc087ca96c9b70876d9f98b97e9f1acd..5b3382129f44262743e4ea00739a17285a238026 100644 (file)
--- a/cinder/volume/drivers/vmware/vmdk.py
+++ b/cinder/volume/drivers/vmware/vmdk.py
@@ -29,6 +29,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 units
 from cinder.volume import driver

diff --git a/cinder/volume/drivers/vmware/vmware_images.py b/cinder/volume/drivers/vmware/vmware_images.py
index 9e4a989b5d21f194c0570e06fcf9c6460e9de897..49c67bc921a0bace2f3c6655e98eb3acf43388a7 100644 (file)
--- a/cinder/volume/drivers/vmware/vmware_images.py
+++ b/cinder/volume/drivers/vmware/vmware_images.py
@@ -19,6 +19,7 @@ Utility functions for Image transfer.
 from eventlet import timeout
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers.vmware import io_util
 from cinder.volume.drivers.vmware import read_write_util as rw_util

diff --git a/cinder/volume/drivers/vmware/volumeops.py b/cinder/volume/drivers/vmware/volumeops.py
index 166e764fd0e4dfdd278ab60ed8c1c669329bfe22..f02c1188a710f7a8c80d00d7bb9edc0ec38b5816 100644 (file)
--- a/cinder/volume/drivers/vmware/volumeops.py
+++ b/cinder/volume/drivers/vmware/volumeops.py
@@ -17,6 +17,7 @@
 Implements operations on volumes residing on VMware datastores.
 """
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import units
 from cinder.volume.drivers.vmware import error_util

diff --git a/cinder/volume/drivers/windows/windows_utils.py b/cinder/volume/drivers/windows/windows_utils.py
index 0d2fbbac0a1e5cc9d49702aaf2aa339f527a2853..63dd9418720aafd1e4168a73d7cd0c590b59475a 100644 (file)
--- a/cinder/volume/drivers/windows/windows_utils.py
+++ b/cinder/volume/drivers/windows/windows_utils.py
@@ -23,6 +23,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.volume.drivers.windows import constants
 

diff --git a/cinder/volume/drivers/zadara.py b/cinder/volume/drivers/zadara.py
index 5e53d66632f42d03747b2abb34772e5f0799a42b..1abf0d41cc74416c8342f0d9de46a198898830a8 100644 (file)
--- a/cinder/volume/drivers/zadara.py
+++ b/cinder/volume/drivers/zadara.py
@@ -26,6 +26,7 @@ from lxml import etree
 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.volume import driver
 

diff --git a/cinder/volume/flows/api/create_volume.py b/cinder/volume/flows/api/create_volume.py
index 99d11ff692cc346767db771230d658c679fb5173..cae96ffa5f688cb3ab9fd0ce23aed449aaa6c4df 100644 (file)
--- a/cinder/volume/flows/api/create_volume.py
+++ b/cinder/volume/flows/api/create_volume.py
@@ -18,6 +18,7 @@ from taskflow.utils import misc
 
 from cinder import exception
 from cinder import flow_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

diff --git a/cinder/volume/flows/common.py b/cinder/volume/flows/common.py
index ba35d7d47e0d96c1d3023a08a2460a4defd93364..6ff83c87581460738248cf8ccea79a63886b858e 100644 (file)
--- a/cinder/volume/flows/common.py
+++ b/cinder/volume/flows/common.py
@@ -19,6 +19,7 @@
 import six
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/volume/flows/manager/create_volume.py b/cinder/volume/flows/manager/create_volume.py
index 8fda97f33aa67de599d3d3e7eca12ac38bd60dd2..0e361b51a0752f87c35c949c938d3ee1a0970188 100644 (file)
--- a/cinder/volume/flows/manager/create_volume.py
+++ b/cinder/volume/flows/manager/create_volume.py
@@ -20,6 +20,7 @@ from taskflow.utils import misc
 from cinder import exception
 from cinder import flow_utils
 from cinder.image import glance
+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 timeutils

diff --git a/cinder/volume/flows/manager/manage_existing.py b/cinder/volume/flows/manager/manage_existing.py
index 2de879b6872e2bc6974dcea0d0cd0e704e008f91..d18268268cbbfd3801c36a168a45f2cc6c1ca521 100644 (file)
--- a/cinder/volume/flows/manager/manage_existing.py
+++ b/cinder/volume/flows/manager/manage_existing.py
@@ -17,6 +17,7 @@ from taskflow.patterns import linear_flow
 
 from cinder import exception
 from cinder import flow_utils
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.volume.flows.api import create_volume as create_api
 from cinder.volume.flows import common as flow_common

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 617895b8889698d2c37035bec80b0eae7bc2b8b2..aad9fe9ad8082b45b861a47089c4d6e740adba72 100644 (file)
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -48,6 +48,7 @@ from cinder import flow_utils
 from cinder.image import glance
 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 jsonutils
 from cinder.openstack.common import log as logging

diff --git a/cinder/volume/qos_specs.py b/cinder/volume/qos_specs.py
index be60dd648e4671baf73fe64e0632993683496121..456ace78c7fa752c86bd52144cbab102e04b57ba 100644 (file)
--- a/cinder/volume/qos_specs.py
+++ b/cinder/volume/qos_specs.py
@@ -22,6 +22,7 @@ from cinder import context
 from cinder import db
 from cinder import exception
 from cinder.openstack.common.db import exception as db_exc
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.volume import volume_types
 

diff --git a/cinder/volume/utils.py b/cinder/volume/utils.py
index da08d3f16a4334022083669d48edd2ea4e308f85..cb4c40de5e11527995f51df2ceb465afd3644f76 100644 (file)
--- a/cinder/volume/utils.py
+++ b/cinder/volume/utils.py
@@ -21,6 +21,7 @@ from oslo.config import cfg
 
 from cinder.brick.local_dev import lvm as brick_lvm
 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.openstack.common import strutils

diff --git a/cinder/volume/volume_types.py b/cinder/volume/volume_types.py
index 42c92170f9c65783296f08d4e924551828ef0d76..4ae1a39b3d4cb3eeb951ee7ecef0849e48a73fdf 100644 (file)
--- a/cinder/volume/volume_types.py
+++ b/cinder/volume/volume_types.py
@@ -26,6 +26,7 @@ from cinder import context
 from cinder import db
 from cinder import exception
 from cinder.openstack.common.db import exception as db_exc
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/wsgi.py b/cinder/wsgi.py
index 2798894b6ec12cff77c789c951189768800c93e5..336d923fe873495e0f51515e039e980fafc9b1dd 100644 (file)
--- a/cinder/wsgi.py
+++ b/cinder/wsgi.py
@@ -37,6 +37,7 @@ import webob.exc
 
 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
 

diff --git a/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py b/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py
index 810d826a236c2c6eb016958bef2a2d2241e53f9e..a4dde326c2c6988d57a2a2485f0a553795e4d1e0 100644 (file)
--- a/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py
+++ b/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py
@@ -21,6 +21,7 @@ import paramiko
 
 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.zonemanager.drivers.brocade import brcd_fabric_opts as fabric_opts

diff --git a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py
index bfd0863b802195505299fa765c46dda00cada37e..64e6cd42378be42cc5c895c4e060c5842d0efbb6 100644 (file)
--- a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py
+++ b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py
@@ -28,6 +28,7 @@ from eventlet import greenthread
 
 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

diff --git a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py
index 6466eb311b36fb1b8a555a6b9d476a97b1121570..d1728ca3b84d5855d0869d290f8aefed31ec72cf 100644 (file)
--- a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py
+++ b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py
@@ -34,6 +34,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 importutils
 from cinder.openstack.common import lockutils
 from cinder.openstack.common import log as logging

diff --git a/cinder/zonemanager/fc_san_lookup_service.py b/cinder/zonemanager/fc_san_lookup_service.py
index 4885262970362ba577a7c11ca03dd7146c956418..c781cf7fef8378aadd7050fd3df7c2ac092dde3a 100644 (file)
--- a/cinder/zonemanager/fc_san_lookup_service.py
+++ b/cinder/zonemanager/fc_san_lookup_service.py
@@ -24,6 +24,7 @@ defined in this class.
 """
 
 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.volume import configuration as config

diff --git a/cinder/zonemanager/fc_zone_manager.py b/cinder/zonemanager/fc_zone_manager.py
index 1710d22195e5d00a54382a8c14dac65887536bc9..25f87e81e456867f7e518ee9030778120d06755e 100644 (file)
--- a/cinder/zonemanager/fc_zone_manager.py
+++ b/cinder/zonemanager/fc_zone_manager.py
@@ -34,6 +34,7 @@ detach operation.
 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.volume import configuration as config