From eafcc41e82ced6d72d1cfe0105e44c383f28a23a Mon Sep 17 00:00:00 2001 From: "Jay S. Bryant" Date: Thu, 26 Jun 2014 16:22:17 -0500 Subject: [PATCH] Explicitly import _() in Cinder code To ensure that logs are properly translated and logged to the Cinder log files (using the Cinder message catalogs) we need to explicitly import _() in any python files that use the _() function. Closes-bug: 1306275 Related-Blueprint: i18n-enablement Change-Id: I3cf1f1d63d5f8bd8ffd007104691f914e3fd8538 --- cinder/api/auth.py | 1 + cinder/api/common.py | 1 + cinder/api/contrib/admin_actions.py | 1 + cinder/api/contrib/backups.py | 1 + cinder/api/contrib/extended_snapshot_attributes.py | 1 + cinder/api/contrib/hosts.py | 1 + cinder/api/contrib/qos_specs_manage.py | 1 + cinder/api/contrib/quota_classes.py | 1 + cinder/api/contrib/scheduler_hints.py | 1 + cinder/api/contrib/services.py | 1 + cinder/api/contrib/snapshot_actions.py | 1 + cinder/api/contrib/types_extra_specs.py | 1 + cinder/api/contrib/types_manage.py | 1 + cinder/api/contrib/volume_actions.py | 1 + cinder/api/contrib/volume_manage.py | 1 + cinder/api/contrib/volume_transfer.py | 1 + cinder/api/contrib/volume_type_encryption.py | 1 + cinder/api/contrib/volume_unmanage.py | 1 + cinder/api/extensions.py | 1 + cinder/api/middleware/fault.py | 1 + cinder/api/middleware/sizelimit.py | 1 + cinder/api/openstack/__init__.py | 1 + cinder/api/openstack/urlmap.py | 1 + cinder/api/openstack/volume/__init__.py | 1 + cinder/api/openstack/volume/versions.py | 1 + cinder/api/openstack/wsgi.py | 1 + cinder/api/sizelimit.py | 1 + cinder/api/v1/snapshot_metadata.py | 1 + cinder/api/v1/snapshots.py | 1 + cinder/api/v1/volume_metadata.py | 1 + cinder/api/v1/volumes.py | 1 + cinder/api/v2/limits.py | 1 + cinder/api/v2/snapshot_metadata.py | 1 + cinder/api/v2/snapshots.py | 1 + cinder/api/v2/types.py | 1 + cinder/api/v2/volume_metadata.py | 1 + cinder/api/v2/volumes.py | 1 + cinder/api/xmlutil.py | 1 + cinder/backup/api.py | 1 + cinder/backup/driver.py | 1 + cinder/backup/drivers/ceph.py | 1 + cinder/backup/drivers/swift.py | 1 + cinder/backup/drivers/tsm.py | 1 + cinder/backup/manager.py | 1 + cinder/brick/iscsi/iscsi.py | 1 + cinder/common/sqlalchemyutils.py | 1 + cinder/context.py | 1 + cinder/db/sqlalchemy/api.py | 1 + cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py | 1 + cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py | 1 + .../db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py | 1 + cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py | 1 + .../migrate_repo/versions/009_add_snapshot_metadata_table.py | 1 + .../sqlalchemy/migrate_repo/versions/010_add_transfers_table.py | 1 + .../migrate_repo/versions/015_drop_migrations_table.py | 1 + cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py | 1 + .../migrate_repo/versions/017_add_encryption_information.py | 1 + cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py | 1 + .../migrate_repo/versions/020_add_volume_admin_metadata_table.py | 1 + cinder/db/sqlalchemy/migration.py | 1 + cinder/flow_utils.py | 1 + cinder/image/glance.py | 1 + cinder/image/image_utils.py | 1 + cinder/quota.py | 1 + cinder/quota_utils.py | 1 + cinder/scheduler/driver.py | 1 + cinder/scheduler/filter_scheduler.py | 1 + cinder/scheduler/filters/capacity_filter.py | 1 + cinder/scheduler/flows/create_volume.py | 1 + cinder/scheduler/host_manager.py | 1 + cinder/scheduler/manager.py | 1 + cinder/scheduler/scheduler_options.py | 1 + cinder/service.py | 1 + cinder/tests/api/contrib/test_backups.py | 1 + cinder/tests/brick/test_brick_connector.py | 1 + cinder/tests/brick/test_brick_remotefs.py | 1 + cinder/tests/fake_driver.py | 1 + cinder/tests/integrated/api/client.py | 1 + cinder/tests/test_backup_ceph.py | 1 + cinder/tests/test_glusterfs.py | 1 + cinder/tests/test_ibm_xiv_ds8k.py | 1 + cinder/tests/test_misc.py | 1 + cinder/tests/test_netapp.py | 1 + cinder/tests/test_netapp_nfs.py | 1 + cinder/tests/test_rbd.py | 1 + cinder/tests/test_storwize_svc.py | 1 + cinder/tests/test_volume_types.py | 1 + cinder/tests/zonemanager/test_brcd_fc_zone_driver.py | 1 + cinder/transfer/api.py | 1 + cinder/utils.py | 1 + cinder/volume/api.py | 1 + cinder/volume/drivers/block_device.py | 1 + cinder/volume/drivers/coraid.py | 1 + cinder/volume/drivers/emc/emc_cli_iscsi.py | 1 + cinder/volume/drivers/emc/emc_smis_common.py | 1 + cinder/volume/drivers/emc/emc_smis_iscsi.py | 1 + cinder/volume/drivers/emc/emc_vnx_cli.py | 1 + cinder/volume/drivers/eqlx.py | 1 + cinder/volume/drivers/glusterfs.py | 1 + cinder/volume/drivers/hds/hds.py | 1 + cinder/volume/drivers/hds/iscsi.py | 1 + cinder/volume/drivers/hds/nfs.py | 1 + cinder/volume/drivers/huawei/__init__.py | 1 + cinder/volume/drivers/huawei/huawei_t.py | 1 + cinder/volume/drivers/huawei/huawei_utils.py | 1 + cinder/volume/drivers/huawei/rest_common.py | 1 + cinder/volume/drivers/huawei/ssh_common.py | 1 + cinder/volume/drivers/ibm/gpfs.py | 1 + cinder/volume/drivers/ibm/ibmnas.py | 1 + cinder/volume/drivers/ibm/storwize_svc/__init__.py | 1 + cinder/volume/drivers/ibm/storwize_svc/helpers.py | 1 + cinder/volume/drivers/ibm/storwize_svc/ssh.py | 1 + cinder/volume/drivers/lvm.py | 1 + cinder/volume/drivers/netapp/api.py | 1 + cinder/volume/drivers/netapp/common.py | 1 + cinder/volume/drivers/netapp/eseries/client.py | 1 + cinder/volume/drivers/netapp/eseries/iscsi.py | 1 + cinder/volume/drivers/netapp/iscsi.py | 1 + cinder/volume/drivers/netapp/nfs.py | 1 + cinder/volume/drivers/netapp/ssc_utils.py | 1 + cinder/volume/drivers/netapp/utils.py | 1 + cinder/volume/drivers/nexenta/iscsi.py | 1 + cinder/volume/drivers/nexenta/jsonrpc.py | 1 + cinder/volume/drivers/nexenta/nfs.py | 1 + cinder/volume/drivers/nexenta/utils.py | 1 + cinder/volume/drivers/nfs.py | 1 + cinder/volume/drivers/rbd.py | 1 + cinder/volume/drivers/san/hp/hp_3par_common.py | 1 + cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py | 1 + cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py | 1 + cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py | 1 + cinder/volume/drivers/san/hp/hp_msa_common.py | 1 + cinder/volume/drivers/san/san.py | 1 + cinder/volume/drivers/san/solaris.py | 1 + cinder/volume/drivers/scality.py | 1 + cinder/volume/drivers/sheepdog.py | 1 + cinder/volume/drivers/solidfire.py | 1 + cinder/volume/drivers/vmware/api.py | 1 + cinder/volume/drivers/vmware/error_util.py | 1 + cinder/volume/drivers/vmware/io_util.py | 1 + cinder/volume/drivers/vmware/read_write_util.py | 1 + cinder/volume/drivers/vmware/vim.py | 1 + cinder/volume/drivers/vmware/vmdk.py | 1 + cinder/volume/drivers/vmware/vmware_images.py | 1 + cinder/volume/drivers/vmware/volumeops.py | 1 + cinder/volume/drivers/windows/windows_utils.py | 1 + cinder/volume/drivers/zadara.py | 1 + cinder/volume/flows/api/create_volume.py | 1 + cinder/volume/flows/common.py | 1 + cinder/volume/flows/manager/create_volume.py | 1 + cinder/volume/flows/manager/manage_existing.py | 1 + cinder/volume/manager.py | 1 + cinder/volume/qos_specs.py | 1 + cinder/volume/utils.py | 1 + cinder/volume/volume_types.py | 1 + cinder/wsgi.py | 1 + cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py | 1 + cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py | 1 + cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py | 1 + cinder/zonemanager/fc_san_lookup_service.py | 1 + cinder/zonemanager/fc_zone_manager.py | 1 + 161 files changed, 161 insertions(+) diff --git a/cinder/api/auth.py b/cinder/api/auth.py index 4b5e3379d..df9c130c2 100644 --- 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 fb5d4fb19..5574352a7 100644 --- 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 64e833d9c..99e513345 100644 --- 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 28ee136ef..d04c94fd1 100644 --- 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 85676ced4..f21cfd393 100644 --- 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 1fd5858d9..e5c76c859 100644 --- 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 8420c2a4c..5abbd7a3e 100644 --- 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 ffa1bf7f9..a5df4a1c0 100644 --- 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 b01601f1e..c7d8cf96f 100644 --- 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 574ccdfdc..7bec9c3e1 100644 --- 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 eec07f823..e50e7fb25 100644 --- 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 85d5a34d0..175f87aef 100644 --- 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 f3ade54b3..7a175f435 100644 --- 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 2d14e4a45..31c039f9a 100644 --- 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 d51ee8e9d..b5bc35ed8 100755 --- 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 d6c740b42..c2aab33da 100644 --- 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 3368a5b81..c29cbd190 100644 --- 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 ab8ff76bd..3b30e85bc 100755 --- 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 2f3e4f1ea..899fe4401 100644 --- 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 dd1566d42..0472bef4f 100644 --- 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 4c3717b2b..85fccb56b 100644 --- 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 c8d992ed7..ea046fed7 100644 --- 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 d4bfe6d83..92bd15406 100644 --- 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 90a52cbd7..90894c094 100644 --- 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 c2db50a89..e8596dc17 100644 --- 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 5bd8e4b44..9fb59b2f6 100644 --- 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 1f7359ff0..dd19efd01 100644 --- 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 b2df8b68f..17bc5ae81 100644 --- 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 e9a5295d6..4ab3c946f 100644 --- 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 1b916d567..b01ec6f01 100644 --- 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 6021473d6..9a07a7891 100644 --- 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 d8f17d424..a373bf9cd 100644 --- 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 b2df8b68f..17bc5ae81 100644 --- 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 f231ac9c3..01522de2a 100644 --- 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 99d5ffd50..c25c9eb02 100644 --- 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 d2bc37d85..e11c6bbc8 100644 --- 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 d8b0c19b1..dbe531dcf 100644 --- 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 cf96968d6..3b356b3d2 100644 --- 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 e0c9a31de..d84080fe1 100644 --- 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 533753ff6..b69ca53db 100644 --- 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 5fa735b5c..a60ae691b 100644 --- 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 a36e9cad9..9777a24fa 100644 --- 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 cc61dea5a..520b808dd 100644 --- 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 7efa42f82..fb8d266c8 100644 --- 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 7f2a1e925..90a2ad825 100644 --- 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 dca0bd5aa..f2c5f4534 100644 --- 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 04c0c3e5c..6b2c6c3d8 100644 --- 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 aacc9c512..2f23a4793 100644 --- 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 da71b1f87..40a54fcb2 100644 --- 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 4217d1a69..4f3d65d61 100644 --- 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 7aae5d662..ba37edb76 100644 --- 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 a786c6148..95ef42ea2 100644 --- 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 69a2fe715..b1afc52a9 100644 --- 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 8b1b1b8ee..248bee45e 100644 --- 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 63848efaa..b69ff346e 100644 --- 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 6dfb68ea2..f20b6fd0c 100644 --- 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 4558667ff..0d42b293d 100644 --- 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 6957f5da0..45220b482 100644 --- 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 701ff8a5b..e9fd7ba12 100644 --- 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 ebfdff8cb..6a7ae61ca 100644 --- 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 f30a1f54b..12020fe7a 100644 --- 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 105df9105..3f4f339ac 100644 --- 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 92879e421..6add9a8f3 100644 --- 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 3cdc6f918..472976d5b 100644 --- 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 4a81077dc..bce6e4016 100644 --- 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 b64f77646..5d5ddd178 100644 --- 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 7af95d5b8..caf4a700c 100644 --- 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 b7b2bc039..1210fb3aa 100644 --- 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 e4260b572..b8b04703a 100644 --- 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 ec1027d89..0f83e963a 100644 --- 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 663ef8977..5f872a912 100644 --- 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 37484fe72..0d405fdf1 100644 --- 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 6a6e34efa..0dedc274e 100755 --- 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 6fe3a6f36..088b15dad 100644 --- 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 3728a00b6..6e2808166 100644 --- 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 a352948aa..f152af716 100644 --- 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 735608bd8..e51d27f43 100644 --- 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 d74c72ace..b50b3a101 100644 --- 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 a28ed2a54..26aeede56 100644 --- 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 a05d455a3..3ed220b05 100644 --- 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 1ce1d7eae..588cb1fa7 100644 --- 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 548b9646e..4c7815745 100644 --- 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 858e8d244..652e66df7 100644 --- 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 0078388ef..dbe6c6d74 100644 --- 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 589787e62..0e572206f 100644 --- 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 6ac732c12..6ac863ecd 100644 --- 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 f7433df28..79ffd338f 100644 --- 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 9ca645ea9..37d79a8b8 100644 --- 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 1ec533aa5..870bd767a 100644 --- 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 d3fb33df2..0807e9464 100644 --- 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 41f15c16a..17ba2e360 100644 --- 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 89a22b859..5f217f74d 100644 --- 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 6ee1be088..c05bbbf84 100644 --- 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 ef7ce228b..faaded813 100644 --- 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 9dbba5808..f3ff96a06 100644 --- 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 c5a5c6841..60ab3f2a5 100644 --- 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 ce0b3edd4..0e93c2e2a 100644 --- 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 f63e36b5e..6eec44de0 100644 --- 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 246b5501c..0345d0546 100644 --- 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 807ee1dce..136a2df80 100644 --- 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 827b18f1c..e4a4e4fe8 100644 --- 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 4002d3569..dbfa17054 100644 --- 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 3f360422e..c9ca0798a 100644 --- 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 b88e5e90a..280599d43 100644 --- 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 9a6faa147..148eca589 100644 --- 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 32949bbb4..de6fabbca 100644 --- 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 131249f88..80a374ae6 100644 --- 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 b8c625976..ea2308f7d 100644 --- 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 652d5bd2a..d1313ee0f 100644 --- 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 10c744d4c..70659626c 100644 --- 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 b47a4fd64..a25f4831b 100644 --- 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 0948384ce..5ca7ad9ac 100644 --- 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 bdfe12d24..bcb26dfb3 100644 --- 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 6494f12df..b04df272d 100644 --- 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 7efd6e160..173650394 100644 --- 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 b5ecdd414..b192b7189 100644 --- 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 3f9621ae9..39181cf28 100644 --- 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 2011fe171..630b87b8d 100644 --- 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 41622a370..8899a7c2f 100644 --- 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 492735b2f..aee4244e5 100644 --- 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 c4d183656..d29733beb 100644 --- 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 767689720..db35583ad 100644 --- 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 6f91a2b53..22248df03 100644 --- 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 2d2f1bbc3..168d0169c 100644 --- 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 6b371af3f..9b92421ed 100644 --- 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 14992a129..9c519aede 100644 --- 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 93874d847..a2d28c525 100644 --- 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 38c67a088..48cd899af 100644 --- 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 22fe2170b..5127204d6 100644 --- 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 ca92f65ca..43d8d8b04 100644 --- 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 1203b4b44..3353811f0 100644 --- 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 da323dfad..1e2ab7a82 100644 --- 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 0151058f1..66810417b 100644 --- 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 f291dc8c4..63d5cd438 100644 --- 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 cb9597e26..c92ff4322 100644 --- 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 6b647af78..30993e55c 100644 --- 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 123ae9f53..ecec15ab8 100644 --- 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 0084d189b..b2ce28f48 100644 --- 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 ca93d8c0d..4bc4880da 100644 --- 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 f1991064d..08dbd2291 100644 --- 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 fd6703766..dd66947b2 100644 --- 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 82fc65ebd..d9ce3257c 100644 --- 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 4ced19cfc..5b3382129 100644 --- 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 9e4a989b5..49c67bc92 100644 --- 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 166e764fd..f02c1188a 100644 --- 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 0d2fbbac0..63dd94187 100644 --- 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 5e53d6663..1abf0d41c 100644 --- 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 99d11ff69..cae96ffa5 100644 --- 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 ba35d7d47..6ff83c875 100644 --- 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 8fda97f33..0e361b51a 100644 --- 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 2de879b68..d18268268 100644 --- 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 617895b88..aad9fe9ad 100644 --- 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 be60dd648..456ace78c 100644 --- 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 da08d3f16..cb4c40de5 100644 --- 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 42c92170f..4ae1a39b3 100644 --- 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 2798894b6..336d923fe 100644 --- 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 810d826a2..a4dde326c 100644 --- 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 bfd0863b8..64e6cd423 100644 --- 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 6466eb311..d1728ca3b 100644 --- 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 488526297..c781cf7fe 100644 --- 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 1710d2219..25f87e81e 100644 --- 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 -- 2.45.2