From 8763b5db06274356d4aafeac72cc2b15a82e04bb Mon Sep 17 00:00:00 2001 From: Anantha Arunachalam Date: Mon, 20 Jul 2015 16:09:44 -0400 Subject: [PATCH] Change oslo package names according to the latest oslo release 2.0.0 Also requirements have modified to reflect the latest oslo packages. Change-Id: I5f5e28ef183dfbafc8c1215ef92d55f6358de27d --- poppy/bootstrap.py | 2 +- poppy/cmd/server.py | 2 +- poppy/cmd/task_flow_worker.py | 2 +- poppy/distributed_task/base/driver.py | 2 +- poppy/distributed_task/taskflow/driver.py | 2 +- poppy/distributed_task/taskflow/flow/create_service.py | 2 +- poppy/distributed_task/taskflow/flow/delete_service.py | 2 +- poppy/distributed_task/taskflow/flow/purge_service.py | 2 +- poppy/distributed_task/taskflow/flow/update_service.py | 2 +- poppy/distributed_task/taskflow/flow/update_service_state.py | 2 +- poppy/distributed_task/taskflow/services.py | 2 +- poppy/distributed_task/taskflow/task/common.py | 2 +- poppy/distributed_task/taskflow/task/create_service_tasks.py | 2 +- poppy/distributed_task/taskflow/task/delete_service_tasks.py | 2 +- poppy/distributed_task/taskflow/task/purge_service_tasks.py | 2 +- .../taskflow/task/update_service_state_tasks.py | 2 +- poppy/distributed_task/taskflow/task/update_service_tasks.py | 2 +- poppy/distributed_task/utils/memoized_controllers.py | 2 +- poppy/dns/base/driver.py | 2 +- poppy/dns/rackspace/driver.py | 2 +- poppy/manager/default/services.py | 2 +- poppy/openstack/common/log.py | 4 ++-- poppy/provider/akamai/driver.py | 2 +- poppy/provider/base/driver.py | 2 +- poppy/provider/cloudfront/driver.py | 2 +- poppy/provider/fastly/driver.py | 2 +- poppy/provider/maxcdn/driver.py | 2 +- poppy/storage/base/driver.py | 4 ++-- poppy/storage/cassandra/driver.py | 2 +- poppy/storage/mockdb/driver.py | 2 +- poppy/transport/app.py | 2 +- poppy/transport/base.py | 2 +- poppy/transport/pecan/controllers/v1/services.py | 2 +- poppy/transport/pecan/driver.py | 2 +- poppy/transport/pecan/hooks/context.py | 2 +- requirements/common.txt | 4 +++- requirements/docs.txt | 3 ++- tests/base.py | 2 +- tests/functional/transport/pecan/base.py | 2 +- tests/functional/transport/pecan/controllers/test_services.py | 2 +- tests/test-requirements.txt | 2 +- tests/unit/distributed_task/taskflow/test_driver.py | 2 +- tests/unit/distributed_task/taskflow/test_services.py | 2 +- tests/unit/dns/rackspace/test_driver.py | 2 +- tests/unit/dns/rackspace/test_services.py | 2 +- tests/unit/manager/default/test_driver.py | 2 +- tests/unit/manager/default/test_flavors.py | 2 +- tests/unit/manager/default/test_services.py | 2 +- tests/unit/provider/akamai/test_driver.py | 2 +- tests/unit/provider/cloudfront/test_driver.py | 2 +- tests/unit/provider/fastly/test_driver.py | 2 +- tests/unit/provider/maxcdn/test_driver.py | 2 +- tests/unit/provider/maxcdn/test_services.py | 2 +- tests/unit/provider/mock/test_mock_driver.py | 2 +- tests/unit/storage/cassandra/test_driver.py | 2 +- tests/unit/storage/cassandra/test_flavors.py | 2 +- tests/unit/storage/cassandra/test_services.py | 2 +- tests/unit/storage/mockdb/test_driver.py | 2 +- tests/unit/storage/mockdb/test_flavors.py | 2 +- tests/unit/storage/mockdb/test_services.py | 2 +- tests/unit/test_bootstrap.py | 2 +- tests/unit/transport/pecan/test_driver.py | 2 +- 62 files changed, 67 insertions(+), 64 deletions(-) diff --git a/poppy/bootstrap.py b/poppy/bootstrap.py index 65f4ee0e..b8298a4c 100644 --- a/poppy/bootstrap.py +++ b/poppy/bootstrap.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg from stevedore import driver from stevedore import named diff --git a/poppy/cmd/server.py b/poppy/cmd/server.py index ef0c0857..3852ce16 100644 --- a/poppy/cmd/server.py +++ b/poppy/cmd/server.py @@ -14,7 +14,7 @@ # limitations under the License. import os -from oslo.config import cfg +from oslo_config import cfg from poppy import bootstrap from poppy.common import cli diff --git a/poppy/cmd/task_flow_worker.py b/poppy/cmd/task_flow_worker.py index e1a2eed6..f4e5e6a4 100644 --- a/poppy/cmd/task_flow_worker.py +++ b/poppy/cmd/task_flow_worker.py @@ -16,7 +16,7 @@ import os import socket -from oslo.config import cfg +from oslo_config import cfg from poppy import bootstrap from poppy.openstack.common import log diff --git a/poppy/distributed_task/base/driver.py b/poppy/distributed_task/base/driver.py index 78016cf5..9e16c96f 100644 --- a/poppy/distributed_task/base/driver.py +++ b/poppy/distributed_task/base/driver.py @@ -23,7 +23,7 @@ class DistributedTaskDriverBase(object): """Interface definition for distributed task queue driver. :param conf: Configuration containing options for this driver. - :type conf: `oslo.config.ConfigOpts` + :type conf: `oslo_config.ConfigOpts` """ def __init__(self, conf): self._conf = conf diff --git a/poppy/distributed_task/taskflow/driver.py b/poppy/distributed_task/taskflow/driver.py index 6b06b297..a8b5ce37 100644 --- a/poppy/distributed_task/taskflow/driver.py +++ b/poppy/distributed_task/taskflow/driver.py @@ -15,7 +15,7 @@ import logging -from oslo.config import cfg +from oslo_config import cfg from taskflow.jobs import backends as job_backends from taskflow.persistence import backends as persistence_backends diff --git a/poppy/distributed_task/taskflow/flow/create_service.py b/poppy/distributed_task/taskflow/flow/create_service.py index 196488fd..7ae1d8ac 100644 --- a/poppy/distributed_task/taskflow/flow/create_service.py +++ b/poppy/distributed_task/taskflow/flow/create_service.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg from taskflow.patterns import graph_flow from taskflow.patterns import linear_flow from taskflow import retry diff --git a/poppy/distributed_task/taskflow/flow/delete_service.py b/poppy/distributed_task/taskflow/flow/delete_service.py index 34b0562a..3bfb5b42 100644 --- a/poppy/distributed_task/taskflow/flow/delete_service.py +++ b/poppy/distributed_task/taskflow/flow/delete_service.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg from taskflow.patterns import graph_flow from taskflow.patterns import linear_flow from taskflow import retry diff --git a/poppy/distributed_task/taskflow/flow/purge_service.py b/poppy/distributed_task/taskflow/flow/purge_service.py index 8338a735..07cf53b9 100644 --- a/poppy/distributed_task/taskflow/flow/purge_service.py +++ b/poppy/distributed_task/taskflow/flow/purge_service.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg from taskflow.patterns import graph_flow from taskflow.patterns import linear_flow diff --git a/poppy/distributed_task/taskflow/flow/update_service.py b/poppy/distributed_task/taskflow/flow/update_service.py index 6dc0bd14..feaf9c82 100644 --- a/poppy/distributed_task/taskflow/flow/update_service.py +++ b/poppy/distributed_task/taskflow/flow/update_service.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg from taskflow.patterns import graph_flow from taskflow.patterns import linear_flow from taskflow import retry diff --git a/poppy/distributed_task/taskflow/flow/update_service_state.py b/poppy/distributed_task/taskflow/flow/update_service_state.py index 50aae0c5..d8e1b7ce 100644 --- a/poppy/distributed_task/taskflow/flow/update_service_state.py +++ b/poppy/distributed_task/taskflow/flow/update_service_state.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg from taskflow.patterns import linear_flow from poppy.distributed_task.taskflow.task import update_service_state_tasks diff --git a/poppy/distributed_task/taskflow/services.py b/poppy/distributed_task/taskflow/services.py index 9c90a7d2..3d3a48ae 100644 --- a/poppy/distributed_task/taskflow/services.py +++ b/poppy/distributed_task/taskflow/services.py @@ -14,7 +14,7 @@ # limitations under the License. -from oslo.utils import uuidutils +from oslo_utils import uuidutils from taskflow.conductors import single_threaded from taskflow import engines from taskflow.listeners import logging as logging_listener diff --git a/poppy/distributed_task/taskflow/task/common.py b/poppy/distributed_task/taskflow/task/common.py index 82a64ea5..660ef7e0 100644 --- a/poppy/distributed_task/taskflow/task/common.py +++ b/poppy/distributed_task/taskflow/task/common.py @@ -16,7 +16,7 @@ import json import requests -from oslo.config import cfg +from oslo_config import cfg from taskflow import task from poppy.distributed_task.utils import memoized_controllers diff --git a/poppy/distributed_task/taskflow/task/create_service_tasks.py b/poppy/distributed_task/taskflow/task/create_service_tasks.py index 340a3075..6e73f2a4 100644 --- a/poppy/distributed_task/taskflow/task/create_service_tasks.py +++ b/poppy/distributed_task/taskflow/task/create_service_tasks.py @@ -16,7 +16,7 @@ import json import time -from oslo.config import cfg +from oslo_config import cfg from taskflow import task from poppy.distributed_task.taskflow.task import common diff --git a/poppy/distributed_task/taskflow/task/delete_service_tasks.py b/poppy/distributed_task/taskflow/task/delete_service_tasks.py index 101ac17d..4a689214 100644 --- a/poppy/distributed_task/taskflow/task/delete_service_tasks.py +++ b/poppy/distributed_task/taskflow/task/delete_service_tasks.py @@ -16,7 +16,7 @@ import json import time -from oslo.config import cfg +from oslo_config import cfg from taskflow import task from poppy.distributed_task.utils import exc_loader diff --git a/poppy/distributed_task/taskflow/task/purge_service_tasks.py b/poppy/distributed_task/taskflow/task/purge_service_tasks.py index 33be568e..922a1e5e 100644 --- a/poppy/distributed_task/taskflow/task/purge_service_tasks.py +++ b/poppy/distributed_task/taskflow/task/purge_service_tasks.py @@ -15,7 +15,7 @@ import json -from oslo.config import cfg +from oslo_config import cfg from taskflow import task from poppy.distributed_task.utils import memoized_controllers diff --git a/poppy/distributed_task/taskflow/task/update_service_state_tasks.py b/poppy/distributed_task/taskflow/task/update_service_state_tasks.py index fd442a90..650b63ae 100644 --- a/poppy/distributed_task/taskflow/task/update_service_state_tasks.py +++ b/poppy/distributed_task/taskflow/task/update_service_state_tasks.py @@ -15,7 +15,7 @@ import json -from oslo.config import cfg +from oslo_config import cfg from taskflow import task from poppy.distributed_task.utils import memoized_controllers diff --git a/poppy/distributed_task/taskflow/task/update_service_tasks.py b/poppy/distributed_task/taskflow/task/update_service_tasks.py index e27a4147..99997863 100644 --- a/poppy/distributed_task/taskflow/task/update_service_tasks.py +++ b/poppy/distributed_task/taskflow/task/update_service_tasks.py @@ -16,7 +16,7 @@ import json import time -from oslo.config import cfg +from oslo_config import cfg from taskflow import task from poppy.distributed_task.taskflow.task import common diff --git a/poppy/distributed_task/utils/memoized_controllers.py b/poppy/distributed_task/utils/memoized_controllers.py index ffbba7a0..6059857f 100644 --- a/poppy/distributed_task/utils/memoized_controllers.py +++ b/poppy/distributed_task/utils/memoized_controllers.py @@ -14,7 +14,7 @@ # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg from poppy import bootstrap from poppy.openstack.common import log diff --git a/poppy/dns/base/driver.py b/poppy/dns/base/driver.py index aed7dacd..4347061b 100644 --- a/poppy/dns/base/driver.py +++ b/poppy/dns/base/driver.py @@ -31,7 +31,7 @@ class DNSDriverBase(object): CDN provider url. :param conf: Configuration containing options for this driver. - :type conf: `oslo.config.ConfigOpts` + :type conf: `oslo_config.ConfigOpts` """ def __init__(self, conf): diff --git a/poppy/dns/rackspace/driver.py b/poppy/dns/rackspace/driver.py index 8aebab5b..dba4974b 100644 --- a/poppy/dns/rackspace/driver.py +++ b/poppy/dns/rackspace/driver.py @@ -15,7 +15,7 @@ """DNS Provider implementation.""" -from oslo.config import cfg +from oslo_config import cfg import pyrax from poppy.dns import base diff --git a/poppy/manager/default/services.py b/poppy/manager/default/services.py index 726f531f..cf6ee4e5 100644 --- a/poppy/manager/default/services.py +++ b/poppy/manager/default/services.py @@ -17,7 +17,7 @@ import json import random import jsonpatch -from oslo.config import cfg +from oslo_config import cfg from poppy.common import errors from poppy.distributed_task.taskflow.flow import create_service diff --git a/poppy/openstack/common/log.py b/poppy/openstack/common/log.py index 2e2d7c54..8a92fe50 100644 --- a/poppy/openstack/common/log.py +++ b/poppy/openstack/common/log.py @@ -36,7 +36,7 @@ import os import sys import traceback -from oslo.config import cfg +from oslo_config import cfg import six from six import moves @@ -124,7 +124,7 @@ generic_log_opts = [ DEFAULT_LOG_LEVELS = ['amqp=WARN', 'amqplib=WARN', 'boto=WARN', 'qpid=WARN', 'sqlalchemy=WARN', 'suds=INFO', - 'oslo.messaging=INFO', 'iso8601=WARN', + 'oslo_messaging=INFO', 'iso8601=WARN', 'requests.packages.urllib3.connectionpool=WARN', 'urllib3.connectionpool=WARN', 'websocket=WARN'] diff --git a/poppy/provider/akamai/driver.py b/poppy/provider/akamai/driver.py index 224d99ad..49293200 100644 --- a/poppy/provider/akamai/driver.py +++ b/poppy/provider/akamai/driver.py @@ -18,7 +18,7 @@ import json from akamai import edgegrid -from oslo.config import cfg +from oslo_config import cfg import requests from poppy.openstack.common import log diff --git a/poppy/provider/base/driver.py b/poppy/provider/base/driver.py index 3a802048..c2705ff9 100644 --- a/poppy/provider/base/driver.py +++ b/poppy/provider/base/driver.py @@ -29,7 +29,7 @@ class ProviderDriverBase(object): loaded from the config file. :param conf: Configuration containing options for this driver. - :type conf: `oslo.config.ConfigOpts` + :type conf: `oslo_config.ConfigOpts` """ def __init__(self, conf): diff --git a/poppy/provider/cloudfront/driver.py b/poppy/provider/cloudfront/driver.py index 51ff6902..be61edf0 100644 --- a/poppy/provider/cloudfront/driver.py +++ b/poppy/provider/cloudfront/driver.py @@ -16,7 +16,7 @@ """CloudFront CDN Provider implementation.""" import boto -from oslo.config import cfg +from oslo_config import cfg import requests from poppy.openstack.common import log as logging diff --git a/poppy/provider/fastly/driver.py b/poppy/provider/fastly/driver.py index 47cbc635..088c2c13 100644 --- a/poppy/provider/fastly/driver.py +++ b/poppy/provider/fastly/driver.py @@ -16,7 +16,7 @@ """Fastly CDN Provider implementation.""" import fastly -from oslo.config import cfg +from oslo_config import cfg import requests from poppy.openstack.common import log as logging diff --git a/poppy/provider/maxcdn/driver.py b/poppy/provider/maxcdn/driver.py index a6ee5e21..5ef04524 100644 --- a/poppy/provider/maxcdn/driver.py +++ b/poppy/provider/maxcdn/driver.py @@ -16,7 +16,7 @@ """Max CDN Provider implementation.""" import maxcdn -from oslo.config import cfg +from oslo_config import cfg import requests from poppy.openstack.common import log as logging diff --git a/poppy/storage/base/driver.py b/poppy/storage/base/driver.py index bcfbeb71..983a8908 100644 --- a/poppy/storage/base/driver.py +++ b/poppy/storage/base/driver.py @@ -15,7 +15,7 @@ import abc -from oslo.config import cfg +from oslo_config import cfg import six @@ -38,7 +38,7 @@ class StorageDriverBase(object): loaded from the config file. :param conf: Configuration containing options for this driver. - :type conf: `oslo.config.ConfigOpts` + :type conf: `oslo_config.ConfigOpts` """ def __init__(self, conf): diff --git a/poppy/storage/cassandra/driver.py b/poppy/storage/cassandra/driver.py index 73bb9afe..e046b2e8 100644 --- a/poppy/storage/cassandra/driver.py +++ b/poppy/storage/cassandra/driver.py @@ -26,7 +26,7 @@ from cassandra import cluster from cassandra import policies from cassandra import query from cdeploy import migrator -from oslo.config import cfg +from oslo_config import cfg from poppy.openstack.common import log as logging from poppy.storage import base diff --git a/poppy/storage/mockdb/driver.py b/poppy/storage/mockdb/driver.py index b5b05eba..5a5403cc 100644 --- a/poppy/storage/mockdb/driver.py +++ b/poppy/storage/mockdb/driver.py @@ -19,7 +19,7 @@ from poppy.openstack.common import log as logging from poppy.storage import base from poppy.storage.mockdb import controllers -from oslo.config import cfg +from oslo_config import cfg LOG = logging.getLogger(__name__) diff --git a/poppy/transport/app.py b/poppy/transport/app.py index cf7f706f..ecee772c 100644 --- a/poppy/transport/app.py +++ b/poppy/transport/app.py @@ -26,7 +26,7 @@ no common way to specify / pass configuration files to the WSGI app when it is called from other apps. """ -from oslo.config import cfg +from oslo_config import cfg from poppy import bootstrap diff --git a/poppy/transport/base.py b/poppy/transport/base.py index e3c1b82e..414008d1 100644 --- a/poppy/transport/base.py +++ b/poppy/transport/base.py @@ -23,7 +23,7 @@ class TransportDriverBase(object): """Base class for Transport Drivers to document the expected interface. :param conf: configuration instance - :type conf: oslo.config.cfg.CONF + :type conf: oslo_config.cfg.CONF """ def __init__(self, conf, manager): diff --git a/poppy/transport/pecan/controllers/v1/services.py b/poppy/transport/pecan/controllers/v1/services.py index d9ac604c..e605d852 100644 --- a/poppy/transport/pecan/controllers/v1/services.py +++ b/poppy/transport/pecan/controllers/v1/services.py @@ -16,7 +16,7 @@ import json import uuid -from oslo.config import cfg +from oslo_config import cfg import pecan from pecan import hooks diff --git a/poppy/transport/pecan/driver.py b/poppy/transport/pecan/driver.py index c5feb6f4..0b6b4274 100644 --- a/poppy/transport/pecan/driver.py +++ b/poppy/transport/pecan/driver.py @@ -15,7 +15,7 @@ from wsgiref import simple_server -from oslo.config import cfg +from oslo_config import cfg import pecan from poppy.openstack.common import log diff --git a/poppy/transport/pecan/hooks/context.py b/poppy/transport/pecan/hooks/context.py index 169070db..e67e19d3 100644 --- a/poppy/transport/pecan/hooks/context.py +++ b/poppy/transport/pecan/hooks/context.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg import pecan from pecan import hooks diff --git a/requirements/common.txt b/requirements/common.txt index 1ec11ba1..b9883ede 100644 --- a/requirements/common.txt +++ b/requirements/common.txt @@ -12,4 +12,6 @@ python-keystoneclient>=0.4.1 WebOb>=1.2.3,<1.3 stevedore>=0.10 six>=1.4.1 -oslo.config>=1.2.0 +oslo.config>=2.0.0 +oslo.serialization>=1.7.0 +oslo.utils>=2.0.0 diff --git a/requirements/docs.txt b/requirements/docs.txt index 14ceac30..1e44f261 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,4 +1,5 @@ oslosphinx sphinx sphinxcontrib-pecanwsme -sphinxcontrib-httpdomain \ No newline at end of file +sphinxcontrib-httpdomain +oslo.i18n>=2.1.0 \ No newline at end of file diff --git a/tests/base.py b/tests/base.py index a9e00542..eac3cdcc 100644 --- a/tests/base.py +++ b/tests/base.py @@ -16,7 +16,7 @@ import os import fixtures -from oslo.config import cfg +from oslo_config import cfg import testtools diff --git a/tests/functional/transport/pecan/base.py b/tests/functional/transport/pecan/base.py index 93447905..f85c7123 100644 --- a/tests/functional/transport/pecan/base.py +++ b/tests/functional/transport/pecan/base.py @@ -16,7 +16,7 @@ import os import mock -from oslo.config import cfg +from oslo_config import cfg import webtest from poppy import bootstrap diff --git a/tests/functional/transport/pecan/controllers/test_services.py b/tests/functional/transport/pecan/controllers/test_services.py index 22912f1d..4dd4ae16 100644 --- a/tests/functional/transport/pecan/controllers/test_services.py +++ b/tests/functional/transport/pecan/controllers/test_services.py @@ -21,7 +21,7 @@ except ImportError: import uuid import ddt -from oslo.config import cfg +from oslo_config import cfg import pecan from poppy.transport.pecan.controllers import base as c_base diff --git a/tests/test-requirements.txt b/tests/test-requirements.txt index 07d69204..7ec1e7f4 100644 --- a/tests/test-requirements.txt +++ b/tests/test-requirements.txt @@ -6,7 +6,7 @@ hacking mock nose openstack.nose_plugin -oslotest +oslotest>=1.9.0 requests testrepository testtools diff --git a/tests/unit/distributed_task/taskflow/test_driver.py b/tests/unit/distributed_task/taskflow/test_driver.py index 167e4a53..9831a8aa 100644 --- a/tests/unit/distributed_task/taskflow/test_driver.py +++ b/tests/unit/distributed_task/taskflow/test_driver.py @@ -15,7 +15,7 @@ """Unittests for TaskFlow distributed_task driver implementation.""" -from oslo.config import cfg +from oslo_config import cfg from poppy.distributed_task.taskflow import driver from tests.unit import base diff --git a/tests/unit/distributed_task/taskflow/test_services.py b/tests/unit/distributed_task/taskflow/test_services.py index eec2c95c..75b3dfac 100644 --- a/tests/unit/distributed_task/taskflow/test_services.py +++ b/tests/unit/distributed_task/taskflow/test_services.py @@ -16,7 +16,7 @@ """Unittests for TaskFlow distributed_task service_controller.""" import mock -from oslo.config import cfg +from oslo_config import cfg from poppy.distributed_task.taskflow import driver from tests.unit import base diff --git a/tests/unit/dns/rackspace/test_driver.py b/tests/unit/dns/rackspace/test_driver.py index e4bb0a96..f5b580cd 100644 --- a/tests/unit/dns/rackspace/test_driver.py +++ b/tests/unit/dns/rackspace/test_driver.py @@ -16,7 +16,7 @@ """Unittests for Rackspace DNS Provider implementation.""" import mock -from oslo.config import cfg +from oslo_config import cfg import pyrax from poppy.dns.rackspace import driver diff --git a/tests/unit/dns/rackspace/test_services.py b/tests/unit/dns/rackspace/test_services.py index c7ca7994..c4be8a02 100644 --- a/tests/unit/dns/rackspace/test_services.py +++ b/tests/unit/dns/rackspace/test_services.py @@ -17,7 +17,7 @@ import uuid import ddt import mock -from oslo.config import cfg +from oslo_config import cfg import pyrax.exceptions as exc from poppy.dns.rackspace import driver diff --git a/tests/unit/manager/default/test_driver.py b/tests/unit/manager/default/test_driver.py index ba86eac7..293838ed 100644 --- a/tests/unit/manager/default/test_driver.py +++ b/tests/unit/manager/default/test_driver.py @@ -15,7 +15,7 @@ import os -from oslo.config import cfg +from oslo_config import cfg from poppy import bootstrap from poppy.manager.default import flavors diff --git a/tests/unit/manager/default/test_flavors.py b/tests/unit/manager/default/test_flavors.py index 3d4dd440..81469415 100644 --- a/tests/unit/manager/default/test_flavors.py +++ b/tests/unit/manager/default/test_flavors.py @@ -17,7 +17,7 @@ import os import uuid import mock -from oslo.config import cfg +from oslo_config import cfg from poppy.manager.default import driver from poppy.manager.default import flavors diff --git a/tests/unit/manager/default/test_services.py b/tests/unit/manager/default/test_services.py index edc90330..5f482061 100644 --- a/tests/unit/manager/default/test_services.py +++ b/tests/unit/manager/default/test_services.py @@ -19,7 +19,7 @@ import uuid import ddt import mock -from oslo.config import cfg +from oslo_config import cfg import requests from poppy.distributed_task.taskflow.task import common diff --git a/tests/unit/provider/akamai/test_driver.py b/tests/unit/provider/akamai/test_driver.py index 8fe3f57c..71b135a9 100644 --- a/tests/unit/provider/akamai/test_driver.py +++ b/tests/unit/provider/akamai/test_driver.py @@ -17,7 +17,7 @@ import random import ddt import mock -from oslo.config import cfg +from oslo_config import cfg from poppy.provider.akamai import driver from tests.unit import base diff --git a/tests/unit/provider/cloudfront/test_driver.py b/tests/unit/provider/cloudfront/test_driver.py index 1cbb7fd5..f019487f 100644 --- a/tests/unit/provider/cloudfront/test_driver.py +++ b/tests/unit/provider/cloudfront/test_driver.py @@ -16,7 +16,7 @@ import boto import mock -from oslo.config import cfg +from oslo_config import cfg from poppy.common import util from poppy.provider.cloudfront import driver diff --git a/tests/unit/provider/fastly/test_driver.py b/tests/unit/provider/fastly/test_driver.py index 6b74d537..bb1fe97d 100644 --- a/tests/unit/provider/fastly/test_driver.py +++ b/tests/unit/provider/fastly/test_driver.py @@ -15,7 +15,7 @@ import fastly import mock -from oslo.config import cfg +from oslo_config import cfg from poppy.common import util from poppy.provider.fastly import driver diff --git a/tests/unit/provider/maxcdn/test_driver.py b/tests/unit/provider/maxcdn/test_driver.py index 76fee2b0..f978f14d 100644 --- a/tests/unit/provider/maxcdn/test_driver.py +++ b/tests/unit/provider/maxcdn/test_driver.py @@ -16,7 +16,7 @@ import os import mock -from oslo.config import cfg +from oslo_config import cfg from poppy.common import util from poppy.provider.maxcdn import driver diff --git a/tests/unit/provider/maxcdn/test_services.py b/tests/unit/provider/maxcdn/test_services.py index c41a3770..ebc86bfa 100644 --- a/tests/unit/provider/maxcdn/test_services.py +++ b/tests/unit/provider/maxcdn/test_services.py @@ -18,7 +18,7 @@ import uuid import ddt import mock -from oslo.config import cfg +from oslo_config import cfg from poppy.provider.maxcdn import driver from poppy.provider.maxcdn import services diff --git a/tests/unit/provider/mock/test_mock_driver.py b/tests/unit/provider/mock/test_mock_driver.py index 62e9ffae..57d489db 100644 --- a/tests/unit/provider/mock/test_mock_driver.py +++ b/tests/unit/provider/mock/test_mock_driver.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg from poppy.provider.mock import driver from tests.unit import base diff --git a/tests/unit/storage/cassandra/test_driver.py b/tests/unit/storage/cassandra/test_driver.py index 322773dd..5af8acac 100644 --- a/tests/unit/storage/cassandra/test_driver.py +++ b/tests/unit/storage/cassandra/test_driver.py @@ -17,7 +17,7 @@ import ssl import cassandra import mock -from oslo.config import cfg +from oslo_config import cfg from poppy.storage.cassandra import driver from poppy.storage.cassandra import flavors diff --git a/tests/unit/storage/cassandra/test_flavors.py b/tests/unit/storage/cassandra/test_flavors.py index d2e6df4b..f0bf2e00 100644 --- a/tests/unit/storage/cassandra/test_flavors.py +++ b/tests/unit/storage/cassandra/test_flavors.py @@ -18,7 +18,7 @@ import uuid import cassandra import ddt import mock -from oslo.config import cfg +from oslo_config import cfg from poppy.model import flavor as model_flavor from poppy.storage.cassandra import driver diff --git a/tests/unit/storage/cassandra/test_services.py b/tests/unit/storage/cassandra/test_services.py index 1674f848..991d4931 100644 --- a/tests/unit/storage/cassandra/test_services.py +++ b/tests/unit/storage/cassandra/test_services.py @@ -23,7 +23,7 @@ except ImportError: # pragma: no cover import cassandra import ddt import mock -from oslo.config import cfg +from oslo_config import cfg from poppy.model.helpers import provider_details from poppy.storage.cassandra import driver diff --git a/tests/unit/storage/mockdb/test_driver.py b/tests/unit/storage/mockdb/test_driver.py index 02e31027..d508074f 100644 --- a/tests/unit/storage/mockdb/test_driver.py +++ b/tests/unit/storage/mockdb/test_driver.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.config import cfg +from oslo_config import cfg from poppy.storage.mockdb import driver from tests.unit import base diff --git a/tests/unit/storage/mockdb/test_flavors.py b/tests/unit/storage/mockdb/test_flavors.py index dbf9f56c..695f2115 100644 --- a/tests/unit/storage/mockdb/test_flavors.py +++ b/tests/unit/storage/mockdb/test_flavors.py @@ -17,7 +17,7 @@ import uuid import ddt import mock -from oslo.config import cfg +from oslo_config import cfg from poppy.storage.mockdb import driver from poppy.storage.mockdb import flavors diff --git a/tests/unit/storage/mockdb/test_services.py b/tests/unit/storage/mockdb/test_services.py index 0a79cbb1..6275402b 100644 --- a/tests/unit/storage/mockdb/test_services.py +++ b/tests/unit/storage/mockdb/test_services.py @@ -15,7 +15,7 @@ import uuid -from oslo.config import cfg +from oslo_config import cfg from poppy.storage.mockdb import driver from poppy.storage.mockdb import services diff --git a/tests/unit/test_bootstrap.py b/tests/unit/test_bootstrap.py index 170d1b68..bf00fdc4 100644 --- a/tests/unit/test_bootstrap.py +++ b/tests/unit/test_bootstrap.py @@ -16,7 +16,7 @@ import os import mock -from oslo.config import cfg +from oslo_config import cfg from poppy import bootstrap from tests.unit import base diff --git a/tests/unit/transport/pecan/test_driver.py b/tests/unit/transport/pecan/test_driver.py index 808a8356..1cba29bb 100644 --- a/tests/unit/transport/pecan/test_driver.py +++ b/tests/unit/transport/pecan/test_driver.py @@ -16,7 +16,7 @@ # import os # import mock -# from oslo.config import cfg +# from oslo_config import cfg # from poppy.transport import pecan # from tests.unit import base