Move files to common lib(Part 2)

Move i18n to common directory.

Change-Id: I23ecfd161648d71a9581160e104d4efe39fc782b

rally/api.py

@@ -16,10 +16,10 @@
 import jsonschema
 
 from rally.benchmark import engine
+from rally.common.i18n import _
 from rally import consts
 from rally import deploy
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally import objects
 from rally.verification.verifiers.tempest import tempest

rally/benchmark/context/cleanup/context.py

@@ -17,8 +17,8 @@ import sys
 
 from rally.benchmark.context import base
 from rally.benchmark.context.cleanup import manager
+from rally.common.i18n import _
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally import utils as rutils
 

rally/benchmark/context/cleanup/manager.py

@@ -17,7 +17,7 @@ import time
 
 from rally.benchmark.context.cleanup import base
 from rally.common import broker
-from rally.i18n import _
+from rally.common.i18n import _
 from rally import log as logging
 from rally import osclients
 from rally import utils as rutils

rally/benchmark/context/images.py

@@ -18,8 +18,8 @@ from rally.benchmark.context import base
 from rally.benchmark.context.cleanup import manager as resource_manager
 from rally.benchmark.scenarios import base as scenario_base
 from rally.benchmark.scenarios.glance import utils as glance_utils
+from rally.common.i18n import _
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally import osclients
 from rally import utils as rutils

rally/benchmark/context/keypair.py

@@ -17,7 +17,7 @@ import novaclient.exceptions
 
 from rally.benchmark.context import base
 from rally.benchmark.context.cleanup import manager as resource_manager
-from rally.i18n import _
+from rally.common.i18n import _
 from rally import log as logging
 from rally import osclients
 from rally import utils

rally/benchmark/context/network.py

@@ -17,7 +17,7 @@ import six
 
 from rally.benchmark.context import base
 from rally.benchmark.wrappers import network as network_wrapper
-from rally.i18n import _
+from rally.common.i18n import _
 from rally import log as logging
 from rally import osclients
 from rally import utils

rally/benchmark/context/quotas/quotas.py

@@ -18,7 +18,7 @@ from rally.benchmark.context.quotas import cinder_quotas
 from rally.benchmark.context.quotas import designate_quotas
 from rally.benchmark.context.quotas import neutron_quotas
 from rally.benchmark.context.quotas import nova_quotas
-from rally.i18n import _
+from rally.common.i18n import _
 from rally import log as logging
 from rally import osclients
 from rally import utils

rally/benchmark/context/roles.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from rally.benchmark.context import base
+from rally.common.i18n import _
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally import osclients
 from rally import utils as rutils

rally/benchmark/context/sahara/sahara_cluster.py

@@ -20,8 +20,8 @@ from rally.benchmark.context.cleanup import manager as resource_manager
 from rally.benchmark.scenarios.sahara import utils
 from rally.benchmark import types
 from rally.benchmark import utils as bench_utils
+from rally.common.i18n import _
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally import osclients
 from rally import utils as rutils

rally/benchmark/context/sahara/sahara_edp.py

@@ -17,8 +17,8 @@ import urllib2
 
 from rally.benchmark.context import base
 from rally.benchmark.context.cleanup import manager as resource_manager
+from rally.common.i18n import _
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally import osclients
 from rally import utils as rutils

rally/benchmark/context/sahara/sahara_image.py

@@ -16,7 +16,7 @@ from rally.benchmark.context import base
 from rally.benchmark.context.cleanup import manager as resource_manager
 from rally.benchmark.scenarios import base as scenarios_base
 from rally.benchmark.scenarios.glance import utils as glance_utils
-from rally.i18n import _
+from rally.common.i18n import _
 from rally import log as logging
 from rally import osclients
 from rally import utils as rutils

rally/benchmark/context/secgroup.py

@@ -16,7 +16,7 @@
 import six
 
 from rally.benchmark.context import base
-from rally.i18n import _
+from rally.common.i18n import _
 from rally import log as logging
 from rally import osclients
 from rally import utils

rally/benchmark/context/servers.py

@@ -16,7 +16,7 @@ from rally.benchmark.context import base
 from rally.benchmark.context.cleanup import manager as resource_manager
 from rally.benchmark.scenarios.nova import utils as nova_utils
 from rally.benchmark import types as types
-from rally.i18n import _
+from rally.common.i18n import _
 from rally import log as logging
 from rally import osclients
 from rally import utils as rutils

rally/benchmark/context/tempest.py

@@ -19,8 +19,8 @@ import subprocess
 import tempfile
 
 from rally.benchmark.context import base
+from rally.common.i18n import _
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally import utils
 from rally.verification.verifiers.tempest import config

rally/benchmark/context/users.py

@@ -22,9 +22,9 @@ from rally.benchmark.context import base
 from rally.benchmark import utils
 from rally.benchmark.wrappers import keystone
 from rally.common import broker
+from rally.common.i18n import _
 from rally import consts
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally.objects import endpoint
 from rally import osclients

rally/benchmark/context/volumes.py

@@ -15,7 +15,7 @@
 from rally.benchmark.context import base
 from rally.benchmark.context.cleanup import manager as resource_manager
 from rally.benchmark.scenarios.cinder import utils as cinder_utils
-from rally.i18n import _
+from rally.common.i18n import _
 from rally import log as logging
 from rally import osclients
 from rally import utils as rutils

rally/benchmark/engine.py

@@ -26,9 +26,9 @@ from rally.benchmark.context import users as users_ctx
 from rally.benchmark.runners import base as base_runner
 from rally.benchmark.scenarios import base as base_scenario
 from rally.benchmark.sla import base as base_sla
+from rally.common.i18n import _
 from rally import consts
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally.objects import endpoint
 from rally import osclients

rally/benchmark/scenarios/nova/security_group.py

@@ -17,9 +17,9 @@ from rally.benchmark.scenarios import base
 from rally.benchmark.scenarios.nova import utils
 from rally.benchmark import types
 from rally.benchmark import validation
+from rally.common.i18n import _
 from rally import consts
 from rally import exceptions
-from rally.i18n import _
 
 
 class NovaSecurityGroupException(exceptions.RallyException):

rally/benchmark/scenarios/requests/http_requests.py

@@ -13,8 +13,8 @@
 import requests
 
 from rally.benchmark.scenarios import base
+from rally.common.i18n import _
 from rally import exceptions
-from rally.i18n import _
 
 
 class WrongStatusException(exceptions.RallyException):

rally/benchmark/scenarios/tempest/utils.py

@@ -20,8 +20,8 @@ import tempfile
 
 import six
 
+from rally.common.i18n import _
 from rally import exceptions
-from rally.i18n import _
 
 
 class TempestBenchmarkFailure(exceptions.RallyException):

rally/benchmark/sla/base.py

@@ -25,8 +25,8 @@ import jsonschema
 import six
 
 from rally.benchmark.processing import utils as putils
+from rally.common.i18n import _
 from rally import exceptions
-from rally.i18n import _
 from rally import utils
 
 

rally/benchmark/validation.py

@@ -20,9 +20,9 @@ from glanceclient import exc as glance_exc
 from novaclient import exceptions as nova_exc
 
 from rally.benchmark import types as types
+from rally.common.i18n import _
 from rally import consts
 from rally import exceptions
-from rally.i18n import _
 from rally import objects
 from rally.verification.verifiers.tempest import tempest
 

rally/cmd/api.py

@@ -22,7 +22,7 @@ from wsgiref import simple_server
 from oslo.config import cfg
 
 from rally.aas.rest import app as rally_app
-from rally.i18n import _
+from rally.common.i18n import _
 from rally import log as logging
 
 

rally/cmd/cliutils.py

@@ -22,9 +22,9 @@ import sys
 
 from oslo.config import cfg
 
+from rally.common.i18n import _
 from rally.common import version
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally.openstack.common import cliutils
 from rally import utils

rally/cmd/commands/deployment.py

@@ -28,9 +28,9 @@ from rally import api
 from rally.cmd import cliutils
 from rally.cmd.commands import use
 from rally.cmd import envutils
+from rally.common.i18n import _
 from rally import db
 from rally import exceptions
-from rally.i18n import _
 from rally.objects import endpoint
 from rally.openstack.common import cliutils as common_cliutils
 from rally import osclients

rally/cmd/commands/show.py

@@ -19,9 +19,9 @@ from __future__ import print_function
 
 from rally.cmd import cliutils
 from rally.cmd import envutils
+from rally.common.i18n import _
 from rally import db
 from rally import exceptions
-from rally.i18n import _
 from rally.objects import endpoint
 from rally.openstack.common import cliutils as common_cliutils
 from rally import osclients

rally/cmd/commands/task.py

@@ -29,10 +29,10 @@ from rally.benchmark.processing import utils
 from rally.cmd import cliutils
 from rally.cmd.commands import use
 from rally.cmd import envutils
+from rally.common.i18n import _
 from rally import consts
 from rally import db
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally import objects
 from rally.openstack.common import cliutils as common_cliutils

rally/cmd/commands/verify.py

@@ -25,10 +25,10 @@ from rally import api
 from rally.cmd import cliutils
 from rally.cmd.commands import use
 from rally.cmd import envutils
+from rally.common.i18n import _
 from rally import consts
 from rally import db
 from rally import exceptions
-from rally.i18n import _
 from rally import objects
 from rally.openstack.common import cliutils as common_cliutils
 from rally.verification.verifiers.tempest import diff

rally/cmd/envutils.py

@@ -18,8 +18,8 @@ import os
 import decorator
 
 from rally.common import fileutils
+from rally.common.i18n import _
 from rally import exceptions
-from rally.i18n import _
 
 ENV_DEPLOYMENT = "RALLY_DEPLOYMENT"
 ENV_TASK = "RALLY_TASK"

rally/common/broker.py

@@ -17,7 +17,7 @@ import collections
 import threading
 import time
 
-from rally.i18n import _
+from rally.common.i18n import _
 from rally import log as logging
 
 

rally/common/sshutils.py

@@ -64,7 +64,7 @@ import time
 
 import paramiko
 
-from rally.i18n import _
+from rally.common.i18n import _
 from rally import log as logging
 
 

rally/db/sqlalchemy/api.py

@@ -23,9 +23,9 @@ from oslo.utils import timeutils
 import sqlalchemy as sa
 from sqlalchemy.orm.exc import NoResultFound
 
+from rally.common.i18n import _
 from rally.db.sqlalchemy import models
 from rally import exceptions
-from rally.i18n import _
 
 
 CONF = cfg.CONF

rally/deploy/engine.py

@@ -18,10 +18,10 @@ import abc
 import jsonschema
 import six
 
+from rally.common.i18n import _
 from rally import consts
 from rally.deploy.serverprovider import provider
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally import utils
 

rally/deploy/engines/devstack.py

@@ -17,10 +17,10 @@ import os
 
 import six
 
+from rally.common.i18n import _
 from rally import consts
 from rally.deploy import engine
 from rally.deploy.serverprovider import provider
-from rally.i18n import _
 from rally import log as logging
 from rally import objects
 from rally import utils

rally/deploy/engines/fuel.py

@@ -13,11 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from rally.common.i18n import _
 from rally import consts
 from rally.deploy import engine
 from rally.deploy.fuel import fuelclient
 from rally import exceptions
-from rally.i18n import _
 from rally import objects
 
 

rally/deploy/engines/lxc.py

@@ -18,11 +18,11 @@ import os
 import netaddr
 import six
 
+from rally.common.i18n import _
 from rally.deploy import engine
 from rally.deploy.serverprovider import provider
 from rally.deploy.serverprovider.providers import lxc
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally import objects
 from rally import utils

rally/deploy/serverprovider/providers/lxc.py

@@ -21,9 +21,9 @@ import time
 import netaddr
 import six
 
+from rally.common.i18n import _
 from rally.deploy.serverprovider import provider
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally import utils
 

rally/deploy/serverprovider/providers/openstack.py

@@ -20,9 +20,9 @@ import urllib2
 import novaclient.exceptions
 
 from rally.benchmark import utils as benchmark_utils
+from rally.common.i18n import _
 from rally.deploy.serverprovider import provider
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally.objects import endpoint
 from rally import osclients

rally/exceptions.py

@@ -18,7 +18,7 @@ import sys
 
 from oslo.config import cfg
 
-from rally.i18n import _
+from rally.common.i18n import _
 from rally import log as logging
 
 LOG = logging.getLogger(__name__)

rally/utils.py

@@ -29,8 +29,8 @@ import time
 from oslo.utils import importutils
 from sphinx.util import docstrings
 
+from rally.common.i18n import _
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 
 LOG = logging.getLogger(__name__)

rally/verification/verifiers/tempest/config.py

@@ -23,9 +23,9 @@ from oslo.config import cfg
 import requests
 from six.moves import configparser
 
+from rally.common.i18n import _
 from rally import db
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally.objects import endpoint
 from rally import osclients

rally/verification/verifiers/tempest/tempest.py

@@ -21,8 +21,8 @@ import sys
 
 from oslo.serialization import jsonutils
 
+from rally.common.i18n import _
 from rally import exceptions
-from rally.i18n import _
 from rally import log as logging
 from rally import utils
 from rally.verification.verifiers.tempest import config

tests/unit/test_utils.py

@@ -22,8 +22,8 @@ import time
 
 import mock
 
+from rally.common.i18n import _
 from rally import exceptions
-from rally.i18n import _
 from rally import utils
 from tests.unit import test
 

tox.ini

@@ -44,5 +44,5 @@ builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools,*rally/verification/verifiers/tempest/openstack-tempest*,build,*rally/openstack*
 
 [hacking]
-import_exceptions = rally.i18n
+import_exceptions = rally.common.i18n
 local-check-factory = tests.hacking.checks.factory