Browse Source

Merge "Migrate to oslo.i18n"

changes/49/136549/6
Jenkins 7 years ago
committed by Gerrit Code Review
parent
commit
988bd650d2
  1. 2
      neutron/agent/dhcp_agent.py
  2. 2
      neutron/agent/l3_agent.py
  3. 2
      neutron/agent/l3_ha_agent.py
  4. 2
      neutron/agent/linux/async_process.py
  5. 2
      neutron/agent/linux/daemon.py
  6. 2
      neutron/agent/linux/dhcp.py
  7. 2
      neutron/agent/linux/external_process.py
  8. 2
      neutron/agent/linux/interface.py
  9. 2
      neutron/agent/linux/ip_link_support.py
  10. 2
      neutron/agent/linux/iptables_firewall.py
  11. 2
      neutron/agent/linux/iptables_manager.py
  12. 2
      neutron/agent/linux/keepalived.py
  13. 2
      neutron/agent/linux/ovs_lib.py
  14. 2
      neutron/agent/linux/ovsdb_monitor.py
  15. 2
      neutron/agent/metadata/agent.py
  16. 2
      neutron/agent/metadata/namespace_proxy.py
  17. 2
      neutron/agent/netns_cleanup_util.py
  18. 2
      neutron/agent/ovs_cleanup_util.py
  19. 2
      neutron/agent/rpc.py
  20. 2
      neutron/agent/securitygroups_rpc.py
  21. 2
      neutron/api/api_common.py
  22. 2
      neutron/api/extensions.py
  23. 2
      neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py
  24. 2
      neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py
  25. 2
      neutron/api/rpc/handlers/dhcp_rpc.py
  26. 2
      neutron/api/rpc/handlers/l3_rpc.py
  27. 2
      neutron/api/v2/base.py
  28. 6
      neutron/api/v2/resource.py
  29. 4
      neutron/api/versions.py
  30. 2
      neutron/cmd/sanity/checks.py
  31. 2
      neutron/cmd/sanity_check.py
  32. 2
      neutron/common/config.py
  33. 2
      neutron/common/ipv6_utils.py
  34. 2
      neutron/db/agents_db.py
  35. 2
      neutron/db/db_base_plugin_v2.py
  36. 2
      neutron/db/dvr_mac_db.py
  37. 2
      neutron/db/l3_agentschedulers_db.py
  38. 2
      neutron/db/l3_db.py
  39. 2
      neutron/db/l3_dvr_db.py
  40. 2
      neutron/db/l3_dvrscheduler_db.py
  41. 3
      neutron/db/l3_hamode_db.py
  42. 2
      neutron/db/metering/metering_rpc.py
  43. 2
      neutron/db/migration/alembic_migrations/heal_script.py
  44. 2
      neutron/db/securitygroups_rpc_base.py
  45. 2
      neutron/db/vpn/vpn_db.py
  46. 2
      neutron/debug/commands.py
  47. 2
      neutron/debug/debug_agent.py
  48. 2
      neutron/extensions/l3agentscheduler.py
  49. 30
      neutron/i18n.py
  50. 2
      neutron/notifiers/nova.py
  51. 498
      neutron/openstack/common/gettextutils.py
  52. 2
      neutron/plugins/bigswitch/db/consistency_db.py
  53. 2
      neutron/plugins/cisco/cfg_agent/cfg_agent.py
  54. 2
      neutron/plugins/cisco/cfg_agent/device_drivers/csr1kv/csr1kv_routing_driver.py
  55. 2
      neutron/plugins/cisco/cfg_agent/device_drivers/driver_mgr.py
  56. 2
      neutron/plugins/cisco/cfg_agent/device_status.py
  57. 2
      neutron/plugins/cisco/cfg_agent/service_helpers/routing_svc_helper.py
  58. 2
      neutron/plugins/cisco/db/l3/device_handling_db.py
  59. 2
      neutron/plugins/cisco/db/l3/l3_router_appliance_db.py
  60. 2
      neutron/plugins/cisco/db/n1kv_db_v2.py
  61. 2
      neutron/plugins/cisco/l3/hosting_device_drivers/csr1kv_hd_driver.py
  62. 2
      neutron/plugins/cisco/l3/plugging_drivers/n1kv_trunking_driver.py
  63. 2
      neutron/plugins/cisco/l3/service_vm_lib.py
  64. 2
      neutron/plugins/cisco/models/virt_phy_sw_v2.py
  65. 2
      neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
  66. 2
      neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
  67. 2
      neutron/plugins/ml2/db.py
  68. 2
      neutron/plugins/ml2/drivers/arista/arista_l3_driver.py
  69. 2
      neutron/plugins/ml2/drivers/arista/mechanism_arista.py
  70. 2
      neutron/plugins/ml2/drivers/brocade/mechanism_brocade.py
  71. 2
      neutron/plugins/ml2/drivers/brocade/nos/nosdriver.py
  72. 2
      neutron/plugins/ml2/drivers/cisco/apic/apic_sync.py
  73. 2
      neutron/plugins/ml2/drivers/cisco/apic/apic_topology.py
  74. 2
      neutron/plugins/ml2/drivers/cisco/nexus/nexus_db_v2.py
  75. 2
      neutron/plugins/ml2/drivers/freescale/mechanism_fslsdn.py
  76. 2
      neutron/plugins/ml2/drivers/helpers.py
  77. 2
      neutron/plugins/ml2/drivers/l2pop/mech_driver.py
  78. 2
      neutron/plugins/ml2/drivers/mech_agent.py
  79. 2
      neutron/plugins/ml2/drivers/mech_bigswitch/driver.py
  80. 2
      neutron/plugins/ml2/drivers/mech_nuage/driver.py
  81. 2
      neutron/plugins/ml2/drivers/mech_sriov/mech_driver.py
  82. 2
      neutron/plugins/ml2/drivers/type_flat.py
  83. 2
      neutron/plugins/ml2/drivers/type_gre.py
  84. 2
      neutron/plugins/ml2/drivers/type_local.py
  85. 2
      neutron/plugins/ml2/drivers/type_tunnel.py
  86. 2
      neutron/plugins/ml2/drivers/type_vlan.py
  87. 2
      neutron/plugins/ml2/drivers/type_vxlan.py
  88. 2
      neutron/plugins/ml2/managers.py
  89. 2
      neutron/plugins/ml2/plugin.py
  90. 2
      neutron/plugins/ml2/rpc.py
  91. 2
      neutron/plugins/mlnx/agent/eswitch_neutron_agent.py
  92. 2
      neutron/plugins/nuage/syncmanager.py
  93. 2
      neutron/plugins/ofagent/agent/arp_lib.py
  94. 2
      neutron/plugins/ofagent/agent/ofa_neutron_agent.py
  95. 2
      neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py
  96. 2
      neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
  97. 2
      neutron/plugins/vmware/plugins/base.py
  98. 2
      neutron/policy.py
  99. 2
      neutron/scheduler/dhcp_agent_scheduler.py
  100. 2
      neutron/scheduler/l3_agent_scheduler.py

2
neutron/agent/dhcp_agent.py

@ -38,8 +38,8 @@ from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.common import utils
from neutron import context
from neutron.i18n import _LE, _LI, _LW
from neutron import manager
from neutron.openstack.common.gettextutils import _LE, _LI, _LW
from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
from neutron.openstack.common import service

2
neutron/agent/l3_agent.py

@ -44,8 +44,8 @@ from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.common import utils as common_utils
from neutron import context as n_context
from neutron.i18n import _LE, _LI, _LW
from neutron import manager
from neutron.openstack.common.gettextutils import _LE, _LI, _LW
from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
from neutron.openstack.common import periodic_task

2
neutron/agent/l3_ha_agent.py

@ -21,7 +21,7 @@ from oslo.config import cfg
from neutron.agent.linux import keepalived
from neutron.common import constants as l3_constants
from neutron.openstack.common.gettextutils import _LE
from neutron.i18n import _LE
from neutron.openstack.common import log as logging
from neutron.openstack.common import periodic_task

2
neutron/agent/linux/async_process.py

@ -17,7 +17,7 @@ import eventlet.event
import eventlet.queue
from neutron.agent.linux import utils
from neutron.openstack.common.gettextutils import _LE
from neutron.i18n import _LE
from neutron.openstack.common import log as logging

2
neutron/agent/linux/daemon.py

@ -18,7 +18,7 @@ import os
import signal
import sys
from neutron.openstack.common.gettextutils import _LE
from neutron.i18n import _LE
from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)

2
neutron/agent/linux/dhcp.py

@ -32,7 +32,7 @@ from neutron.agent.linux import utils
from neutron.common import constants
from neutron.common import exceptions
from neutron.common import utils as commonutils
from neutron.openstack.common.gettextutils import _LE
from neutron.i18n import _LE
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils

2
neutron/agent/linux/external_process.py

@ -19,7 +19,7 @@ from oslo.config import cfg
from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils
from neutron.openstack.common.gettextutils import _LE
from neutron.i18n import _LE
from neutron.openstack.common import lockutils
from neutron.openstack.common import log as logging

2
neutron/agent/linux/interface.py

@ -27,7 +27,7 @@ from neutron.agent.linux import utils
from neutron.common import constants as n_const
from neutron.common import exceptions
from neutron.extensions import flavor
from neutron.openstack.common.gettextutils import _LE, _LI
from neutron.i18n import _LE, _LI
from neutron.openstack.common import log as logging

2
neutron/agent/linux/ip_link_support.py

@ -17,7 +17,7 @@ import re
from neutron.agent.linux import utils
from neutron.common import exceptions as n_exc
from neutron.openstack.common.gettextutils import _LE
from neutron.i18n import _LE
from neutron.openstack.common import log as logging

2
neutron/agent/linux/iptables_firewall.py

@ -22,7 +22,7 @@ from neutron.agent.linux import iptables_comments as ic
from neutron.agent.linux import iptables_manager
from neutron.common import constants
from neutron.common import ipv6_utils
from neutron.openstack.common.gettextutils import _LI
from neutron.i18n import _LI
from neutron.openstack.common import log as logging

2
neutron/agent/linux/iptables_manager.py

@ -29,7 +29,7 @@ from neutron.agent.common import config
from neutron.agent.linux import iptables_comments as ic
from neutron.agent.linux import utils as linux_utils
from neutron.common import utils
from neutron.openstack.common.gettextutils import _LE, _LW
from neutron.i18n import _LE, _LW
from neutron.openstack.common import lockutils
from neutron.openstack.common import log as logging

2
neutron/agent/linux/keepalived.py

@ -21,7 +21,7 @@ from oslo.config import cfg
from neutron.agent.linux import external_process
from neutron.agent.linux import utils
from neutron.common import exceptions
from neutron.openstack.common.gettextutils import _LW
from neutron.i18n import _LW
from neutron.openstack.common import log as logging
VALID_STATES = ['MASTER', 'BACKUP']

2
neutron/agent/linux/ovs_lib.py

@ -23,7 +23,7 @@ from oslo.utils import excutils
from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils
from neutron.common import exceptions
from neutron.openstack.common.gettextutils import _LE, _LI, _LW
from neutron.i18n import _LE, _LI, _LW
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants

2
neutron/agent/linux/ovsdb_monitor.py

@ -15,7 +15,7 @@
import eventlet
from neutron.agent.linux import async_process
from neutron.openstack.common.gettextutils import _LE
from neutron.i18n import _LE
from neutron.openstack.common import log as logging

2
neutron/agent/metadata/agent.py

@ -37,8 +37,8 @@ from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.common import utils
from neutron import context
from neutron.i18n import _LE, _LW
from neutron.openstack.common.cache import cache
from neutron.openstack.common.gettextutils import _LE, _LW
from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
from neutron import wsgi

2
neutron/agent/metadata/namespace_proxy.py

@ -26,7 +26,7 @@ import webob
from neutron.agent.linux import daemon
from neutron.common import config
from neutron.common import utils
from neutron.openstack.common.gettextutils import _LE
from neutron.i18n import _LE
from neutron.openstack.common import log as logging
from neutron import wsgi

2
neutron/agent/netns_cleanup_util.py

@ -30,7 +30,7 @@ from neutron.agent.linux import ip_lib
from neutron.agent.linux import ovs_lib
from neutron.api.v2 import attributes
from neutron.common import config
from neutron.openstack.common.gettextutils import _LE
from neutron.i18n import _LE
from neutron.openstack.common import log as logging

2
neutron/agent/ovs_cleanup_util.py

@ -21,7 +21,7 @@ from neutron.agent.linux import interface
from neutron.agent.linux import ip_lib
from neutron.agent.linux import ovs_lib
from neutron.common import config
from neutron.openstack.common.gettextutils import _LI
from neutron.i18n import _LI
from neutron.openstack.common import log as logging

2
neutron/agent/rpc.py

@ -19,7 +19,7 @@ from oslo.utils import timeutils
from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.openstack.common.gettextutils import _LW
from neutron.i18n import _LW
from neutron.openstack.common import log as logging

2
neutron/agent/securitygroups_rpc.py

@ -22,7 +22,7 @@ from oslo.utils import importutils
from neutron.agent import firewall
from neutron.common import topics
from neutron.openstack.common.gettextutils import _LI, _LW
from neutron.i18n import _LI, _LW
from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)

2
neutron/api/api_common.py

@ -20,7 +20,7 @@ from webob import exc
from neutron.common import constants
from neutron.common import exceptions
from neutron.openstack.common.gettextutils import _LW
from neutron.i18n import _LW
from neutron.openstack.common import log as logging

2
neutron/api/extensions.py

@ -27,8 +27,8 @@ import webob.exc
from neutron.common import exceptions
import neutron.extensions
from neutron.i18n import _LE, _LI, _LW
from neutron import manager
from neutron.openstack.common.gettextutils import _LE, _LI, _LW
from neutron.openstack.common import log as logging
from neutron import policy
from neutron import wsgi

2
neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py

@ -17,8 +17,8 @@ from neutron.common import constants
from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.common import utils
from neutron.i18n import _LE, _LW
from neutron import manager
from neutron.openstack.common.gettextutils import _LE, _LW
from neutron.openstack.common import log as logging

2
neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py

@ -19,8 +19,8 @@ from neutron.common import constants
from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.common import utils
from neutron.i18n import _LE
from neutron import manager
from neutron.openstack.common.gettextutils import _LE
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as service_constants

2
neutron/api/rpc/handlers/dhcp_rpc.py

@ -23,8 +23,8 @@ from neutron.common import constants
from neutron.common import exceptions as n_exc
from neutron.common import utils
from neutron.extensions import portbindings
from neutron.i18n import _LW
from neutron import manager
from neutron.openstack.common.gettextutils import _LW
from neutron.openstack.common import log as logging

2
neutron/api/rpc/handlers/l3_rpc.py

@ -23,8 +23,8 @@ from neutron.common import utils
from neutron import context as neutron_context
from neutron.extensions import l3
from neutron.extensions import portbindings
from neutron.i18n import _LE
from neutron import manager
from neutron.openstack.common.gettextutils import _LE
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as plugin_constants

2
neutron/api/v2/base.py

@ -27,7 +27,7 @@ from neutron.api.v2 import resource as wsgi_resource
from neutron.common import constants as const
from neutron.common import exceptions
from neutron.common import rpc as n_rpc
from neutron.openstack.common.gettextutils import _LE, _LI
from neutron.i18n import _LE, _LI
from neutron.openstack.common import log as logging
from neutron.openstack.common import policy as common_policy
from neutron import policy

6
neutron/api/v2/resource.py

@ -20,13 +20,13 @@ Utility methods for working with WSGI servers redux
import sys
import netaddr
from oslo import i18n
import six
import webob.dec
import webob.exc
from neutron.common import exceptions
from neutron.openstack.common import gettextutils
from neutron.openstack.common.gettextutils import _LE, _LI
from neutron.i18n import _LE, _LI
from neutron.openstack.common import log as logging
from neutron.openstack.common import policy as common_policy
from neutron import wsgi
@ -173,7 +173,7 @@ def translate(translatable, locale):
:returns: the translated object, or the object as-is if it
was not translated
"""
localize = gettextutils.translate
localize = i18n.translate
if isinstance(translatable, exceptions.NeutronException):
translatable.msg = localize(translatable.msg, locale)
elif isinstance(translatable, webob.exc.HTTPError):

4
neutron/api/versions.py

@ -13,10 +13,10 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo import i18n
import webob.dec
from neutron.api.views import versions as versions_view
from neutron.openstack.common import gettextutils
from neutron.openstack.common import log as logging
from neutron import wsgi
@ -43,7 +43,7 @@ class Versions(object):
if req.path != '/':
language = req.best_match_language()
msg = _('Unknown API version specified')
msg = gettextutils.translate(msg, language)
msg = i18n.translate(msg, language)
return webob.exc.HTTPNotFound(explanation=msg)
builder = versions_view.get_view_builder(req)

2
neutron/cmd/sanity/checks.py

@ -19,7 +19,7 @@ from neutron.agent.linux import ip_link_support
from neutron.agent.linux import ovs_lib
from neutron.agent.linux import utils as agent_utils
from neutron.common import utils
from neutron.openstack.common.gettextutils import _LE
from neutron.i18n import _LE
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as const
from neutron.plugins.openvswitch.common import constants as ovs_const

2
neutron/cmd/sanity_check.py

@ -17,7 +17,7 @@ import sys
from neutron.cmd.sanity import checks
from neutron.common import config
from neutron.openstack.common.gettextutils import _LE
from neutron.i18n import _LE
from neutron.openstack.common import log as logging
from oslo.config import cfg

2
neutron/common/config.py

@ -26,7 +26,7 @@ from paste import deploy
from neutron.api.v2 import attributes
from neutron.common import utils
from neutron.openstack.common.gettextutils import _LI
from neutron.i18n import _LI
from neutron.openstack.common import log as logging
from neutron import version

2
neutron/common/ipv6_utils.py

@ -21,7 +21,7 @@ import os
import netaddr
from neutron.common import constants
from neutron.openstack.common.gettextutils import _LI
from neutron.i18n import _LI
from neutron.openstack.common import log

2
neutron/db/agents_db.py

@ -28,8 +28,8 @@ from sqlalchemy import sql
from neutron.db import model_base
from neutron.db import models_v2
from neutron.extensions import agent as ext_agent
from neutron.i18n import _LW
from neutron import manager
from neutron.openstack.common.gettextutils import _LW
from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)

2
neutron/db/db_base_plugin_v2.py

@ -32,9 +32,9 @@ from neutron.db import common_db_mixin
from neutron.db import models_v2
from neutron.db import sqlalchemyutils
from neutron.extensions import l3
from neutron.i18n import _LE, _LI
from neutron import manager
from neutron import neutron_plugin_base_v2
from neutron.openstack.common.gettextutils import _LE, _LI
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.plugins.common import constants as service_constants

2
neutron/db/dvr_mac_db.py

@ -23,8 +23,8 @@ from neutron.common import utils
from neutron.db import model_base
from neutron.extensions import dvr as ext_dvr
from neutron.extensions import portbindings
from neutron.i18n import _LE
from neutron import manager
from neutron.openstack.common.gettextutils import _LE
from neutron.openstack.common import log as logging
from oslo.config import cfg
from sqlalchemy.orm import exc

2
neutron/db/l3_agentschedulers_db.py

@ -35,8 +35,8 @@ from neutron.db import agentschedulers_db
from neutron.db import l3_attrs_db
from neutron.db import model_base
from neutron.extensions import l3agentscheduler
from neutron.i18n import _LE, _LI, _LW
from neutron import manager
from neutron.openstack.common.gettextutils import _LE, _LI, _LW
from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall

2
neutron/db/l3_db.py

@ -28,8 +28,8 @@ from neutron.db import model_base
from neutron.db import models_v2
from neutron.extensions import external_net
from neutron.extensions import l3
from neutron.i18n import _LI
from neutron import manager
from neutron.openstack.common.gettextutils import _LI
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.plugins.common import constants

2
neutron/db/l3_dvr_db.py

@ -24,7 +24,7 @@ from neutron.db import l3_dvrscheduler_db as l3_dvrsched_db
from neutron.db import models_v2
from neutron.extensions import l3
from neutron.extensions import portbindings
from neutron.openstack.common.gettextutils import _LI
from neutron.i18n import _LI
from neutron.openstack.common import log as logging

2
neutron/db/l3_dvrscheduler_db.py

@ -26,7 +26,7 @@ from neutron.db import agents_db
from neutron.db import l3_agentschedulers_db as l3agent_sch_db
from neutron.db import model_base
from neutron.db import models_v2
from neutron.openstack.common.gettextutils import _LW
from neutron.i18n import _LW
from neutron.openstack.common import log as logging
from neutron.plugins.ml2 import db as ml2_db

3
neutron/db/l3_hamode_db.py

@ -27,8 +27,7 @@ from neutron.db import l3_dvr_db
from neutron.db import model_base
from neutron.db import models_v2
from neutron.extensions import l3_ext_ha_mode as l3_ha
from neutron.openstack.common.gettextutils import _LI
from neutron.openstack.common.gettextutils import _LW
from neutron.i18n import _LI, _LW
from neutron.openstack.common import log as logging
VR_ID_RANGE = set(range(1, 255))

2
neutron/db/metering/metering_rpc.py

@ -14,8 +14,8 @@
from neutron.common import constants as consts
from neutron.common import utils
from neutron.i18n import _LE
from neutron import manager
from neutron.openstack.common.gettextutils import _LE
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as service_constants

2
neutron/db/migration/alembic_migrations/heal_script.py

@ -27,7 +27,7 @@ from sqlalchemy.sql import text
from sqlalchemy import types
from neutron.db.migration.models import frozen as frozen_models
from neutron.openstack.common.gettextutils import _LI
from neutron.i18n import _LI
LOG = logging.getLogger(__name__)

2
neutron/db/securitygroups_rpc_base.py

@ -23,7 +23,7 @@ from neutron.db import allowedaddresspairs_db as addr_pair
from neutron.db import models_v2
from neutron.db import securitygroups_db as sg_db
from neutron.extensions import securitygroup as ext_sg
from neutron.openstack.common.gettextutils import _LW
from neutron.i18n import _LW
from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)

2
neutron/db/vpn/vpn_db.py

@ -27,8 +27,8 @@ from neutron.db import model_base
from neutron.db import models_v2
from neutron.db.vpn import vpn_validator
from neutron.extensions import vpnaas
from neutron.i18n import _LW
from neutron import manager
from neutron.openstack.common.gettextutils import _LW
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.plugins.common import constants

2
neutron/debug/commands.py

@ -18,7 +18,7 @@ from neutronclient.common import utils
from neutronclient.neutron import v2_0 as client
from neutronclient.neutron.v2_0 import port
from neutron.openstack.common.gettextutils import _LI
from neutron.i18n import _LI
from neutron.openstack.common import log as logging

2
neutron/debug/debug_agent.py

@ -23,7 +23,7 @@ from neutron.agent.common import config
from neutron.agent.linux import dhcp
from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils
from neutron.openstack.common.gettextutils import _LW
from neutron.i18n import _LW
from neutron.openstack.common import log as logging

2
neutron/extensions/l3agentscheduler.py

@ -24,8 +24,8 @@ from neutron.common import constants
from neutron.common import exceptions
from neutron.common import rpc as n_rpc
from neutron.extensions import agent
from neutron.i18n import _LE
from neutron import manager
from neutron.openstack.common.gettextutils import _LE
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as service_constants
from neutron import policy

30
neutron/i18n.py

@ -0,0 +1,30 @@
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from oslo import i18n
_translators = i18n.TranslatorFactory(domain='neutron')
# The primary translation function using the well-known name "_"
_ = _translators.primary
# Translators for log levels.
#
# The abbreviated names are meant to reflect the usual use of a short
# name like '_'. The "L" is for "log" and the other letter comes from
# the level.
_LI = _translators.log_info
_LW = _translators.log_warning
_LE = _translators.log_error
_LC = _translators.log_critical

2
neutron/notifiers/nova.py

@ -22,8 +22,8 @@ from sqlalchemy.orm import attributes as sql_attr
from neutron.common import constants
from neutron import context
from neutron.i18n import _LE, _LI, _LW
from neutron import manager
from neutron.openstack.common.gettextutils import _LE, _LI, _LW
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils

498
neutron/openstack/common/gettextutils.py

@ -1,498 +0,0 @@
# Copyright 2012 Red Hat, Inc.
# Copyright 2013 IBM Corp.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
"""
gettext for openstack-common modules.
Usual usage in an openstack.common module:
from neutron.openstack.common.gettextutils import _
"""
import copy
import functools
import gettext
import locale
from logging import handlers
import os
from babel import localedata
import six
_AVAILABLE_LANGUAGES = {}
# FIXME(dhellmann): Remove this when moving to oslo.i18n.
USE_LAZY = False
class TranslatorFactory(object):
"""Create translator functions
"""
def __init__(self, domain, lazy=False, localedir=None):
"""Establish a set of translation functions for the domain.
:param domain: Name of translation domain,
specifying a message catalog.
:type domain: str
:param lazy: Delays translation until a message is emitted.
Defaults to False.
:type lazy: Boolean
:param localedir: Directory with translation catalogs.
:type localedir: str
"""
self.domain = domain
self.lazy = lazy
if localedir is None:
localedir = os.environ.get(domain.upper() + '_LOCALEDIR')
self.localedir = localedir
def _make_translation_func(self, domain=None):
"""Return a new translation function ready for use.
Takes into account whether or not lazy translation is being
done.
The domain can be specified to override the default from the
factory, but the localedir from the factory is always used
because we assume the log-level translation catalogs are
installed in the same directory as the main application
catalog.
"""
if domain is None:
domain = self.domain
if self.lazy:
return functools.partial(Message, domain=domain)
t = gettext.translation(
domain,
localedir=self.localedir,
fallback=True,
)
if six.PY3:
return t.gettext
return t.ugettext
@property
def primary(self):
"The default translation function."
return self._make_translation_func()
def _make_log_translation_func(self, level):
return self._make_translation_func(self.domain + '-log-' + level)
@property
def log_info(self):
"Translate info-level log messages."
return self._make_log_translation_func('info')
@property
def log_warning(self):
"Translate warning-level log messages."
return self._make_log_translation_func('warning')
@property
def log_error(self):
"Translate error-level log messages."
return self._make_log_translation_func('error')
@property
def log_critical(self):
"Translate critical-level log messages."
return self._make_log_translation_func('critical')
# NOTE(dhellmann): When this module moves out of the incubator into
# oslo.i18n, these global variables can be moved to an integration
# module within each application.
# Create the global translation functions.
_translators = TranslatorFactory('neutron')
# The primary translation function using the well-known name "_"
_ = _translators.primary
# Translators for log levels.
#
# The abbreviated names are meant to reflect the usual use of a short
# name like '_'. The "L" is for "log" and the other letter comes from
# the level.
_LI = _translators.log_info
_LW = _translators.log_warning
_LE = _translators.log_error
_LC = _translators.log_critical
# NOTE(dhellmann): End of globals that will move to the application's
# integration module.
def enable_lazy():
"""Convenience function for configuring _() to use lazy gettext
Call this at the start of execution to enable the gettextutils._
function to use lazy gettext functionality. This is useful if
your project is importing _ directly instead of using the
gettextutils.install() way of importing the _ function.
"""
# FIXME(dhellmann): This function will be removed in oslo.i18n,
# because the TranslatorFactory makes it superfluous.
global _, _LI, _LW, _LE, _LC, USE_LAZY
tf = TranslatorFactory('neutron', lazy=True)
_ = tf.primary
_LI = tf.log_info
_LW = tf.log_warning
_LE = tf.log_error
_LC = tf.log_critical
USE_LAZY = True
def install(domain, lazy=False):
"""Install a _() function using the given translation domain.
Given a translation domain, install a _() function using gettext's
install() function.
The main difference from gettext.install() is that we allow
overriding the default localedir (e.g. /usr/share/locale) using
a translation-domain-specific environment variable (e.g.
NOVA_LOCALEDIR).
:param domain: the translation domain
:param lazy: indicates whether or not to install the lazy _() function.
The lazy _() introduces a way to do deferred translation
of messages by installing a _ that builds Message objects,
instead of strings, which can then be lazily translated into
any available locale.
"""
if lazy:
from six import moves
tf = TranslatorFactory(domain, lazy=True)
moves.builtins.__dict__['_'] = tf.primary
else:
localedir = '%s_LOCALEDIR' % domain.upper()
if six.PY3:
gettext.install(domain,
localedir=os.environ.get(localedir))
else:
gettext.install(domain,
localedir=os.environ.get(localedir),
unicode=True)
class Message(six.text_type):
"""A Message object is a unicode object that can be translated.
Translation of Message is done explicitly using the translate() method.
For all non-translation intents and purposes, a Message is simply unicode,
and can be treated as such.
"""
def __new__(cls, msgid, msgtext=None, params=None,
domain='neutron', *args):
"""Create a new Message object.
In order for translation to work gettext requires a message ID, this
msgid will be used as the base unicode text. It is also possible
for the msgid and the base unicode text to be different by passing
the msgtext parameter.
"""
# If the base msgtext is not given, we use the default translation
# of the msgid (which is in English) just in case the system locale is
# not English, so that the base text will be in that locale by default.
if not msgtext:
msgtext = Message._translate_msgid(msgid, domain)
# We want to initialize the parent unicode with the actual object that
# would have been plain unicode if 'Message' was not enabled.
msg = super(Message, cls).__new__(cls, msgtext)
msg.msgid = msgid
msg.domain = domain
msg.params = params
return msg
def translate(self, desired_locale=None):
"""Translate this message to the desired locale.
:param desired_locale: The desired locale to translate the message to,
if no locale is provided the message will be
translated to the system's default locale.
:returns: the translated message in unicode
"""
translated_message = Message._translate_msgid(self.msgid,
self.domain,
desired_locale)
if self.params is None:
# No need for more translation
return translated_message
# This Message object may have been formatted with one or more
# Message objects as substitution arguments, given either as a single
# argument, part of a tuple, or as one or more values in a dictionary.
# When translating this Message we need to translate those Messages too
translated_params = _translate_args(self.params, desired_locale)
translated_message = translated_message % translated_params
return translated_message
@staticmethod
def _translate_msgid(msgid, domain, desired_locale=None):
if not desired_locale:
system_locale = locale.getdefaultlocale()
# If the system locale is not available to the runtime use English
if not system_locale[0]:
desired_locale = 'en_US'
else:
desired_locale = system_locale[0]
locale_dir = os.environ.get(domain.upper() + '_LOCALEDIR')
lang = gettext.translation(domain,
localedir=locale_dir,
languages=[desired_locale],
fallback=True)
if six.PY3:
translator = lang.gettext
else:
translator = lang.ugettext
translated_message = translator(msgid)
return translated_message
def __mod__(self, other):
# When we mod a Message we want the actual operation to be performed
# by the parent class (i.e. unicode()), the only thing we do here is
# save the original msgid and the parameters in case of a translation
params = self._sanitize_mod_params(other)
unicode_mod = super(Message, self).__mod__(params)
modded = Message(self.msgid,
msgtext=unicode_mod,
params=params,
domain=self.domain)
return modded
def _sanitize_mod_params(self, other):
"""Sanitize the object being modded with this Message.
- Add support for modding 'None' so translation supports it
- Trim the modded object, which can be a large dictionary, to only
those keys that would actually be used in a translation
- Snapshot the object being modded, in case the message is
translated, it will be used as it was when the Message was created
"""
if other is None:
params = (other,)
elif isinstance(other, dict):
# Merge the dictionaries
# Copy each item in case one does not support deep copy.
params = {}
if isinstance(self.params, dict):
for key, val in self.params.items():
params[key] = self._copy_param(val)
for key, val in other.items():
params[key] = self._copy_param(val)
else:
params = self._copy_param(other)
return params
def _copy_param(self, param):
try:
return copy.deepcopy(param)
except Exception:
# Fallback to casting to unicode this will handle the
# python code-like objects that can't be deep-copied
return six.text_type(param)
def __add__(self, other):
msg = _('Message objects do not support addition.')
raise TypeError(msg)
def __radd__(self, other):
return self.__add__(other)
if six.PY2:
def __str__(self):
# NOTE(luisg): Logging in python 2.6 tries to str() log records,
# and it expects specifically a UnicodeError in order to proceed.
msg = _('Message objects do not support str() because they may '
'contain non-ascii characters. '
'Please use unicode() or translate() instead.')
raise UnicodeError(msg)
def get_available_languages(domain):
"""Lists the available languages for the given translation domain.
:param domain: the domain to get languages for
"""
if domain in _AVAILABLE_LANGUAGES:
return copy.copy(_AVAILABLE_LANGUAGES[domain])
localedir = '%s_LOCALEDIR' % domain.upper()
find = lambda x: gettext.find(domain,
localedir=os.environ.get(localedir),
languages=[x])
# NOTE(mrodden): en_US should always be available (and first in case
# order matters) since our in-line message strings are en_US
language_list = ['en_US']
# NOTE(luisg): Babel <1.0 used a function called list(), which was
# renamed to locale_identifiers() in >=1.0, the requirements master list
# requires >=0.9.6, uncapped, so defensively work with both. We can remove
# this check when the master list updates to >=1.0, and update all projects
list_identifiers = (getattr(localedata, 'list', None) or
getattr(localedata, 'locale_identifiers'))
locale_identifiers = list_identifiers()
for i in locale_identifiers:
if find(i) is not None:
language_list.append(i)
# NOTE(luisg): Babel>=1.0,<1.3 has a bug where some OpenStack supported
# locales (e.g. 'zh_CN', and 'zh_TW') aren't supported even though they
# are perfectly legitimate locales:
# https://github.com/mitsuhiko/babel/issues/37
# In Babel 1.3 they fixed the bug and they support these locales, but
# they are still not explicitly "listed" by locale_identifiers().
# That is why we add the locales here explicitly if necessary so that
# they are listed as supported.
aliases = {'zh': 'zh_CN',
'zh_Hant_HK': 'zh_HK',
'zh_Hant': 'zh_TW',
'fil': 'tl_PH'}
for (locale_, alias) in six.iteritems(aliases):
if locale_ in language_list and alias not in language_list:
language_list.append(alias)
_AVAILABLE_LANGUAGES[domain] = language_list
return copy.copy(language_list)
def translate(obj, desired_locale=None):
"""Gets the translated unicode representation of the given object.
If the object is not translatable it is returned as-is.
If the locale is None the object is translated to the system locale.
:param obj: the object to translate
:param desired_locale: the locale to translate the message to, if None the
default system locale will be used
:returns: the translated object in unicode, or the original object if
it could not be translated
"""
message = obj
if not isinstance(message, Message):
# If the object to translate is not already translatable,
# let's first get its unicode representation
message = six.text_type(obj)
if isinstance(message, Message):
# Even after unicoding() we still need to check if we are
# running with translatable unicode before translating
return message.translate(desired_locale)
return obj
def _translate_args(args, desired_locale=None):
"""Translates all the translatable elements of the given arguments object.
This method is used for translating the translatable values in method
arguments which include values of tuples or dictionaries.
If the object is not a tuple or a dictionary the object itself is
translated if it is translatable.
If the locale is None the object is translated to the system locale.
:param args: the args to translate
:param desired_locale: the locale to translate the args to, if None the
default system locale will be used
:returns: a new args object with the translated contents of the original
"""
if isinstance(args, tuple):
return tuple(translate(v, desired_locale) for v in args)
if isinstance(args, dict):
translated_dict = {}
for (k, v) in six.iteritems(args):
translated_v = translate(v, desired_locale)
translated_dict[k] = translated_v
return translated_dict
return translate(args, desired_locale)
class TranslationHandler(handlers.MemoryHandler):
"""Handler that translates records before logging them.
The TranslationHandler takes a locale and a target logging.Handler object
to forward LogRecord objects to after translating them. This handler
depends on Message objects being logged, instead of regular strings.
The handler can be configured declaratively in the logging.conf as follows:
[handlers]
keys = translatedlog, translator
[handler_translatedlog]
class = handlers.WatchedFileHandler
args = ('/var/log/api-localized.log',)
formatter = context
[handler_translator]
class = openstack.common.log.TranslationHandler
target = translatedlog
args = ('zh_CN',)
If the specified locale is not available in the system, the handler will
log in the default locale.
"""
def __init__(self, locale=None, target=None):
"""Initialize a TranslationHandler
:param locale: locale to use for translating messages
:param target: logging.Handler object to forward
LogRecord objects to after translation
"""
# NOTE(luisg): In order to allow this handler to be a wrapper for
# other handlers, such as a FileHandler, and still be able to
# configure it using logging.conf, this handler has to extend
# MemoryHandler because only the MemoryHandlers' logging.conf
# parsing is implemented such that it accepts a target handler.
handlers.MemoryHandler.__init__(self, capacity=0, target=target)
self.locale = locale
def setFormatter(self, fmt):
self.target.setFormatter(fmt)
def emit(self, record):
# We save the message from the original record to restore it
# after translation, so other handlers are not affected by this
original_msg = record.msg
original_args = record.args
try:
self._translate_and_log_record(record)
finally:
record.msg = original_msg
record.args = original_args
def _translate_and_log_record(self, record):
record.msg = translate(record.msg, self.locale)
# In addition to translating the message, we also need to translate
# arguments that were passed to the log method that were not part
# of the main message e.g., log.info(_('Some message %s'), this_one))
record.args = _translate_args(record.args, self.locale)
self.target.emit(record)

2
neutron/plugins/bigswitch/db/consistency_db.py

@ -23,7 +23,7 @@ from oslo.db.sqlalchemy import session
import sqlalchemy as sa
from neutron.db import model_base
from neutron.openstack.common.gettextutils import _LI, _LW
from neutron.i18n import _LI, _LW
from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)

2
neutron/plugins/cisco/cfg_agent/cfg_agent.py

@ -31,13 +31,13 @@ from neutron.common import config as common_config
from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron import context as n_context
from neutron.i18n import _LE, _LI, _LW
from neutron import manager
from neutron.openstack.common import lockutils
from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
from neutron.openstack.common import periodic_task
from neutron.openstack.common import service
from neutron.openstack.common.gettextutils import _LE, _LI, _LW
from neutron.plugins.cisco.cfg_agent import device_status
from neutron.plugins.cisco.common import cisco_constants as c_constants
from neutron import service as neutron_service

2
neutron/plugins/cisco/cfg_agent/device_drivers/csr1kv/csr1kv_routing_driver.py

@ -23,7 +23,7 @@ from ncclient import manager
from oslo.config import cfg
from neutron.openstack.common.gettextutils import _LE, _LI, _LW
from neutron.i18n import _LE, _LI, _LW
from neutron.plugins.cisco.cfg_agent import cfg_exceptions as cfg_exc
from neutron.plugins.cisco.cfg_agent.device_drivers.csr1kv import (
cisco_csr1kv_snippets as snippets)

2
neutron/plugins/cisco/cfg_agent/device_drivers/driver_mgr.py

@ -15,7 +15,7 @@
from oslo.utils import excutils
from oslo.utils import importutils
from neutron.openstack.common.gettextutils import _LE
from neutron.i18n import _LE
from neutron.openstack.common import log as logging
from neutron.plugins.cisco.cfg_agent import cfg_exceptions

2
neutron/plugins/cisco/cfg_agent/device_status.py

@ -18,8 +18,8 @@ from oslo.config import cfg
from oslo.utils import timeutils
from neutron.agent.linux import utils as linux_utils
from neutron.i18n import _LI, _LW
from neutron.openstack.common import log as logging
from neutron.openstack.common.gettextutils import _LI, _LW
LOG = logging.getLogger(__name__)

2
neutron/plugins/cisco/cfg_agent/service_helpers/routing_svc_helper.py

@ -24,8 +24,8 @@ from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.common import utils as common_utils
from neutron import context as n_context
from neutron.i18n import _LE, _LI, _LW
from neutron.openstack.common import log as logging
from neutron.openstack.common.gettextutils import _LE, _LI, _LW
from neutron.plugins.cisco.cfg_agent import cfg_exceptions
from neutron.plugins.cisco.cfg_agent.device_drivers import driver_mgr
from neutron.plugins.cisco.cfg_agent import device_status

2
neutron/plugins/cisco/db/l3/device_handling_db.py

@ -26,10 +26,10 @@ from neutron.common import exceptions as n_exc
from neutron.common import utils
from neutron import context as neutron_context
from neutron.db import agents_db
from neutron.i18n import _LE, _LI, _LW
from neutron import manager
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.openstack.common.gettextutils import _LE, _LI, _LW
from neutron.plugins.cisco.common import cisco_constants as c_constants
from neutron.plugins.cisco.db.l3 import l3_models
from neutron.plugins.cisco.l3 import service_vm_lib

2
neutron/plugins/cisco/db/l3/l3_router_appliance_db.py

@ -30,7 +30,7 @@ from neutron.db import l3_db
from neutron.db import models_v2
from neutron.db import portbindings_db as p_binding
from neutron.extensions import providernet as pr_net
from neutron.openstack.common.gettextutils import _LE, _LI
from neutron.i18n import _LE, _LI
from neutron.openstack.common import lockutils
from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall

2
neutron/plugins/cisco/db/n1kv_db_v2.py

@ -22,7 +22,7 @@ from neutron.common import constants
from neutron.common import exceptions as n_exc
import neutron.db.api as db
from neutron.db import models_v2
from neutron.openstack.common.gettextutils import _LW
from neutron.i18n import _LW
from neutron.openstack.common import log as logging
from neutron.plugins.cisco.common import cisco_constants as c_const
from neutron.plugins.cisco.common import cisco_exceptions as c_exc

2
neutron/plugins/cisco/l3/hosting_device_drivers/csr1kv_hd_driver.py

@ -16,8 +16,8 @@ import netaddr
from oslo.config import cfg
from neutron.i18n import _LE
from neutron import manager
from neutron.openstack.common.gettextutils import _LE
from neutron.openstack.common import log as logging
from neutron.plugins.cisco.l3 import hosting_device_drivers

2
neutron/plugins/cisco/l3/plugging_drivers/n1kv_trunking_driver.py

@ -23,9 +23,9 @@ from neutron.common import exceptions as n_exc
from neutron import context as n_context
from neutron.db import models_v2
from neutron.extensions import providernet as pr_net
from neutron.i18n import _LE, _LI, _LW
from neutron import manager
from neutron.openstack.common import log as logging
from neutron.openstack.common.gettextutils import _LE, _LI, _LW
from neutron.plugins.cisco.db.l3 import l3_models
from neutron.plugins.cisco.extensions import n1kv
import neutron.plugins.cisco.l3.plugging_drivers as plug

2
neutron/plugins/cisco/l3/service_vm_lib.py

@ -17,8 +17,8 @@ from novaclient import utils as n_utils
from novaclient.v1_1 import client
from oslo.config import cfg
from neutron.i18n import _LE
from neutron import manager
from neutron.openstack.common.gettextutils import _LE
from neutron.openstack.common import log as logging
from neutron.plugins.cisco.common import cisco_constants as c_constants

2
neutron/plugins/cisco/models/virt_phy_sw_v2.py

@ -21,8 +21,8 @@ from oslo.utils import importutils
from neutron.api.v2 import attributes
from neutron.extensions import portbindings
from neutron.extensions import providernet as provider
from neutron.i18n import _LE, _LI
from neutron import neutron_plugin_base_v2
from neutron.openstack.common.gettextutils import _LE, _LI
from neutron.openstack.common import log as logging
from neutron.plugins.cisco.common import cisco_constants as const
from neutron.plugins.cisco.common import cisco_credentials_v2 as cred

2
neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py

@ -35,8 +35,8 @@ from neutron.db import portbindings_db
from neutron.db import quota_db
from neutron.extensions import portbindings
from neutron.extensions import providernet
from neutron.i18n import _LW
from neutron import manager
from neutron.openstack.common.gettextutils import _LW
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils as uuidutils