Merge "from i18n import _ when quoting them"

tacker/agent/linux/utils.py

@@ -21,6 +21,7 @@ from eventlet import greenthread
 from oslo_log import log as logging
 from oslo_utils import excutils
 
+from tacker._i18n import _
 from tacker.common import utils
 
 

tacker/alarm_receiver.py

@@ -15,6 +15,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from six.moves.urllib import parse
+from tacker._i18n import _
 from tacker.vnfm.monitor_drivers.token import Token
 from tacker import wsgi
 # check alarm url with db --> move to plugin

tacker/api/api_common.py

@@ -22,6 +22,7 @@ from six import iteritems
 from six.moves.urllib import parse as urllib_parse
 from webob import exc
 
+from tacker._i18n import _
 from tacker.common import constants
 from tacker.common import exceptions
 from tacker import wsgi

tacker/api/extensions.py

@@ -25,6 +25,7 @@ import six
 import webob.dec
 import webob.exc
 
+from tacker._i18n import _
 from tacker.common import exceptions
 import tacker.extensions
 from tacker import policy

tacker/api/v1/attributes.py

@@ -20,6 +20,7 @@ from oslo_log import log as logging
 from oslo_utils import uuidutils
 import six
 
+from tacker._i18n import _
 from tacker.common import exceptions as n_exc
 
 

tacker/api/v1/base.py

@@ -19,6 +19,7 @@ import webob.exc
 from oslo_log import log as logging
 from oslo_utils import strutils
 
+from tacker._i18n import _
 from tacker.api import api_common
 from tacker.api.v1 import attributes
 from tacker.api.v1 import resource as wsgi_resource

tacker/api/versions.py

@@ -17,6 +17,7 @@ import webob.dec
 
 import oslo_i18n
 
+from tacker._i18n import _
 from tacker.api.views import versions as versions_view
 from tacker import wsgi
 

tacker/cmd/eventlet/tacker_server.py

@@ -24,6 +24,7 @@ from oslo_config import cfg
 import oslo_i18n
 from oslo_service import service as common_service
 
+from tacker._i18n import _
 from tacker.common import config
 from tacker import objects
 from tacker import service

tacker/common/config.py

@@ -25,6 +25,7 @@ from oslo_log import log as logging
 import oslo_messaging
 from paste import deploy
 
+from tacker._i18n import _
 from tacker.common import utils
 from tacker import version
 

tacker/common/driver_manager.py

@@ -19,6 +19,8 @@ from oslo_log import log as logging
 
 import stevedore.named
 
+from tacker._i18n import _
+
 LOG = logging.getLogger(__name__)
 
 

tacker/db/db_base.py

@@ -22,6 +22,7 @@ from six import iteritems
 from sqlalchemy.orm import exc as orm_exc
 from sqlalchemy import sql
 
+from tacker._i18n import _
 from tacker.common import exceptions as n_exc
 from tacker.db import sqlalchemyutils
 

tacker/db/migration/cli.py

@@ -20,6 +20,7 @@ from alembic import script as alembic_script
 from alembic import util as alembic_util
 from oslo_config import cfg
 
+from tacker._i18n import _
 from tacker.db.migration.models import head  # noqa
 from tacker.db.migration import purge_tables
 

tacker/db/migration/purge_tables.py

@@ -21,6 +21,7 @@ from sqlalchemy import inspect
 
 from oslo_utils import timeutils
 
+from tacker._i18n import _
 from tacker.common import exceptions
 
 

tacker/db/sqlalchemyutils.py

@@ -17,6 +17,7 @@ from six import moves
 import sqlalchemy
 from sqlalchemy.orm.properties import RelationshipProperty
 
+from tacker._i18n import _
 from tacker.common import exceptions as n_exc
 
 

tacker/db/vnfm/vnfm_db.py

@@ -26,6 +26,7 @@ from sqlalchemy import orm
 from sqlalchemy.orm import exc as orm_exc
 from sqlalchemy import schema
 
+from tacker._i18n import _
 from tacker.api.v1 import attributes
 from tacker.common import exceptions
 from tacker import context as t_context

tacker/extensions/common_services.py

@@ -17,6 +17,7 @@ import abc
 
 import six
 
+from tacker._i18n import _
 from tacker.api import extensions
 from tacker.api.v1 import attributes as attr
 from tacker.api.v1 import resource_helper

tacker/extensions/nfvo_plugins/network_service.py

@@ -13,6 +13,7 @@
 import abc
 import six
 
+from tacker._i18n import _
 from tacker.common import exceptions
 from tacker.services import service_base
 

tacker/extensions/vnfm.py

@@ -18,6 +18,7 @@ import abc
 from oslo_log import log as logging
 import six
 
+from tacker._i18n import _
 from tacker.api import extensions
 from tacker.api.v1 import attributes as attr
 from tacker.api.v1 import base

tacker/manager.py

@@ -18,6 +18,7 @@ from oslo_log import log as logging
 import oslo_messaging
 from oslo_service import periodic_task
 
+from tacker._i18n import _
 from tacker.common import utils
 
 

tacker/plugins/common/utils.py

@@ -16,6 +16,7 @@
 Common utilities and helper functions for Openstack Networking Plugins.
 """
 
+from tacker._i18n import _
 from tacker.common import exceptions as n_exc
 from tacker.common import utils
 from tacker.plugins.common import constants

tacker/service.py

@@ -26,6 +26,7 @@ from oslo_service import service
 from oslo_utils import excutils
 from oslo_utils import importutils
 
+from tacker._i18n import _
 from tacker.common import config
 from tacker.common import rpc as n_rpc
 from tacker import context

tacker/tests/unit/api/v1/test_attributes.py

@@ -15,6 +15,7 @@
 
 import testtools
 
+from tacker._i18n import _
 from tacker.api.v1 import attributes
 from tacker.common import exceptions as n_exc
 from tacker.tests import base

tacker/tests/unit/api/v1/test_resource.py

@@ -17,6 +17,7 @@ import mock
 from webob import exc
 import webtest
 
+from tacker._i18n import _
 from tacker.api.v1 import resource as wsgi_resource
 from tacker.common import exceptions as n_exc
 from tacker import context

tacker/tests/unit/vnfm/test_plugin.py

@@ -20,6 +20,7 @@ from mock import patch
 from oslo_utils import uuidutils
 import yaml
 
+from tacker._i18n import _
 from tacker.common import exceptions
 from tacker import context
 from tacker.db.common_services import common_services_db_plugin

tacker/tosca/utils.py

@@ -20,6 +20,8 @@ import yaml
 from collections import OrderedDict
 from oslo_log import log as logging
 from oslo_utils import uuidutils
+
+from tacker._i18n import _
 from tacker.common import exceptions
 from tacker.common import log
 from tacker.common import utils

tacker/vnfm/infra_drivers/kubernetes/kubernetes_driver.py

@@ -21,6 +21,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 
+from tacker._i18n import _
 from tacker.common.container import kubernetes_utils
 from tacker.common import log
 from tacker.common import utils

tacker/vnfm/infra_drivers/openstack/openstack.py

@@ -21,6 +21,7 @@ from oslo_log import log as logging
 from oslo_serialization import jsonutils
 import yaml
 
+from tacker._i18n import _
 from tacker.common import log
 from tacker.common import utils
 from tacker.extensions import vnfm

tacker/vnfm/infra_drivers/openstack/translate_template.py

@@ -19,6 +19,7 @@ from toscaparser.utils import yamlparser
 from translator.hot import tosca_translator
 import yaml
 
+from tacker._i18n import _
 from tacker.common import exceptions
 from tacker.common import log
 from tacker.extensions import common_services as cs

tacker/vnfm/mgmt_drivers/openwrt/openwrt.py

@@ -19,6 +19,7 @@ from oslo_log import log as logging
 from oslo_serialization import jsonutils
 import yaml
 
+from tacker._i18n import _
 from tacker.common import cmd_executer
 from tacker.common import exceptions
 from tacker.common import log

tacker/vnfm/monitor.py

@@ -25,6 +25,7 @@ from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 
+from tacker._i18n import _
 from tacker.common import driver_manager
 from tacker.common import exceptions
 from tacker import context as t_context

tacker/vnfm/monitor_drivers/ceilometer/ceilometer.py

@@ -18,6 +18,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 import random
 import string
+from tacker._i18n import _
 from tacker.common import utils
 from tacker.vnfm.monitor_drivers import abstract_driver
 

tacker/vnfm/monitor_drivers/http_ping/http_ping.py

@@ -19,6 +19,7 @@ from oslo_log import log as logging
 import six.moves.urllib.error as urlerr
 import six.moves.urllib.request as urlreq
 
+from tacker._i18n import _
 from tacker.common import log
 from tacker.vnfm.monitor_drivers import abstract_driver
 

tacker/vnfm/monitor_drivers/ping/ping.py

@@ -17,6 +17,7 @@ import netaddr
 from oslo_config import cfg
 from oslo_log import log as logging
 
+from tacker._i18n import _
 from tacker.agent.linux import utils as linux_utils
 from tacker.common import log
 from tacker.vnfm.monitor_drivers import abstract_driver

tacker/vnfm/plugin.py

@@ -25,6 +25,7 @@ from oslo_utils import excutils
 from oslo_utils import uuidutils
 from toscaparser.tosca_template import ToscaTemplate
 
+from tacker._i18n import _
 from tacker.api.v1 import attributes
 from tacker.common import driver_manager
 from tacker.common import exceptions

tacker/wsgi.py

@@ -40,6 +40,7 @@ import six
 import webob.dec
 import webob.exc
 
+from tacker._i18n import _
 from tacker.common import exceptions as exception
 from tacker import context
 from tacker.db import api