Remove the monkey patching of _ into the builtins

Previous _ was monkey patched into builtins whenever
certain modules were imported. This removes that and
simply imports it when it is needed.

Change-Id: I0af2c6d8a230e94440d655d13cab9107ac20d13c

doc/source/devref/il8n.rst

@@ -19,16 +19,6 @@ If you do not follow the project conventions, your code may cause the
 LocalizationTestCase.test_multiple_positional_format_placeholders test to fail
 in nova/tests/test_localization.py.
 
-The ``_()`` function is brought into the global scope by doing::
+The ``_()`` function is found by doing::
 
-    from nova.openstack.common import gettextutils
-    gettextutils.install('nova')
-
-These lines are needed in any toplevel script before any nova modules are
-imported. If this code is missing, it may result in an error that looks like::
-
-    NameError: name '_' is not defined
-
-The gettextutils.install() function also queries the NOVA_LOCALEDIR environment
-variable to allow overriding the default localedir with a specific custom
-location for Nova's message catalog.
+    from nova.openstack.common.gettextutils import _

nova/api/auth.py

@@ -23,6 +23,7 @@ import webob.dec
 import webob.exc
 
 from nova import context
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova import wsgi

nova/api/ec2/__init__.py

@@ -34,6 +34,7 @@ from nova.api.ec2 import faults
 from nova.api import validator
 from nova import context
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging

nova/api/ec2/apirequest.py

@@ -27,6 +27,7 @@ from xml.dom import minidom
 
 from nova.api.ec2 import ec2utils
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

nova/api/ec2/cloud.py

@@ -44,6 +44,7 @@ from nova.image import s3
 from nova import network
 from nova.network.security_group import neutron_driver
 from nova.objects import instance as instance_obj
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import quota

nova/api/ec2/ec2utils.py

@@ -25,6 +25,7 @@ from nova import db
 from nova import exception
 from nova.network import model as network_model
 from nova.objects import instance as instance_obj
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova.openstack.common import memorycache
 from nova.openstack.common import timeutils

nova/api/metadata/handler.py

@@ -28,6 +28,7 @@ import webob.exc
 from nova.api.metadata import base
 from nova import conductor
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova.openstack.common import memorycache
 from nova import wsgi

nova/api/metadata/password.py

@@ -17,6 +17,7 @@ from webob import exc
 
 from nova import conductor
 from nova import context
+from nova.openstack.common.gettextutils import _
 from nova import utils
 
 

nova/api/openstack/__init__.py

@@ -30,6 +30,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import exception
 from nova import notifications
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova import utils
 from nova import wsgi as base_wsgi

nova/api/openstack/common.py

@@ -30,6 +30,7 @@ from nova.compute import task_states
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova import quota
 

nova/api/openstack/compute/contrib/admin_actions.py

@@ -24,6 +24,7 @@ from nova.api.openstack import wsgi
 from nova import compute
 from nova.compute import vm_states
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/aggregates.py

@@ -20,6 +20,7 @@ from webob import exc
 from nova.api.openstack import extensions
 from nova.compute import api as compute_api
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/attach_interfaces.py

@@ -22,6 +22,7 @@ from nova.api.openstack import extensions
 from nova import compute
 from nova import exception
 from nova import network
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 

nova/api/openstack/compute/contrib/baremetal_nodes.py

@@ -21,6 +21,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.virt.baremetal import db
 
 authorize = extensions.extension_authorizer('compute', 'baremetal_nodes')

nova/api/openstack/compute/contrib/cells.py

@@ -28,6 +28,7 @@ from nova.cells import rpc_driver
 from nova.cells import rpcapi as cells_rpcapi
 from nova.compute import api as compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 

nova/api/openstack/compute/contrib/certificates.py

@@ -21,6 +21,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 import nova.cert.rpcapi
 from nova import network
+from nova.openstack.common.gettextutils import _
 
 authorize = extensions.extension_authorizer('compute', 'certificates')
 

nova/api/openstack/compute/contrib/cloudpipe.py

@@ -27,6 +27,7 @@ from nova import db
 from nova import exception
 from nova import network
 from nova.openstack.common import fileutils
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import timeutils
 from nova import utils
 

nova/api/openstack/compute/contrib/cloudpipe_update.py

@@ -20,6 +20,7 @@ import webob.exc
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import db
+from nova.openstack.common.gettextutils import _
 
 authorize = extensions.extension_authorizer('compute', 'cloudpipe_update')
 

nova/api/openstack/compute/contrib/console_output.py

@@ -23,6 +23,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 
 authorize = extensions.extension_authorizer('compute', 'console_output')

nova/api/openstack/compute/contrib/consoles.py

@@ -20,6 +20,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 
 authorize = extensions.extension_authorizer('compute', 'consoles')

nova/api/openstack/compute/contrib/coverage_ext.py

@@ -30,6 +30,7 @@ from webob import exc
 from nova.api.openstack import extensions
 from nova import baserpc
 from nova import db
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova.openstack.common.rpc import common as rpc_common
 

nova/api/openstack/compute/contrib/disk_config.py

@@ -21,6 +21,7 @@ from webob import exc
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import strutils
 
 ALIAS = 'OS-DCF'

nova/api/openstack/compute/contrib/evacuate.py

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

nova/api/openstack/compute/contrib/fixed_ips.py

@@ -19,6 +19,7 @@ import webob.exc
 from nova.api.openstack import extensions
 from nova import db
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 authorize = extensions.extension_authorizer('compute', 'fixed_ips')
 

nova/api/openstack/compute/contrib/flavor_access.py

@@ -24,6 +24,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova.compute import flavors
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 
 authorize = extensions.soft_extension_authorizer('compute', 'flavor_access')

nova/api/openstack/compute/contrib/flavorextraspecs.py

@@ -24,6 +24,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import db
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 
 authorize = extensions.extension_authorizer('compute', 'flavorextraspecs')

nova/api/openstack/compute/contrib/floating_ip_dns.py

@@ -23,6 +23,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import exception
 from nova import network
+from nova.openstack.common.gettextutils import _
 from nova import utils
 
 

nova/api/openstack/compute/contrib/floating_ips.py

@@ -26,6 +26,7 @@ from nova import compute
 from nova.compute import utils as compute_utils
 from nova import exception
 from nova import network
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova.openstack.common import uuidutils
 

nova/api/openstack/compute/contrib/floating_ips_bulk.py

@@ -21,6 +21,7 @@ import webob.exc
 from nova.api.openstack import extensions
 from nova import db
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 CONF = cfg.CONF

nova/api/openstack/compute/contrib/fping.py

@@ -26,6 +26,7 @@ from nova.api.openstack import common
 from nova.api.openstack import extensions
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova import utils
 
 authorize = extensions.extension_authorizer('compute', 'fping')

nova/api/openstack/compute/contrib/hosts.py

@@ -22,6 +22,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/hypervisors.py

@@ -22,6 +22,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 
 authorize = extensions.extension_authorizer('compute', 'hypervisors')

nova/api/openstack/compute/contrib/instance_usage_audit_log.py

@@ -23,6 +23,7 @@ import webob.exc
 
 from nova.api.openstack import extensions
 from nova import compute
+from nova.openstack.common.gettextutils import _
 from nova import utils
 
 CONF = cfg.CONF

nova/api/openstack/compute/contrib/keypairs.py

@@ -26,6 +26,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova.compute import api as compute_api
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 
 authorize = extensions.extension_authorizer('compute', 'keypairs')

nova/api/openstack/compute/contrib/multinic.py

@@ -22,6 +22,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 

nova/api/openstack/compute/contrib/networks_associate.py

@@ -4,6 +4,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import exception
 from nova import network
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/os_networks.py

@@ -24,6 +24,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import exception
 from nova import network
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/os_tenant_networks.py

@@ -25,6 +25,7 @@ from nova.api.openstack import extensions
 from nova import context as nova_context
 from nova import exception
 import nova.network
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova import quota
 

nova/api/openstack/compute/contrib/quotas.py

@@ -24,6 +24,7 @@ from nova.api.openstack import xmlutil
 import nova.context
 from nova import db
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova.openstack.common import strutils
 from nova import quota

nova/api/openstack/compute/contrib/rescue.py

@@ -23,6 +23,7 @@ from nova.api.openstack import extensions as exts
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova import utils
 
 

nova/api/openstack/compute/contrib/scheduler_hints.py

@@ -18,6 +18,7 @@ import webob.exc
 
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
+from nova.openstack.common.gettextutils import _
 
 
 class SchedulerHintsController(wsgi.Controller):

nova/api/openstack/compute/contrib/security_group_default_rules.py

@@ -25,6 +25,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import exception
 from nova.network.security_group import openstack_driver
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 

nova/api/openstack/compute/contrib/security_groups.py

@@ -31,6 +31,7 @@ from nova.compute import api as compute_api
 from nova import exception
 from nova.network.security_group import neutron_driver
 from nova.network.security_group import openstack_driver
+from nova.openstack.common.gettextutils import _
 from nova.virt import netutils
 
 

nova/api/openstack/compute/contrib/server_diagnostics.py

@@ -20,6 +20,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 
 authorize = extensions.extension_authorizer('compute', 'server_diagnostics')

nova/api/openstack/compute/contrib/server_start_stop.py

@@ -21,6 +21,7 @@ from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
 from nova.objects import instance as instance_obj
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 

nova/api/openstack/compute/contrib/services.py

@@ -22,6 +22,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova import servicegroup
 from nova import utils
 

nova/api/openstack/compute/contrib/shelve.py

@@ -22,6 +22,7 @@ from nova.api.openstack import extensions as exts
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 
 auth_shelve = exts.extension_authorizer('compute', 'shelve')

nova/api/openstack/compute/contrib/simple_tenant_usage.py

@@ -26,6 +26,7 @@ from nova.api.openstack import xmlutil
 from nova.compute import api
 from nova.compute import flavors
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import timeutils
 
 authorize_show = extensions.extension_authorizer('compute',

nova/api/openstack/compute/contrib/volumes.py

@@ -24,6 +24,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova.openstack.common import strutils
 from nova.openstack.common import uuidutils

nova/api/openstack/compute/extensions.py

@@ -18,6 +18,7 @@
 from oslo.config import cfg
 
 from nova.api.openstack import extensions as base_extensions
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 ext_opts = [

nova/api/openstack/compute/flavors.py

@@ -23,6 +23,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova.compute import flavors
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import strutils
 from nova import utils
 

nova/api/openstack/compute/image_metadata.py

@@ -21,6 +21,7 @@ from nova.api.openstack import common
 from nova.api.openstack import wsgi
 from nova import exception
 from nova.image import glance
+from nova.openstack.common.gettextutils import _
 
 
 class Controller(object):

nova/api/openstack/compute/images.py

@@ -21,6 +21,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import exception
 import nova.image.glance
+from nova.openstack.common.gettextutils import _
 import nova.utils
 
 

nova/api/openstack/compute/ips.py

@@ -22,6 +22,7 @@ from nova.api.openstack import common
 from nova.api.openstack.compute.views import addresses as view_addresses
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
+from nova.openstack.common.gettextutils import _
 
 
 def make_network(elem):

nova/api/openstack/compute/limits.py

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

nova/api/openstack/compute/plugins/__init__.py

@@ -16,6 +16,7 @@
 
 
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/plugins/v3/admin_actions.py

@@ -24,6 +24,7 @@ from nova.api.openstack import wsgi
 from nova import compute
 from nova.compute import vm_states
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/plugins/v3/aggregates.py

@@ -21,6 +21,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.compute import api as compute_api
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 

nova/api/openstack/compute/plugins/v3/attach_interfaces.py

@@ -22,6 +22,7 @@ from nova.api.openstack import extensions
 from nova import compute
 from nova import exception
 from nova import network
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 

nova/api/openstack/compute/plugins/v3/baremetal_nodes.py

@@ -21,6 +21,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.virt.baremetal import db
 
 ALIAS = 'os-baremetal-nodes'

nova/api/openstack/compute/plugins/v3/cells.py

@@ -28,6 +28,7 @@ from nova.cells import rpc_driver
 from nova.cells import rpcapi as cells_rpcapi
 from nova.compute import api as compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 

nova/api/openstack/compute/plugins/v3/certificates.py

@@ -21,6 +21,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 import nova.cert.rpcapi
 from nova import network
+from nova.openstack.common.gettextutils import _
 
 ALIAS = "os-certificates"
 authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS)

nova/api/openstack/compute/plugins/v3/console_output.py

@@ -23,6 +23,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 ALIAS = "os-console-output"
 authorize = extensions.extension_authorizer('compute', "v3:" + ALIAS)

nova/api/openstack/compute/plugins/v3/coverage.py

@@ -32,6 +32,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import baserpc
 from nova import db
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova.openstack.common.rpc import common as rpc_common
 

nova/api/openstack/compute/plugins/v3/disk_config.py

@@ -21,6 +21,7 @@ from webob import exc
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import strutils
 
 ALIAS = 'OS-DCF'

nova/api/openstack/compute/plugins/v3/evacuate.py

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

nova/api/openstack/compute/plugins/v3/extended_volumes.py

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

nova/api/openstack/compute/plugins/v3/extension_info.py

@@ -19,6 +19,7 @@ import webob.exc
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 

nova/api/openstack/compute/plugins/v3/fixed_ips.py

@@ -19,6 +19,7 @@ import webob.exc
 from nova.api.openstack import extensions
 from nova import db
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/plugins/v3/flavor_access.py

@@ -24,6 +24,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova.compute import flavors
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 ALIAS = 'os-flavor-access'
 authorize = extensions.soft_extension_authorizer('compute', 'v3:' + ALIAS)

nova/api/openstack/compute/plugins/v3/flavors.py

@@ -24,6 +24,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova.compute import flavors
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import strutils
 
 

nova/api/openstack/compute/plugins/v3/fping.py

@@ -26,6 +26,7 @@ from nova.api.openstack import common
 from nova.api.openstack import extensions
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova import utils
 
 ALIAS = "os-fping"

nova/api/openstack/compute/plugins/v3/hosts.py

@@ -22,6 +22,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/plugins/v3/hypervisors.py

@@ -22,6 +22,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 
 ALIAS = "os-hypervisors"

nova/api/openstack/compute/plugins/v3/image_metadata.py

@@ -22,6 +22,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import exception
 from nova.image import glance
+from nova.openstack.common.gettextutils import _
 
 ALIAS = "os-image-metadata"
 authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS)

nova/api/openstack/compute/plugins/v3/images.py

@@ -22,6 +22,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import exception
 import nova.image.glance
+from nova.openstack.common.gettextutils import _
 import nova.utils
 
 

nova/api/openstack/compute/plugins/v3/instance_actions.py

@@ -20,6 +20,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 ALIAS = "os-instance-actions"
 authorize_actions = extensions.extension_authorizer('compute',

nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py

@@ -23,6 +23,7 @@ import webob.exc
 
 from nova.api.openstack import extensions
 from nova import compute
+from nova.openstack.common.gettextutils import _
 from nova import utils
 
 CONF = cfg.CONF

nova/api/openstack/compute/plugins/v3/ips.py

@@ -23,6 +23,7 @@ from nova.api.openstack.compute.views import addresses as view_addresses
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
+from nova.openstack.common.gettextutils import _
 
 
 def make_network(elem):

nova/api/openstack/compute/plugins/v3/keypairs.py

@@ -26,6 +26,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova.compute import api as compute_api
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 
 ALIAS = 'os-keypairs'

nova/api/openstack/compute/plugins/v3/limits.py

@@ -31,6 +31,7 @@ from nova.api.openstack.compute.views import limits as limits_views
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
 from nova import quota

nova/api/openstack/compute/plugins/v3/multinic.py

@@ -22,6 +22,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 

nova/api/openstack/compute/plugins/v3/quota_sets.py

@@ -24,6 +24,7 @@ from nova.api.openstack import xmlutil
 import nova.context
 from nova import db
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova.openstack.common import strutils
 from nova import quota

nova/api/openstack/compute/plugins/v3/rescue.py

@@ -23,6 +23,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova import utils
 
 

nova/api/openstack/compute/plugins/v3/scheduler_hints.py

@@ -18,6 +18,7 @@ import webob.exc
 
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
+from nova.openstack.common.gettextutils import _
 
 ALIAS = "os-scheduler-hints"
 

nova/api/openstack/compute/plugins/v3/security_groups.py

@@ -30,6 +30,7 @@ from nova.compute import api as compute_api
 from nova import exception
 from nova.network.security_group import neutron_driver
 from nova.network.security_group import openstack_driver
+from nova.openstack.common.gettextutils import _
 
 
 ALIAS = 'os-security-groups'

nova/api/openstack/compute/plugins/v3/server_diagnostics.py

@@ -20,6 +20,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 
 ALIAS = "os-server-diagnostics"

nova/api/openstack/compute/plugins/v3/server_metadata.py

@@ -22,6 +22,7 @@ from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 
 class ServerMetadataController(object):

nova/api/openstack/compute/plugins/v3/servers.py

@@ -33,6 +33,7 @@ from nova import compute
 from nova.compute import flavors
 from nova import exception
 from nova.objects import instance as instance_obj
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
 from nova.openstack.common.rpc import common as rpc_common

nova/api/openstack/compute/plugins/v3/services.py

@@ -22,6 +22,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova import servicegroup
 from nova import utils
 

nova/api/openstack/compute/plugins/v3/shelve.py

@@ -22,6 +22,7 @@ from nova.api.openstack import extensions as exts
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 
 ALIAS = 'os-shelve'

nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py

@@ -26,6 +26,7 @@ from nova.api.openstack import xmlutil
 from nova.compute import api
 from nova.compute import flavors
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import timeutils
 
 ALIAS = 'os-simple-tenant-usage'

nova/api/openstack/compute/server_metadata.py

@@ -21,6 +21,7 @@ from nova.api.openstack import common
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
+from nova.openstack.common.gettextutils import _
 
 
 class Controller(object):

nova/api/openstack/compute/servers.py

@@ -30,6 +30,7 @@ from nova.api.openstack import xmlutil
 from nova import compute
 from nova.compute import flavors
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
 from nova.openstack.common.rpc import common as rpc_common

nova/api/openstack/compute/views/servers.py

@@ -24,6 +24,7 @@ from nova.api.openstack.compute.views import flavors as views_flavors
 from nova.api.openstack.compute.views import images as views_images
 from nova.compute import flavors
 from nova.objects import instance as instance_obj
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import utils

nova/api/openstack/extensions.py

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

nova/api/openstack/wsgi.py

@@ -25,6 +25,7 @@ import webob
 
 from nova.api.openstack import xmlutil
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova import wsgi

nova/api/openstack/xmlutil.py

@@ -24,6 +24,7 @@ from xml import sax
 from xml.sax import expatreader
 
 from nova import exception
+from nova.openstack.common.gettextutils import _
 from nova import utils
 
 

nova/api/sizelimit.py

@@ -22,6 +22,7 @@ from oslo.config import cfg
 import webob.dec
 import webob.exc
 
+from nova.openstack.common.gettextutils import _
 from nova import wsgi
 
 

nova/api/validator.py

@@ -19,6 +19,7 @@
 import base64
 import re
 
+from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging