Merge "[cfg] Introduce rally.common.cfg"

etc/rally/rally.conf.sample

@@ -794,3 +794,8 @@
 
 # Neutron create loadbalancer poll interval (floating point value)
 #neutron_create_loadbalancer_poll_interval = 2.0
+
+# Whether Neutron API is older then OpenStack Newton or not. Based in
+# this option, some external fields for identifying resources can be
+# applied. (boolean value)
+#pre_newton_neutron = false

rally/plugins/openstack/cfg/cinder.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.FloatOpt("cinder_volume_create_prepoll_delay",

rally/plugins/openstack/cfg/cleanup.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.IntOpt("resource_deletion_timeout",

rally/plugins/openstack/cfg/ec2.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.FloatOpt(

rally/plugins/openstack/cfg/glance.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.FloatOpt("glance_image_delete_timeout",

rally/plugins/openstack/cfg/heat.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.FloatOpt("heat_stack_create_prepoll_delay",

rally/plugins/openstack/cfg/ironic.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.FloatOpt("ironic_node_create_poll_interval",

rally/plugins/openstack/cfg/keystone_roles.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.IntOpt("roles_context_resource_management_workers",

rally/plugins/openstack/cfg/keystone_users.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 
 OPTS = {"openstack": [

rally/plugins/openstack/cfg/magnum.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.FloatOpt("magnum_cluster_create_prepoll_delay",

rally/plugins/openstack/cfg/manila.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.FloatOpt(

rally/plugins/openstack/cfg/mistral.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.IntOpt(

rally/plugins/openstack/cfg/monasca.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.FloatOpt(

rally/plugins/openstack/cfg/murano.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.IntOpt("murano_deploy_environment_timeout",

rally/plugins/openstack/cfg/neutron.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.FloatOpt("neutron_create_loadbalancer_timeout",

rally/plugins/openstack/cfg/nova.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     # prepoll delay, timeout, poll interval

rally/plugins/openstack/cfg/osclients.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 
 OPTS = {

rally/plugins/openstack/cfg/profiler.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.BoolOpt("enable_profiler",

rally/plugins/openstack/cfg/sahara.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.IntOpt("sahara_cluster_create_timeout",

rally/plugins/openstack/cfg/senlin.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.FloatOpt("senlin_action_timeout",

rally/plugins/openstack/cfg/tempest.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.StrOpt("img_url",

rally/plugins/openstack/cfg/vm.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.FloatOpt("vm_ping_poll_interval",

rally/plugins/openstack/cfg/watcher.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
 
 OPTS = {"openstack": [
     cfg.FloatOpt("watcher_audit_launch_poll_interval",

rally/plugins/openstack/cleanup/base.py

@@ -14,8 +14,7 @@
 #    under the License.
 
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.task import utils
 
 CONF = cfg.CONF

rally/plugins/openstack/cleanup/resources.py

@@ -16,9 +16,9 @@
 from boto import exception as boto_exception
 from neutronclient.common import exceptions as neutron_exceptions
 from novaclient import exceptions as nova_exc
-from oslo_config import cfg
 from saharaclient.api import base as saharaclient_base
 
+from rally.common import cfg
 from rally.common import logging
 from rally.plugins.openstack.cleanup import base
 from rally.plugins.openstack.services.identity import identity

rally/plugins/openstack/context/glance/images.py

@@ -12,8 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.common import logging
 from rally.common import utils as rutils
 from rally.common import validation

rally/plugins/openstack/context/keystone/roles.py

@@ -13,9 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
-
 from rally.common import broker
+from rally.common import cfg
 from rally.common import logging
 from rally.common import validation
 from rally import consts

rally/plugins/openstack/context/keystone/users.py

@@ -16,9 +16,8 @@
 import collections
 import uuid
 
-from oslo_config import cfg
-
 from rally.common import broker
+from rally.common import cfg
 from rally.common import logging
 from rally.common import utils as rutils
 from rally.common import validation

rally/plugins/openstack/context/manila/manila_security_services.py

@@ -13,8 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.common import utils
 from rally.common import validation
 from rally import consts as rally_consts

rally/plugins/openstack/context/manila/manila_share_networks.py

@@ -13,8 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.common import logging
 from rally.common import utils
 from rally.common import validation

rally/plugins/openstack/context/manila/manila_shares.py

@@ -13,8 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.common import utils
 from rally.common import validation
 from rally import consts as rally_consts

rally/plugins/openstack/context/sahara/sahara_cluster.py

@@ -13,8 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts

rally/plugins/openstack/osclients.py

@@ -16,10 +16,10 @@
 import abc
 import os
 
-from oslo_config import cfg
 from six.moves.urllib import parse
 
 from rally.cli import envutils
+from rally.common import cfg
 from rally.common import logging
 from rally.common.plugin import plugin
 from rally.common import utils

rally/plugins/openstack/platforms/existing.py

@@ -16,8 +16,7 @@ import copy
 import json
 import traceback
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.common import logging
 from rally.env import platform
 from rally.plugins.openstack import osclients

rally/plugins/openstack/scenario.py

@@ -16,8 +16,9 @@
 import functools
 import random
 
-from oslo_config import cfg
 from osprofiler import profiler
+
+from rally.common import cfg
 from rally.common.plugin import plugin
 from rally.plugins.openstack import osclients
 from rally.task import context

rally/plugins/openstack/scenarios/cinder/utils.py

@@ -15,8 +15,7 @@
 
 import random
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.common import logging
 from rally import exceptions
 from rally.plugins.openstack import scenario

rally/plugins/openstack/scenarios/ec2/utils.py

@@ -13,8 +13,7 @@
 # under the License.
 
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.plugins.openstack import scenario
 from rally.task import atomic
 from rally.task import utils

rally/plugins/openstack/scenarios/glance/utils.py

@@ -13,8 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.common import logging
 from rally.plugins.openstack import scenario
 from rally.plugins.openstack.wrappers import glance as glance_wrapper

rally/plugins/openstack/scenarios/heat/utils.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
 import requests
 
+from rally.common import cfg
 from rally.common import logging
 from rally import exceptions
 from rally.plugins.openstack import scenario

rally/plugins/openstack/scenarios/ironic/utils.py

@@ -15,8 +15,7 @@
 
 import string
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.plugins.openstack import scenario
 from rally.task import atomic
 from rally.task import utils

rally/plugins/openstack/scenarios/magnum/utils.py

@@ -17,12 +17,12 @@ import random
 import string
 import time
 
-from oslo_config import cfg
-
 from kubernetes import client as k8s_config
 from kubernetes.client import api_client
 from kubernetes.client.apis import core_v1_api
 from kubernetes.client.rest import ApiException
+
+from rally.common import cfg
 from rally.common import utils as common_utils
 from rally import exceptions
 from rally.plugins.openstack import scenario

rally/plugins/openstack/scenarios/manila/utils.py

@@ -15,8 +15,7 @@
 
 import random
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally import exceptions
 from rally.plugins.openstack.context.manila import consts
 from rally.plugins.openstack import scenario

rally/plugins/openstack/scenarios/mistral/utils.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 
-from oslo_config import cfg
 import yaml
 
+from rally.common import cfg
 from rally.plugins.openstack import scenario
 from rally.task import atomic
 from rally.task import utils

rally/plugins/openstack/scenarios/monasca/utils.py

@@ -16,8 +16,7 @@ import random
 import time
 import uuid
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.plugins.openstack import scenario
 from rally.task import atomic
 

rally/plugins/openstack/scenarios/murano/utils.py

@@ -19,9 +19,9 @@ import tempfile
 import uuid
 import zipfile
 
-from oslo_config import cfg
 import yaml
 
+from rally.common import cfg
 from rally.common import fileutils
 from rally.common import utils as common_utils
 from rally.plugins.openstack import scenario

rally/plugins/openstack/scenarios/neutron/utils.py

@@ -15,8 +15,7 @@
 
 import random
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.common import logging
 from rally import exceptions
 from rally.plugins.openstack import scenario

rally/plugins/openstack/scenarios/nova/utils.py

@@ -14,8 +14,7 @@
 #    under the License.
 
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.common import logging
 from rally import exceptions
 from rally.plugins.openstack import scenario

rally/plugins/openstack/scenarios/sahara/utils.py

@@ -15,10 +15,10 @@
 
 import random
 
-from oslo_config import cfg
 from oslo_utils import uuidutils
 from saharaclient.api import base as sahara_base
 
+from rally.common import cfg
 from rally.common import logging
 from rally.common import utils as rutils
 from rally import consts

rally/plugins/openstack/scenarios/senlin/utils.py

@@ -10,8 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally import exceptions
 from rally.plugins.openstack import scenario
 from rally.task import atomic

rally/plugins/openstack/scenarios/vm/utils.py

@@ -18,9 +18,9 @@ import subprocess
 import sys
 
 import netaddr
-from oslo_config import cfg
 import six
 
+from rally.common import cfg
 from rally.common import logging
 from rally.common import sshutils
 from rally.plugins.openstack.scenarios.nova import utils as nova_utils

rally/plugins/openstack/scenarios/watcher/utils.py

@@ -10,8 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.plugins.openstack import scenario
 from rally.task import atomic
 from rally.task import utils

rally/plugins/openstack/services/heat/main.py

@@ -11,8 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.common import utils as common_utils
 from rally.task import atomic
 from rally.task import utils

rally/plugins/openstack/services/image/glance_v1.py

@@ -14,8 +14,7 @@
 
 import os
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.common import utils as rutils
 from rally.plugins.openstack import service
 from rally.plugins.openstack.services.image import glance_common

rally/plugins/openstack/services/image/glance_v2.py

@@ -15,9 +15,9 @@
 import os
 import time
 
-from oslo_config import cfg
 import requests
 
+from rally.common import cfg
 from rally.common import utils as rutils
 from rally.plugins.openstack import service
 from rally.plugins.openstack.services.image import glance_common

rally/plugins/openstack/services/image/image.py

@@ -11,10 +11,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from rally.common import cfg
 from rally import exceptions
 from rally.task import service
 
-from oslo_config import cfg
 
 CONF = cfg.CONF
 

rally/plugins/openstack/services/storage/block.py

@@ -12,8 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
+from rally.common import cfg
-
 from rally.task import service
 
 

rally/plugins/openstack/verification/tempest/config.py

@@ -16,10 +16,10 @@
 import inspect
 import os
 
-from oslo_config import cfg
 import six
 from six.moves import configparser
 
+from rally.common import cfg
 from rally.common import logging
 from rally import exceptions
 from rally.verification import utils

rally/plugins/openstack/wrappers/glance.py

@@ -17,15 +17,16 @@ import abc
 import os
 import time
 
+from glanceclient import exc as glance_exc
+import requests
+import six
+
+from rally.common import cfg
 from rally.common import logging
 from rally.common import utils as rutils
 from rally import exceptions
 from rally.task import utils
 
-from glanceclient import exc as glance_exc
-from oslo_config import cfg
-import requests
-import six
 
 LOG = logging.getLogger(__name__)
 

rally/plugins/openstack/wrappers/network.py

@@ -16,9 +16,9 @@
 import abc
 
 import netaddr
-from oslo_config import cfg
 import six
 
+from rally.common import cfg
 from rally.common import logging
 from rally.common import utils
 from rally import consts

tests/hacking/checks.py

@@ -177,6 +177,25 @@ def check_import_of_logging(logical_line, physical_line, filename):
                           "use `rally.common.logging` instead.")
 
 
+@skip_ignored_lines
+def check_import_of_config(logical_line, physical_line, filename):
+    """Check correctness import of config module
+
+    N311
+    """
+
+    excluded_files = ["./rally/common/cfg.py"]
+
+    forbidden_imports = ["from oslo_config",
+                         "import oslo_config"]
+
+    if filename not in excluded_files:
+        for forbidden_import in forbidden_imports:
+            if logical_line.startswith(forbidden_import):
+                yield (0, "N311 Wrong module for config is imported. Please "
+                          "use `rally.common.cfg` instead.")
+
+
 @skip_ignored_lines
 def no_use_conf_debug_check(logical_line, physical_line, filename):
     """Check for "cfg.CONF.debug"
@@ -572,8 +591,7 @@ def check_opts_import_path(logical_line, physical_line, filename):
 
      N342
      """
-    excluded_files = ["./rally/osclients.py",
+    excluded_files = ["./rally/task/engine.py",
-                      "./rally/task/engine.py",
                       "./rally/task/context.py",
                       "./rally/task/scenario.py",
                       "./rally/common/opts.py"]
@@ -590,6 +608,7 @@ def check_opts_import_path(logical_line, physical_line, filename):
 def factory(register):
     register(check_assert_methods_from_mock)
     register(check_import_of_logging)
+    register(check_import_of_config)
     register(no_use_conf_debug_check)
     register(assert_true_instance)
     register(assert_equal_type)

tests/unit/plugins/openstack/context/sahara/test_sahara_cluster.py

@@ -13,8 +13,8 @@
 # under the License.
 
 import mock
-from oslo_config import cfg
 
+from rally.common import cfg
 from rally import exceptions
 from rally.plugins.openstack.context.sahara import sahara_cluster
 from rally.plugins.openstack.scenarios.sahara import utils as sahara_utils

tests/unit/plugins/openstack/scenarios/cinder/test_utils.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 import mock
-from oslo_config import cfg
 
+from rally.common import cfg
 from rally import exceptions
 from rally.plugins.openstack import osclients
 from rally.plugins.openstack.scenarios.cinder import utils

tests/unit/plugins/openstack/scenarios/ec2/test_utils.py

@@ -13,8 +13,8 @@
 # under the License.
 
 import mock
-from oslo_config import cfg
 
+from rally.common import cfg
 from rally.plugins.openstack.scenarios.ec2 import utils
 from tests.unit import test
 

tests/unit/plugins/openstack/scenarios/murano/test_utils.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 import mock
-from oslo_config import cfg
 
+from rally.common import cfg
 from rally.plugins.openstack.scenarios.murano import utils
 from tests.unit import test
 

tests/unit/plugins/openstack/scenarios/nova/test_utils.py

@@ -15,8 +15,8 @@
 
 import ddt
 import mock
-from oslo_config import cfg
 
+from rally.common import cfg
 from rally import exceptions as rally_exceptions
 from rally.plugins.openstack.scenarios.nova import utils
 from tests.unit import fakes

tests/unit/plugins/openstack/scenarios/sahara/test_jobs.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 import mock
-from oslo_config import cfg
 
+from rally.common import cfg
 from rally.plugins.openstack.scenarios.sahara import jobs
 from tests.unit import test
 

tests/unit/plugins/openstack/scenarios/sahara/test_utils.py

@@ -14,10 +14,10 @@
 #    under the License.
 
 import mock
-from oslo_config import cfg
 from oslo_utils import uuidutils
 from saharaclient.api import base as sahara_base
 
+from rally.common import cfg
 from rally import consts
 from rally import exceptions
 from rally.plugins.openstack.scenarios.sahara import utils

tests/unit/plugins/openstack/scenarios/senlin/test_utils.py

@@ -11,8 +11,8 @@
 # under the License.
 
 import mock
-from oslo_config import cfg
 
+from rally.common import cfg
 from rally import exceptions
 from rally.plugins.openstack.scenarios.senlin import utils
 from tests.unit import test

tests/unit/plugins/openstack/scenarios/vm/test_utils.py

@@ -18,8 +18,8 @@ import subprocess
 
 import mock
 import netaddr
-from oslo_config import cfg
 
+from rally.common import cfg
 from rally.plugins.openstack.scenarios.vm import utils
 from tests.unit import test
 

tests/unit/plugins/openstack/scenarios/watcher/test_utils.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 import mock
-from oslo_config import cfg
 
+from rally.common import cfg
 from rally.plugins.openstack.scenarios.watcher import utils
 from tests.unit import test
 

tests/unit/plugins/openstack/services/storage/test_cinder_common.py

@@ -16,8 +16,8 @@ import uuid
 
 import ddt
 import mock
-from oslo_config import cfg
 
+from rally.common import cfg
 from rally import exceptions
 from rally.plugins.openstack import service
 from rally.plugins.openstack.services.storage import block

tests/unit/plugins/openstack/services/storage/test_cinder_v1.py

@@ -13,8 +13,8 @@
 #    under the License.
 
 import mock
-from oslo_config import cfg
 
+from rally.common import cfg
 from rally.plugins.openstack.services.storage import cinder_v1
 from tests.unit import fakes
 from tests.unit import test

tests/unit/plugins/openstack/services/storage/test_cinder_v2.py

@@ -13,8 +13,8 @@
 #    under the License.
 
 import mock
-from oslo_config import cfg
 
+from rally.common import cfg
 from rally.plugins.openstack.services.storage import cinder_v2
 from tests.unit import fakes
 from tests.unit import test

tests/unit/plugins/openstack/test_osclients.py

@@ -15,8 +15,8 @@
 
 import ddt
 import mock
-from oslo_config import cfg
 
+from rally.common import cfg
 from rally import consts
 from rally import exceptions
 from rally import osclients as deprecated_osclients  # noqa

tests/unit/plugins/openstack/verification/tempest/test_config.py

@@ -15,8 +15,8 @@
 
 import ddt
 import mock
-from oslo_config import cfg
 
+from rally.common import cfg
 from rally.plugins.openstack import osclients
 from rally.plugins.openstack.verification.tempest import config
 from tests.unit import fakes

tests/unit/plugins/openstack/verification/tempest/test_context.py

@@ -17,9 +17,9 @@ import os
 
 import ddt
 import mock
-from oslo_config import cfg
 import requests
 
+from rally.common import cfg
 from rally import exceptions
 from rally.plugins.openstack.verification.tempest import config
 from rally.plugins.openstack.verification.tempest import context

tests/unit/plugins/openstack/wrappers/test_glance.py

@@ -18,8 +18,8 @@ import tempfile
 import ddt
 from glanceclient import exc as glance_exc
 import mock
-from oslo_config import cfg
 
+from rally.common import cfg
 from rally import exceptions
 from rally.plugins.openstack.wrappers import glance as glance_wrapper
 from tests.unit import test

tests/unit/test.py

@@ -18,15 +18,15 @@ import os
 import uuid
 
 import mock
-from oslo_config import fixture
 from oslotest import base
 
+from rally.common import cfg
 from rally.common import db
 from rally import plugins
 from tests.unit import fakes
 
 
-class DatabaseFixture(fixture.Config):
+class DatabaseFixture(cfg.fixture.Config):
     """Create clean DB before starting test."""
     def setUp(self):
         super(DatabaseFixture, self).setUp()