Merge "Move files to common lib(Part 4)"

doc/samples/plugins/context/context_plugin.py

@@ -1,7 +1,7 @@
 
 from rally.benchmark.context import base
+from rally.common import log as logging
 from rally import consts
-from rally import log as logging
 from rally import osclients
 
 LOG = logging.getLogger(__name__)

rally/aas/rest/app.py

@@ -15,7 +15,7 @@
 
 import pecan
 
-from rally import log as logging
+from rally.common import log as logging
 
 
 def setup_app(config):

rally/api.py

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

rally/benchmark/context/base.py

@@ -18,9 +18,9 @@ import abc
 import jsonschema
 import six
 
+from rally.common import log as logging
 from rally.common import utils
 from rally import exceptions
-from rally import log as logging
 
 LOG = logging.getLogger(__name__)
 

rally/benchmark/context/cleanup/context.py

@@ -18,10 +18,10 @@ import sys
 from rally.benchmark.context import base
 from rally.benchmark.context.cleanup import manager
 from rally.common.i18n import _
+from rally.common import log as logging
 from rally.common import utils as rutils
 from rally import consts
 from rally import exceptions
-from rally import log as logging
 
 
 LOG = logging.getLogger(__name__)

rally/benchmark/context/cleanup/manager.py

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

rally/benchmark/context/cleanup/resources.py

@@ -18,7 +18,7 @@ from neutronclient.common import exceptions as neutron_exceptions
 from rally.benchmark.context.cleanup import base
 from rally.benchmark.scenarios.keystone import utils as kutils
 from rally.benchmark.wrappers import keystone as keystone_wrapper
-from rally import log as logging
+from rally.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

rally/benchmark/context/flavors.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 from rally.benchmark.context import base
+from rally.common import log as logging
 from rally.common import utils as rutils
 from rally import consts
-from rally import log as logging
 from rally import osclients
 
 LOG = logging.getLogger(__name__)

rally/benchmark/context/images.py

@@ -17,9 +17,9 @@ 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.common import log as logging
 from rally.common import utils as rutils
 from rally import consts
-from rally import log as logging
 from rally import osclients
 
 

rally/benchmark/context/keypair.py

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

rally/benchmark/context/network.py

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

rally/benchmark/context/quotas/cinder_quotas.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from rally import log as logging
+from rally.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

rally/benchmark/context/quotas/designate_quotas.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from rally import log as logging
+from rally.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

rally/benchmark/context/quotas/neutron_quotas.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from rally import log as logging
+from rally.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

rally/benchmark/context/quotas/nova_quotas.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from rally import log as logging
+from rally.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

rally/benchmark/context/quotas/quotas.py

@@ -19,9 +19,9 @@ 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.common.i18n import _
+from rally.common import log as logging
 from rally.common import utils
 from rally import consts
-from rally import log as logging
 from rally import osclients
 
 

rally/benchmark/context/roles.py

@@ -15,10 +15,10 @@
 
 from rally.benchmark.context import base
 from rally.common.i18n import _
+from rally.common import log as logging
 from rally.common import utils as rutils
 from rally import consts
 from rally import exceptions
-from rally import log as logging
 from rally import osclients
 
 

rally/benchmark/context/sahara/sahara_cluster.py

@@ -21,10 +21,10 @@ 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.common import log as logging
 from rally.common import utils as rutils
 from rally import consts
 from rally import exceptions
-from rally import log as logging
 from rally import osclients
 
 

rally/benchmark/context/sahara/sahara_edp.py

@@ -18,10 +18,10 @@ import requests
 from rally.benchmark.context import base
 from rally.benchmark.context.cleanup import manager as resource_manager
 from rally.common.i18n import _
+from rally.common import log as logging
 from rally.common import utils as rutils
 from rally import consts
 from rally import exceptions
-from rally import log as logging
 from rally import osclients
 
 

rally/benchmark/context/sahara/sahara_image.py

@@ -17,9 +17,9 @@ 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.common.i18n import _
+from rally.common import log as logging
 from rally.common import utils as rutils
 from rally import consts
-from rally import log as logging
 from rally import osclients
 
 

rally/benchmark/context/secgroup.py

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

rally/benchmark/context/servers.py

@@ -17,9 +17,9 @@ 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.common.i18n import _
+from rally.common import log as logging
 from rally.common import utils as rutils
 from rally import consts
-from rally import log as logging
 from rally import osclients
 
 

rally/benchmark/context/tempest.py

@@ -20,9 +20,9 @@ import tempfile
 
 from rally.benchmark.context import base
 from rally.common.i18n import _
+from rally.common import log as logging
 from rally.common import utils
 from rally import exceptions
-from rally import log as logging
 from rally.verification.tempest import config
 from rally.verification.tempest import tempest
 

rally/benchmark/context/users.py

@@ -23,10 +23,10 @@ from rally.benchmark import utils
 from rally.benchmark.wrappers import keystone
 from rally.common import broker
 from rally.common.i18n import _
+from rally.common import log as logging
 from rally.common import utils as rutils
 from rally import consts
 from rally import exceptions
-from rally import log as logging
 from rally import objects
 from rally import osclients
 

rally/benchmark/context/volumes.py

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

rally/benchmark/engine.py

@@ -27,10 +27,10 @@ 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.common import log as logging
 from rally.common import utils as rutils
 from rally import consts
 from rally import exceptions
-from rally import log as logging
 from rally import objects
 from rally import osclients
 

rally/benchmark/runners/base.py

@@ -23,10 +23,10 @@ import six
 from rally.benchmark.scenarios import base as scenario_base
 from rally.benchmark import types
 from rally.benchmark import utils
+from rally.common import log as logging
 from rally.common import utils as rutils
 from rally import consts
 from rally import exceptions
-from rally import log as logging
 from rally import osclients
 
 

rally/benchmark/runners/constant.py

@@ -21,8 +21,8 @@ from six import moves
 
 from rally.benchmark.runners import base
 from rally.benchmark import utils
+from rally.common import log as logging
 from rally import consts
-from rally import log as logging
 
 
 LOG = logging.getLogger(__name__)

rally/benchmark/runners/rps.py

@@ -19,8 +19,8 @@ import threading
 import time
 
 from rally.benchmark.runners import base
+from rally.common import log as logging
 from rally import consts
-from rally import log as logging
 
 
 LOG = logging.getLogger(__name__)

rally/benchmark/scenarios/base.py

@@ -20,10 +20,10 @@ import random
 import string
 import time
 
+from rally.common import log as logging
 from rally.common import utils
 from rally import consts
 from rally import exceptions
-from rally import log as logging
 
 
 LOG = logging.getLogger(__name__)

rally/benchmark/scenarios/cinder/volumes.py

@@ -18,8 +18,8 @@ from rally.benchmark.scenarios.cinder import utils
 from rally.benchmark.scenarios.nova import utils as nova_utils
 from rally.benchmark import types as types
 from rally.benchmark import validation
+from rally.common import log as logging
 from rally import consts
-from rally import log as logging
 
 import random
 

rally/benchmark/scenarios/neutron/utils.py

@@ -17,7 +17,7 @@ from oslo.utils import uuidutils as uid
 
 from rally.benchmark.scenarios import base
 from rally.benchmark.wrappers import network as network_wrapper
-from rally import log as logging
+from rally.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

rally/benchmark/scenarios/nova/servers.py

@@ -21,9 +21,9 @@ from rally.benchmark.scenarios.nova import utils
 from rally.benchmark.scenarios import utils as scenario_utils
 from rally.benchmark import types as types
 from rally.benchmark import validation
+from rally.common import log as logging
 from rally import consts
 from rally import exceptions as rally_exceptions
-from rally import log as logging
 
 
 LOG = logging.getLogger(__name__)

rally/benchmark/scenarios/sahara/clusters.py

@@ -17,8 +17,8 @@ from rally.benchmark.scenarios import base
 from rally.benchmark.scenarios.sahara import utils
 from rally.benchmark import types
 from rally.benchmark import validation
+from rally.common import log as logging
 from rally import consts
-from rally import log as logging
 
 LOG = logging.getLogger(__name__)
 

rally/benchmark/scenarios/sahara/jobs.py

@@ -16,8 +16,8 @@
 from rally.benchmark.scenarios import base
 from rally.benchmark.scenarios.sahara import utils
 from rally.benchmark import validation
+from rally.common import log as logging
 from rally import consts
-from rally import log as logging
 
 LOG = logging.getLogger(__name__)
 

rally/benchmark/scenarios/sahara/utils.py

@@ -21,9 +21,9 @@ from saharaclient.api import base as sahara_base
 
 from rally.benchmark.scenarios import base
 from rally.benchmark import utils as bench_utils
+from rally.common import log as logging
 from rally import consts
 from rally import exceptions
-from rally import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

rally/benchmark/utils.py

@@ -21,8 +21,8 @@ from novaclient import exceptions as nova_exc
 from novaclient.v1_1 import servers
 import six
 
+from rally.common import log as logging
 from rally import exceptions
-from rally import log as logging
 
 
 LOG = logging.getLogger(__name__)

rally/benchmark/wrappers/network.py

@@ -18,9 +18,9 @@ import abc
 import netaddr
 import six
 
+from rally.common import log as logging
 from rally.common import utils
 from rally import consts
-from rally import log as logging
 
 
 LOG = logging.getLogger(__name__)

rally/cmd/api.py

@@ -23,7 +23,7 @@ from oslo.config import cfg
 
 from rally.aas.rest import app as rally_app
 from rally.common.i18n import _
-from rally import log as logging
+from rally.common import log as logging
 
 
 CONF = cfg.CONF

rally/cmd/cliutils.py

@@ -25,10 +25,10 @@ from oslo.config import cfg
 import six
 
 from rally.common.i18n import _
+from rally.common import log as logging
 from rally.common import utils
 from rally.common import version
 from rally import exceptions
-from rally import log as logging
 from rally.openstack.common import cliutils
 
 

rally/cmd/commands/task.py

@@ -32,11 +32,11 @@ from rally.cmd import cliutils
 from rally.cmd.commands import use
 from rally.cmd import envutils
 from rally.common.i18n import _
+from rally.common import log as logging
 from rally.common import utils as rutils
 from rally import consts
 from rally import db
 from rally import exceptions
-from rally import log as logging
 from rally import objects
 from rally.openstack.common import cliutils as common_cliutils
 

rally/common/broker.py

@@ -18,7 +18,7 @@ import threading
 import time
 
 from rally.common.i18n import _
-from rally import log as logging
+from rally.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

rally/common/sshutils.py

@@ -65,7 +65,7 @@ import paramiko
 import six
 
 from rally.common.i18n import _
-from rally import log as logging
+from rally.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

rally/common/utils.py

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

rally/deploy/engine.py

@@ -19,11 +19,11 @@ import jsonschema
 import six
 
 from rally.common.i18n import _
+from rally.common import log as logging
 from rally.common import utils
 from rally import consts
 from rally.deploy.serverprovider import provider
 from rally import exceptions
-from rally import log as logging
 
 
 LOG = logging.getLogger(__name__)

rally/deploy/engines/devstack.py

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

rally/deploy/engines/lxc.py

@@ -19,12 +19,12 @@ import netaddr
 import six
 
 from rally.common.i18n import _
+from rally.common import log as logging
 from rally.common import utils
 from rally.deploy import engine
 from rally.deploy.serverprovider import provider
 from rally.deploy.serverprovider.providers import lxc
 from rally import exceptions
-from rally import log as logging
 from rally import objects
 
 LOG = logging.getLogger(__name__)

rally/deploy/fuel/fuelclient.py

@@ -19,7 +19,7 @@ import time
 
 import requests
 
-from rally import log as logging
+from rally.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

rally/deploy/serverprovider/providers/lxc.py

@@ -22,10 +22,10 @@ import six
 from six import moves
 
 from rally.common.i18n import _
+from rally.common import log as logging
 from rally.common import utils
 from rally.deploy.serverprovider import provider
 from rally import exceptions
-from rally import log as logging
 
 
 LOG = logging.getLogger(__name__)

rally/deploy/serverprovider/providers/openstack.py

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

rally/exceptions.py

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

rally/osclients.py

@@ -30,9 +30,9 @@ from saharaclient import client as sahara
 from troveclient import client as trove
 from zaqarclient.queues import client as zaqar
 
+from rally.common import log as logging
 from rally import consts
 from rally import exceptions
-from rally import log as logging
 
 
 CONF = cfg.CONF

rally/verification/tempest/config.py

@@ -24,9 +24,9 @@ from six.moves import configparser
 from six.moves.urllib import parse
 
 from rally.common.i18n import _
+from rally.common import log as logging
 from rally import db
 from rally import exceptions
-from rally import log as logging
 from rally import objects
 from rally import osclients
 

rally/verification/tempest/tempest.py

@@ -22,9 +22,9 @@ import sys
 from oslo.serialization import jsonutils
 
 from rally.common.i18n import _
+from rally.common import log as logging
 from rally.common import utils
 from rally import exceptions
-from rally import log as logging
 from rally.verification.tempest import config
 from rally.verification.tempest import subunit2json
 

tests/hacking/README.rst

@@ -12,7 +12,7 @@ Rally Specific Commandments
  * [N302] - Ensure that nonexistent "assert_called" is not used
  * [N303] - Ensure that  nonexistent "assert_called_once" is not used
 * [N310-N314] - Reserved for rules related to logging
- * [N310] - Ensure that ``rally.log`` is used instead of ``rally.openstack.common.log``
+ * [N310] - Ensure that ``rally.common.log`` is used instead of ``rally.openstack.common.log``
  * [N311] - Validate that debug level logs are not translated
  * [N312] - Validate correctness of debug on check.
 * [N32x] - Reserved for rules related to assert* methods

tests/hacking/checks.py

@@ -116,7 +116,7 @@ def check_import_of_logging(logical_line, filename):
     N310
     """
 
-    excluded_files = ["./rally/log.py", "./tests/unit/test_log.py"]
+    excluded_files = ["./rally/common/log.py", "./tests/unit/test_log.py"]
 
     forbidden_imports = ["from rally.openstack.common import log",
                          "import rally.openstack.common.log",
@@ -126,7 +126,7 @@ def check_import_of_logging(logical_line, filename):
         for forbidden_import in forbidden_imports:
             if logical_line.startswith(forbidden_import):
                 yield (0, "N310 Wrong module for logging is imported. Please "
-                          "use `rally.log` instead.")
+                          "use `rally.common.log` instead.")
 
 
 def no_translate_debug_logs(logical_line):
@@ -156,12 +156,13 @@ def no_use_conf_debug_check(logical_line, filename):
 
     N312
     """
-    excluded_files = ["./rally/log.py"]
+    excluded_files = ["./rally/common/log.py"]
 
     point = logical_line.find("CONF.debug")
     if point != -1 and filename not in excluded_files:
         yield(point, "N312 Don't use `CONF.debug`. "
-                     "Function `rally.log.is_debug` should be used instead.")
+                     "Function `rally.common.log.is_debug` "
+                     "should be used instead.")
 
 
 def assert_true_instance(logical_line):

tests/unit/test_hacking.py

@@ -65,9 +65,9 @@ class HackingTestCase(test.TestCase):
         bad_imports = ["from rally.openstack.common import log",
                        "import rally.openstack.common.log",
                        "import logging"]
-        good_imports = ["from rally import log",
+        good_imports = ["from rally.common import log",
-                        "from rally.log",
+                        "from rally.common.log",
-                        "import rally.log"]
+                        "import rally.common.log"]
 
         for bad_import in bad_imports:
             checkres = checks.check_import_of_logging(bad_import, "fakefile")
@@ -75,7 +75,7 @@ class HackingTestCase(test.TestCase):
 
         for bad_import in bad_imports:
             checkres = checks.check_import_of_logging(bad_import,
-                                                      "./rally/log.py")
+                                                      "./rally/common/log.py")
             self.assertEqual([], list(checkres))
 
         for good_import in good_imports:

tests/unit/test_log.py

@@ -17,14 +17,14 @@ import logging
 
 import mock
 
-from rally import log
+from rally.common import log
 from tests.unit import test
 
 
 class LogTestCase(test.TestCase):
 
-    @mock.patch("rally.log.CONF")
+    @mock.patch("rally.common.log.CONF")
-    @mock.patch("rally.log.oslogging")
+    @mock.patch("rally.common.log.oslogging")
     def test_setup(self, mock_oslogger, mock_conf):
 
         proj = "fakep"
@@ -44,9 +44,9 @@ class LogTestCase(test.TestCase):
         mock_oslogger.getLogger(None).logger.setLevel.assert_called_once_with(
             logging.RDEBUG)
 
-    @mock.patch("rally.log.logging")
+    @mock.patch("rally.common.log.logging")
-    @mock.patch("rally.log.RallyContextAdapter")
+    @mock.patch("rally.common.log.RallyContextAdapter")
-    @mock.patch("rally.log.oslogging")
+    @mock.patch("rally.common.log.oslogging")
     def test_getLogger(self, mock_oslogger, mock_radapter, mock_pylogging):
 
         proj = "fake"
@@ -63,8 +63,8 @@ class LogTestCase(test.TestCase):
 
 class LogRallyContaxtAdapter(test.TestCase):
 
-    @mock.patch("rally.log.logging")
+    @mock.patch("rally.common.log.logging")
-    @mock.patch("rally.log.oslogging.ContextAdapter")
+    @mock.patch("rally.common.log.oslogging.ContextAdapter")
     def test_debug(self, mock_oslo_adapter, mock_logging):
 
         mock_logging.RDEBUG = 123