From 8a3fc3a8dd55d71068d1ea13f7dbadb53cb2426c Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Tue, 20 Jan 2015 13:42:10 +0000 Subject: [PATCH] Move oslo libraries out of the oslo namespace The oslo libraries have moved out of the oslo namespace. Change-Id: I4298cd9f760b310a01cd3852793bc6fbaa11907e Related-to: blueprint drop-namespace-packages --- tests/functional/wsgi/test_version.py | 2 +- tests/unit/common/test_decorators.py | 2 +- tests/unit/storage/test_impl_mongodb.py | 2 +- tests/unit/storage/test_impl_redis.py | 4 ++-- tests/unit/storage/test_pool_catalog.py | 2 +- tests/unit/storage/test_pool_queues.py | 2 +- tests/unit/transport/test_auth.py | 2 +- tests/unit/transport/wsgi/test_v1_1.py | 2 +- tests/unit/transport/wsgi/test_v2_0.py | 2 +- zaqar/bench/config.py | 2 +- zaqar/bootstrap.py | 2 +- zaqar/cmd/gc.py | 2 +- zaqar/cmd/server.py | 2 +- zaqar/common/decorators.py | 4 ++-- zaqar/common/utils.py | 8 ++++---- zaqar/i18n.py | 2 +- zaqar/openstack/common/cache/cache.py | 4 ++-- zaqar/openstack/common/config/generator.py | 6 +++--- zaqar/openstack/common/gettextutils.py | 6 +++--- zaqar/openstack/common/lockutils.py | 2 +- zaqar/openstack/common/log.py | 8 ++++---- zaqar/storage/base.py | 8 ++++---- zaqar/storage/mongodb/claims.py | 2 +- zaqar/storage/mongodb/messages.py | 2 +- zaqar/storage/mongodb/options.py | 4 ++-- zaqar/storage/mongodb/queues.py | 2 +- zaqar/storage/mongodb/subscriptions.py | 2 +- zaqar/storage/mongodb/utils.py | 2 +- zaqar/storage/pipeline.py | 2 +- zaqar/storage/pooling.py | 2 +- zaqar/storage/redis/claims.py | 2 +- zaqar/storage/redis/messages.py | 4 ++-- zaqar/storage/redis/models.py | 4 ++-- zaqar/storage/redis/options.py | 2 +- zaqar/storage/redis/queues.py | 2 +- zaqar/storage/redis/utils.py | 2 +- zaqar/storage/sqlalchemy/claims.py | 2 +- zaqar/storage/sqlalchemy/messages.py | 2 +- zaqar/storage/sqlalchemy/options.py | 2 +- zaqar/storage/sqlalchemy/tables.py | 2 +- zaqar/storage/sqlalchemy/utils.py | 4 ++-- zaqar/storage/utils.py | 6 +++--- zaqar/tests/base.py | 2 +- zaqar/tests/functional/base.py | 2 +- zaqar/tests/functional/config.py | 2 +- zaqar/tests/functional/http.py | 2 +- zaqar/tests/unit/storage/base.py | 4 ++-- zaqar/tests/unit/transport/wsgi/base.py | 2 +- zaqar/tests/unit/transport/wsgi/v1/test_claims.py | 4 ++-- zaqar/tests/unit/transport/wsgi/v1/test_default_limits.py | 2 +- zaqar/tests/unit/transport/wsgi/v1/test_home.py | 2 +- zaqar/tests/unit/transport/wsgi/v1/test_messages.py | 4 ++-- zaqar/tests/unit/transport/wsgi/v1/test_pools.py | 2 +- .../tests/unit/transport/wsgi/v1/test_queue_lifecycle.py | 2 +- zaqar/tests/unit/transport/wsgi/v1_1/test_claims.py | 4 ++-- .../tests/unit/transport/wsgi/v1_1/test_default_limits.py | 2 +- zaqar/tests/unit/transport/wsgi/v1_1/test_flavors.py | 2 +- zaqar/tests/unit/transport/wsgi/v1_1/test_health.py | 2 +- zaqar/tests/unit/transport/wsgi/v1_1/test_home.py | 2 +- zaqar/tests/unit/transport/wsgi/v1_1/test_messages.py | 4 ++-- zaqar/tests/unit/transport/wsgi/v1_1/test_pools.py | 2 +- .../unit/transport/wsgi/v1_1/test_queue_lifecycle.py | 2 +- zaqar/tests/unit/transport/wsgi/v2_0/test_claims.py | 4 ++-- .../tests/unit/transport/wsgi/v2_0/test_default_limits.py | 2 +- zaqar/tests/unit/transport/wsgi/v2_0/test_flavors.py | 2 +- zaqar/tests/unit/transport/wsgi/v2_0/test_health.py | 2 +- zaqar/tests/unit/transport/wsgi/v2_0/test_home.py | 2 +- zaqar/tests/unit/transport/wsgi/v2_0/test_messages.py | 4 ++-- zaqar/tests/unit/transport/wsgi/v2_0/test_pools.py | 2 +- .../unit/transport/wsgi/v2_0/test_queue_lifecycle.py | 2 +- zaqar/transport/base.py | 4 ++-- zaqar/transport/utils.py | 2 +- zaqar/transport/validation.py | 2 +- zaqar/transport/wsgi/app.py | 2 +- zaqar/transport/wsgi/driver.py | 2 +- 75 files changed, 105 insertions(+), 105 deletions(-) diff --git a/tests/functional/wsgi/test_version.py b/tests/functional/wsgi/test_version.py index 13e944c78..afd750ae9 100644 --- a/tests/functional/wsgi/test_version.py +++ b/tests/functional/wsgi/test_version.py @@ -14,7 +14,7 @@ # limitations under the License. import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from zaqar.tests.unit.transport.wsgi import base diff --git a/tests/unit/common/test_decorators.py b/tests/unit/common/test_decorators.py index 6b5aeb0d6..43f3bc168 100644 --- a/tests/unit/common/test_decorators.py +++ b/tests/unit/common/test_decorators.py @@ -14,7 +14,7 @@ # limitations under the License. import msgpack -from oslo.config import cfg +from oslo_config import cfg from zaqar.common import decorators from zaqar.openstack.common.cache import cache as oslo_cache diff --git a/tests/unit/storage/test_impl_mongodb.py b/tests/unit/storage/test_impl_mongodb.py index 2da51fbc5..8a59164a1 100644 --- a/tests/unit/storage/test_impl_mongodb.py +++ b/tests/unit/storage/test_impl_mongodb.py @@ -19,7 +19,7 @@ import time import uuid import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from pymongo import cursor import pymongo.errors import six diff --git a/tests/unit/storage/test_impl_redis.py b/tests/unit/storage/test_impl_redis.py index 2d3719d3a..a554591c4 100644 --- a/tests/unit/storage/test_impl_redis.py +++ b/tests/unit/storage/test_impl_redis.py @@ -17,7 +17,7 @@ import time import uuid import mock -from oslo.utils import timeutils +from oslo_utils import timeutils import redis from zaqar.common import errors @@ -390,7 +390,7 @@ class RedisClaimsTest(base.ClaimControllerTest): client_uuid=str(uuid.uuid4())) now = timeutils.utcnow_ts() - timeutils_utcnow = 'oslo.utils.timeutils.utcnow_ts' + timeutils_utcnow = 'oslo_utils.timeutils.utcnow_ts' # Test a single claim with mock.patch(timeutils_utcnow) as mock_utcnow: diff --git a/tests/unit/storage/test_pool_catalog.py b/tests/unit/storage/test_pool_catalog.py index ab9820afc..e4b334975 100644 --- a/tests/unit/storage/test_pool_catalog.py +++ b/tests/unit/storage/test_pool_catalog.py @@ -14,7 +14,7 @@ import uuid -from oslo.config import cfg +from oslo_config import cfg from zaqar.openstack.common.cache import cache as oslo_cache from zaqar.storage import errors diff --git a/tests/unit/storage/test_pool_queues.py b/tests/unit/storage/test_pool_queues.py index 0c961983b..fbcf90bbb 100644 --- a/tests/unit/storage/test_pool_queues.py +++ b/tests/unit/storage/test_pool_queues.py @@ -15,7 +15,7 @@ import random import uuid -from oslo.config import cfg +from oslo_config import cfg import six from zaqar.openstack.common.cache import cache as oslo_cache diff --git a/tests/unit/transport/test_auth.py b/tests/unit/transport/test_auth.py index 3ae031c0a..c990c5b7b 100644 --- a/tests/unit/transport/test_auth.py +++ b/tests/unit/transport/test_auth.py @@ -15,7 +15,7 @@ """Test Auth.""" -from oslo.config import cfg +from oslo_config import cfg from zaqar import tests as testing from zaqar.transport import auth diff --git a/tests/unit/transport/wsgi/test_v1_1.py b/tests/unit/transport/wsgi/test_v1_1.py index 61f2b7c87..3e6f8e2e6 100644 --- a/tests/unit/transport/wsgi/test_v1_1.py +++ b/tests/unit/transport/wsgi/test_v1_1.py @@ -15,7 +15,7 @@ import uuid import ddt import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from zaqar.tests.unit.transport.wsgi import base from zaqar.tests.unit.transport.wsgi import v1_1 diff --git a/tests/unit/transport/wsgi/test_v2_0.py b/tests/unit/transport/wsgi/test_v2_0.py index 9afcc1820..0ae928396 100644 --- a/tests/unit/transport/wsgi/test_v2_0.py +++ b/tests/unit/transport/wsgi/test_v2_0.py @@ -15,7 +15,7 @@ import uuid import ddt import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from zaqar.tests.unit.transport.wsgi import base from zaqar.tests.unit.transport.wsgi import v2_0 diff --git a/zaqar/bench/config.py b/zaqar/bench/config.py index e2f7fc76a..b3a476d0d 100644 --- a/zaqar/bench/config.py +++ b/zaqar/bench/config.py @@ -12,7 +12,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 conf = cfg.CONF _CLI_OPTIONS = ( diff --git a/zaqar/bootstrap.py b/zaqar/bootstrap.py index f0a1f0ee9..7973df6ad 100644 --- a/zaqar/bootstrap.py +++ b/zaqar/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 zaqar.common import decorators diff --git a/zaqar/cmd/gc.py b/zaqar/cmd/gc.py index bcb9b3033..0bc08f12a 100644 --- a/zaqar/cmd/gc.py +++ b/zaqar/cmd/gc.py @@ -11,7 +11,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 zaqar import bootstrap from zaqar.common import cli diff --git a/zaqar/cmd/server.py b/zaqar/cmd/server.py index 158423b60..ff5812a66 100644 --- a/zaqar/cmd/server.py +++ b/zaqar/cmd/server.py @@ -14,7 +14,7 @@ # limitations under the License. import os -from oslo.config import cfg +from oslo_config import cfg from zaqar import bootstrap from zaqar.common import cli diff --git a/zaqar/common/decorators.py b/zaqar/common/decorators.py index 7772299ce..1322d6197 100644 --- a/zaqar/common/decorators.py +++ b/zaqar/common/decorators.py @@ -47,10 +47,10 @@ def memoized_getattr(meth): def caches(keygen, ttl, cond=None): - """Flags a getter method as being cached using oslo.cache. + """Flags a getter method as being cached using oslo_cache. It is assumed that the containing class defines an attribute - named `_cache` that is an instance of an oslo.cache backend. + named `_cache` that is an instance of an oslo_cache backend. The getter should raise an exception if the value can't be loaded, which will skip the caching step. Otherwise, the diff --git a/zaqar/common/utils.py b/zaqar/common/utils.py index 26ec5e104..748c94bc1 100644 --- a/zaqar/common/utils.py +++ b/zaqar/common/utils.py @@ -15,7 +15,7 @@ """utils: general-purpose utilities.""" -from oslo.config import cfg +from oslo_config import cfg import six @@ -52,12 +52,12 @@ _pytype_to_cfgtype = { def dict_to_conf(options): - """Converts a python dictionary to a list of oslo.config.cfg.Opt + """Converts a python dictionary to a list of oslo_config.cfg.Opt :param options: The python dictionary to convert :type options: dict - :returns: a list of options compatible with oslo.config - :rtype: [oslo.config.cfg.Opt] + :returns: a list of options compatible with oslo_config + :rtype: [oslo_config.cfg.Opt] """ opts = [] diff --git a/zaqar/i18n.py b/zaqar/i18n.py index 60bf2d340..d49e9cd3b 100644 --- a/zaqar/i18n.py +++ b/zaqar/i18n.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.i18n import * # noqa +from oslo_i18n import * # noqa _translators = TranslatorFactory(domain='zaqar') diff --git a/zaqar/openstack/common/cache/cache.py b/zaqar/openstack/common/cache/cache.py index 941b27b6a..3f0412d5a 100644 --- a/zaqar/openstack/common/cache/cache.py +++ b/zaqar/openstack/common/cache/cache.py @@ -25,13 +25,13 @@ from stevedore import driver def _get_olso_configs(): - """Returns the oslo.config options to register.""" + """Returns the oslo_config options to register.""" # NOTE(flaper87): Oslo config should be # optional. Instead of doing try / except # at the top of this file, lets import cfg # here and assume that the caller of this # function already took care of this dependency. - from oslo.config import cfg + from oslo_config import cfg return [ cfg.StrOpt('cache_url', default='memory://', diff --git a/zaqar/openstack/common/config/generator.py b/zaqar/openstack/common/config/generator.py index 34ac86434..22c410abd 100644 --- a/zaqar/openstack/common/config/generator.py +++ b/zaqar/openstack/common/config/generator.py @@ -27,7 +27,7 @@ import socket import sys import textwrap -from oslo.config import cfg +from oslo_config import cfg import six import stevedore.named @@ -108,7 +108,7 @@ def generate(argv): # and the list of Opt instances for that group. if parsed_args.libraries: loader = stevedore.named.NamedExtensionManager( - 'oslo.config.opts', + 'oslo_config.opts', names=list(set(parsed_args.libraries)), invoke_on_load=False, on_load_failure_callback=raise_extension_exception @@ -153,7 +153,7 @@ def _is_in_group(opt, group): """Check if opt is in group.""" for value in group._opts.values(): # NOTE(llu): Temporary workaround for bug #1262148, wait until - # newly released oslo.config support '==' operator. + # newly released oslo_config support '==' operator. if not(value['opt'] != opt): return True return False diff --git a/zaqar/openstack/common/gettextutils.py b/zaqar/openstack/common/gettextutils.py index 0c540b588..88c6753f8 100644 --- a/zaqar/openstack/common/gettextutils.py +++ b/zaqar/openstack/common/gettextutils.py @@ -33,7 +33,7 @@ import six _AVAILABLE_LANGUAGES = {} -# FIXME(dhellmann): Remove this when moving to oslo.i18n. +# FIXME(dhellmann): Remove this when moving to oslo_i18n. USE_LAZY = False @@ -81,7 +81,7 @@ class TranslatorFactory(object): m = t.gettext if six.PY3 else t.ugettext def f(msg): - """oslo.i18n.gettextutils translation function.""" + """oslo_i18n.gettextutils translation function.""" if USE_LAZY: return Message(msg, domain=domain) return m(msg) @@ -117,7 +117,7 @@ class TranslatorFactory(object): # NOTE(dhellmann): When this module moves out of the incubator into -# oslo.i18n, these global variables can be moved to an integration +# oslo_i18n, these global variables can be moved to an integration # module within each application. # Create the global translation functions. diff --git a/zaqar/openstack/common/lockutils.py b/zaqar/openstack/common/lockutils.py index cc75ec611..3a6fc37a3 100644 --- a/zaqar/openstack/common/lockutils.py +++ b/zaqar/openstack/common/lockutils.py @@ -26,7 +26,7 @@ import threading import time import weakref -from oslo.config import cfg +from oslo_config import cfg from zaqar.openstack.common import fileutils from zaqar.openstack.common.gettextutils import _, _LE, _LI diff --git a/zaqar/openstack/common/log.py b/zaqar/openstack/common/log.py index 873d260a2..1f07be2f4 100644 --- a/zaqar/openstack/common/log.py +++ b/zaqar/openstack/common/log.py @@ -36,8 +36,8 @@ import os import sys import traceback -from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_config import cfg +from oslo_serialization import jsonutils 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'] @@ -517,7 +517,7 @@ def _setup_logging_from_conf(project, version): logging.ERROR) except ImportError: handler = importutils.import_object( - "oslo.messaging.notify.log_handler.PublishErrorsHandler", + "oslo_messaging.notify.log_handler.PublishErrorsHandler", logging.ERROR) log_root.addHandler(handler) diff --git a/zaqar/storage/base.py b/zaqar/storage/base.py index 989be47f4..d6da2e235 100644 --- a/zaqar/storage/base.py +++ b/zaqar/storage/base.py @@ -22,7 +22,7 @@ import time import uuid import enum -from oslo.config import cfg +from oslo_config import cfg import six import zaqar.openstack.common.log as logging @@ -53,7 +53,7 @@ class DriverBase(object): """Base class for both data and control plane drivers :param conf: Configuration containing options for this driver. - :type conf: `oslo.config.ConfigOpts` + :type conf: `oslo_config.ConfigOpts` :param cache: Cache instance to use for reducing latency for certain lookups. :type cache: `zaqar.openstack.common.cache.backends.BaseCache` @@ -85,7 +85,7 @@ class DataDriverBase(DriverBase): loaded from the config file or the pool catalog. :param conf: Configuration containing options for this driver. - :type conf: `oslo.config.ConfigOpts` + :type conf: `oslo_config.ConfigOpts` :param cache: Cache instance to use for reducing latency for certain lookups. :type cache: `zaqar.openstack.common.cache.backends.BaseCache` @@ -242,7 +242,7 @@ class ControlDriverBase(DriverBase): pool controller. :param conf: Configuration containing options for this driver. - :type conf: `oslo.config.ConfigOpts` + :type conf: `oslo_config.ConfigOpts` :param cache: Cache instance to use for reducing latency for certain lookups. :type cache: `zaqar.openstack.common.cache.backends.BaseCache` diff --git a/zaqar/storage/mongodb/claims.py b/zaqar/storage/mongodb/claims.py index fde6d82f9..e4c167e84 100644 --- a/zaqar/storage/mongodb/claims.py +++ b/zaqar/storage/mongodb/claims.py @@ -24,7 +24,7 @@ Field Mappings: import datetime from bson import objectid -from oslo.utils import timeutils +from oslo_utils import timeutils import zaqar.openstack.common.log as logging from zaqar import storage diff --git a/zaqar/storage/mongodb/messages.py b/zaqar/storage/mongodb/messages.py index aa4600314..5aef7fa4e 100644 --- a/zaqar/storage/mongodb/messages.py +++ b/zaqar/storage/mongodb/messages.py @@ -25,7 +25,7 @@ import datetime import time from bson import objectid -from oslo.utils import timeutils +from oslo_utils import timeutils import pymongo.errors import pymongo.read_preferences diff --git a/zaqar/storage/mongodb/options.py b/zaqar/storage/mongodb/options.py index 8f13698a1..17eca85c1 100644 --- a/zaqar/storage/mongodb/options.py +++ b/zaqar/storage/mongodb/options.py @@ -14,7 +14,7 @@ """MongoDB storage driver configuration options.""" -from oslo.config import cfg +from oslo_config import cfg _deprecated_group = 'drivers:storage:mongodb' @@ -140,7 +140,7 @@ MESSAGE_MONGODB_GROUP = 'drivers:message_store:mongodb' def _config_options(): """Used by config generators. - Returns a list of (group-name, oslo.config-options) tuples + Returns a list of (group-name, oslo_config-options) tuples for management and message storage. """ return [(MANAGEMENT_MONGODB_GROUP, MANAGEMENT_MONGODB_OPTIONS), diff --git a/zaqar/storage/mongodb/queues.py b/zaqar/storage/mongodb/queues.py index ef74b3a9e..69d15444c 100644 --- a/zaqar/storage/mongodb/queues.py +++ b/zaqar/storage/mongodb/queues.py @@ -21,7 +21,7 @@ Field Mappings: letter of their long name. """ -from oslo.utils import timeutils +from oslo_utils import timeutils import pymongo.errors from zaqar.common import decorators diff --git a/zaqar/storage/mongodb/subscriptions.py b/zaqar/storage/mongodb/subscriptions.py index 915eb3e98..6ed3eaa56 100644 --- a/zaqar/storage/mongodb/subscriptions.py +++ b/zaqar/storage/mongodb/subscriptions.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -from oslo.utils import timeutils +from oslo_utils import timeutils import pymongo.errors from zaqar.common import utils as common_utils diff --git a/zaqar/storage/mongodb/utils.py b/zaqar/storage/mongodb/utils.py index 784c91515..96c21ef32 100644 --- a/zaqar/storage/mongodb/utils.py +++ b/zaqar/storage/mongodb/utils.py @@ -24,7 +24,7 @@ import time from bson import errors as berrors from bson import objectid from bson import tz_util -from oslo.utils import timeutils +from oslo_utils import timeutils from pymongo import errors from zaqar.i18n import _ diff --git a/zaqar/storage/pipeline.py b/zaqar/storage/pipeline.py index 6cdbf2835..4877217b9 100644 --- a/zaqar/storage/pipeline.py +++ b/zaqar/storage/pipeline.py @@ -12,7 +12,7 @@ # 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 zaqar import common diff --git a/zaqar/storage/pooling.py b/zaqar/storage/pooling.py index 49d611587..9b9b59d14 100644 --- a/zaqar/storage/pooling.py +++ b/zaqar/storage/pooling.py @@ -16,7 +16,7 @@ import heapq import itertools -from oslo.config import cfg +from oslo_config import cfg from zaqar.common import decorators from zaqar.common.storage import select diff --git a/zaqar/storage/redis/claims.py b/zaqar/storage/redis/claims.py index 25503d226..f52f0b92a 100644 --- a/zaqar/storage/redis/claims.py +++ b/zaqar/storage/redis/claims.py @@ -15,7 +15,7 @@ import functools import msgpack -from oslo.utils import timeutils +from oslo_utils import timeutils from zaqar.common import decorators from zaqar.openstack.common import log as logging diff --git a/zaqar/storage/redis/messages.py b/zaqar/storage/redis/messages.py index 42b524a6f..094fa6816 100644 --- a/zaqar/storage/redis/messages.py +++ b/zaqar/storage/redis/messages.py @@ -15,8 +15,8 @@ import functools import uuid -from oslo.utils import encodeutils -from oslo.utils import timeutils +from oslo_utils import encodeutils +from oslo_utils import timeutils from zaqar.common import decorators from zaqar import storage diff --git a/zaqar/storage/redis/models.py b/zaqar/storage/redis/models.py index b33bd85b3..afc58dbd0 100644 --- a/zaqar/storage/redis/models.py +++ b/zaqar/storage/redis/models.py @@ -16,8 +16,8 @@ import functools import uuid import msgpack -from oslo.utils import encodeutils -from oslo.utils import timeutils +from oslo_utils import encodeutils +from oslo_utils import timeutils MSGENV_FIELD_KEYS = (b'id', b't', b'cr', b'e', b'u', b'c', b'c.e') diff --git a/zaqar/storage/redis/options.py b/zaqar/storage/redis/options.py index f4360f0c5..fff990807 100644 --- a/zaqar/storage/redis/options.py +++ b/zaqar/storage/redis/options.py @@ -14,7 +14,7 @@ """Redis storage driver configuration options.""" -from oslo.config import cfg +from oslo_config import cfg _deprecated_group = 'drivers:storage:redis' # options common to management and message storage diff --git a/zaqar/storage/redis/queues.py b/zaqar/storage/redis/queues.py index b03b17931..5842f3a33 100644 --- a/zaqar/storage/redis/queues.py +++ b/zaqar/storage/redis/queues.py @@ -15,7 +15,7 @@ import functools import msgpack -from oslo.utils import timeutils +from oslo_utils import timeutils import redis from zaqar.common import decorators diff --git a/zaqar/storage/redis/utils.py b/zaqar/storage/redis/utils.py index 5d19ec590..45081c45d 100644 --- a/zaqar/storage/redis/utils.py +++ b/zaqar/storage/redis/utils.py @@ -17,7 +17,7 @@ import sys import time import uuid -from oslo.utils import encodeutils +from oslo_utils import encodeutils import redis import six diff --git a/zaqar/storage/sqlalchemy/claims.py b/zaqar/storage/sqlalchemy/claims.py index 2d1b92734..bab1f07fb 100644 --- a/zaqar/storage/sqlalchemy/claims.py +++ b/zaqar/storage/sqlalchemy/claims.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo.utils import timeutils +from oslo_utils import timeutils import sqlalchemy as sa from sqlalchemy.sql import func as sfunc diff --git a/zaqar/storage/sqlalchemy/messages.py b/zaqar/storage/sqlalchemy/messages.py index c6eb916a5..7cf7adcc8 100644 --- a/zaqar/storage/sqlalchemy/messages.py +++ b/zaqar/storage/sqlalchemy/messages.py @@ -15,7 +15,7 @@ import calendar -from oslo.utils import timeutils +from oslo_utils import timeutils import sqlalchemy as sa from sqlalchemy.sql import func as sfunc diff --git a/zaqar/storage/sqlalchemy/options.py b/zaqar/storage/sqlalchemy/options.py index 8cc4e2fcd..e86eed6d0 100644 --- a/zaqar/storage/sqlalchemy/options.py +++ b/zaqar/storage/sqlalchemy/options.py @@ -14,7 +14,7 @@ """SQLAlchemy storage driver implementation.""" -from oslo.config import cfg +from oslo_config import cfg _deprecated_group = 'drivers:storage:sqlalchemy' _COMMON_SQLALCHEMY_OPTIONS = ( diff --git a/zaqar/storage/sqlalchemy/tables.py b/zaqar/storage/sqlalchemy/tables.py index 48fc3684f..2f000dfde 100644 --- a/zaqar/storage/sqlalchemy/tables.py +++ b/zaqar/storage/sqlalchemy/tables.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -from oslo.utils import timeutils +from oslo_utils import timeutils import sqlalchemy as sa metadata = sa.MetaData() diff --git a/zaqar/storage/sqlalchemy/utils.py b/zaqar/storage/sqlalchemy/utils.py index 1dcf0e7ad..1d33984e5 100644 --- a/zaqar/storage/sqlalchemy/utils.py +++ b/zaqar/storage/sqlalchemy/utils.py @@ -15,8 +15,8 @@ import functools -from oslo.serialization import jsonutils -from oslo.utils import encodeutils +from oslo_serialization import jsonutils +from oslo_utils import encodeutils import sqlalchemy as sa from sqlalchemy import exc from sqlalchemy.sql import func as sfunc diff --git a/zaqar/storage/utils.py b/zaqar/storage/utils.py index 5aaa16951..c62be60c3 100644 --- a/zaqar/storage/utils.py +++ b/zaqar/storage/utils.py @@ -14,7 +14,7 @@ import copy -from oslo.config import cfg +from oslo_config import cfg import six from stevedore import driver @@ -33,10 +33,10 @@ def dynamic_conf(uri, options, conf=None): :param options: additional pool metadata :type options: dict :param conf: Optional conf object to copy - :type conf: `oslo.config.cfg.ConfigOpts` + :type conf: `oslo_config.cfg.ConfigOpts` :returns: Configuration object suitable for constructing storage drivers - :rtype: oslo.config.cfg.ConfigOpts + :rtype: oslo_config.cfg.ConfigOpts """ storage_type = six.moves.urllib_parse.urlparse(uri).scheme diff --git a/zaqar/tests/base.py b/zaqar/tests/base.py index 716baa747..8f01551ae 100644 --- a/zaqar/tests/base.py +++ b/zaqar/tests/base.py @@ -16,7 +16,7 @@ import os import fixtures -from oslo.config import cfg +from oslo_config import cfg import six import testtools diff --git a/zaqar/tests/functional/base.py b/zaqar/tests/functional/base.py index abf71111c..3ceab96b8 100644 --- a/zaqar/tests/functional/base.py +++ b/zaqar/tests/functional/base.py @@ -19,7 +19,7 @@ import multiprocessing import os import jsonschema -from oslo.utils import timeutils +from oslo_utils import timeutils import six from zaqar.api.v1 import response as response_v1 diff --git a/zaqar/tests/functional/config.py b/zaqar/tests/functional/config.py index f145c70c1..a0ee9ebf5 100644 --- a/zaqar/tests/functional/config.py +++ b/zaqar/tests/functional/config.py @@ -15,7 +15,7 @@ import os -from oslo.config import cfg +from oslo_config import cfg _DEFAULT = ( diff --git a/zaqar/tests/functional/http.py b/zaqar/tests/functional/http.py index be8ca149b..9bff7574c 100755 --- a/zaqar/tests/functional/http.py +++ b/zaqar/tests/functional/http.py @@ -17,7 +17,7 @@ import functools import json from falcon import testing as ftest -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests import six diff --git a/zaqar/tests/unit/storage/base.py b/zaqar/tests/unit/storage/base.py index ef405ad24..b529e7a0e 100644 --- a/zaqar/tests/unit/storage/base.py +++ b/zaqar/tests/unit/storage/base.py @@ -21,7 +21,7 @@ import uuid import ddt import mock -from oslo.utils import timeutils +from oslo_utils import timeutils import six from testtools import matchers @@ -897,7 +897,7 @@ class ClaimControllerTest(ControllerBaseTest): project=self.project) now = timeutils.utcnow_ts() - timeutils_utcnow = 'oslo.utils.timeutils.utcnow_ts' + timeutils_utcnow = 'oslo_utils.timeutils.utcnow_ts' with mock.patch(timeutils_utcnow) as mock_utcnow: mock_utcnow.return_value = now + 2 diff --git a/zaqar/tests/unit/transport/wsgi/base.py b/zaqar/tests/unit/transport/wsgi/base.py index 6e07e24fd..5524f83f1 100644 --- a/zaqar/tests/unit/transport/wsgi/base.py +++ b/zaqar/tests/unit/transport/wsgi/base.py @@ -15,7 +15,7 @@ import uuid from falcon import testing as ftest -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from zaqar import bootstrap from zaqar import tests as testing diff --git a/zaqar/tests/unit/transport/wsgi/v1/test_claims.py b/zaqar/tests/unit/transport/wsgi/v1/test_claims.py index 8ea336523..117fa23b7 100644 --- a/zaqar/tests/unit/transport/wsgi/v1/test_claims.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_claims.py @@ -19,8 +19,8 @@ import uuid import ddt import falcon import mock -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_serialization import jsonutils +from oslo_utils import timeutils from testtools import matchers from zaqar import tests as testing diff --git a/zaqar/tests/unit/transport/wsgi/v1/test_default_limits.py b/zaqar/tests/unit/transport/wsgi/v1/test_default_limits.py index e4f75b734..bc73fb615 100644 --- a/zaqar/tests/unit/transport/wsgi/v1/test_default_limits.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_default_limits.py @@ -17,7 +17,7 @@ import contextlib import uuid import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from zaqar import storage from zaqar.tests.unit.transport.wsgi import base diff --git a/zaqar/tests/unit/transport/wsgi/v1/test_home.py b/zaqar/tests/unit/transport/wsgi/v1/test_home.py index 5f128655d..fb2f5c609 100644 --- a/zaqar/tests/unit/transport/wsgi/v1/test_home.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_home.py @@ -13,7 +13,7 @@ # the License. import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six.moves.urllib.parse as urlparse from zaqar.tests.unit.transport.wsgi import base diff --git a/zaqar/tests/unit/transport/wsgi/v1/test_messages.py b/zaqar/tests/unit/transport/wsgi/v1/test_messages.py index 834e76dda..52b7f43cf 100644 --- a/zaqar/tests/unit/transport/wsgi/v1/test_messages.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_messages.py @@ -19,8 +19,8 @@ import uuid import ddt import falcon import mock -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_serialization import jsonutils +from oslo_utils import timeutils import six from testtools import matchers diff --git a/zaqar/tests/unit/transport/wsgi/v1/test_pools.py b/zaqar/tests/unit/transport/wsgi/v1/test_pools.py index 7f1590d29..e20edcc89 100644 --- a/zaqar/tests/unit/transport/wsgi/v1/test_pools.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_pools.py @@ -17,7 +17,7 @@ import uuid import ddt import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from zaqar import tests as testing from zaqar.tests.unit.transport.wsgi import base diff --git a/zaqar/tests/unit/transport/wsgi/v1/test_queue_lifecycle.py b/zaqar/tests/unit/transport/wsgi/v1/test_queue_lifecycle.py index 3a48b0038..39ca4c9bc 100644 --- a/zaqar/tests/unit/transport/wsgi/v1/test_queue_lifecycle.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_queue_lifecycle.py @@ -14,7 +14,7 @@ import ddt import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six from zaqar import tests as testing diff --git a/zaqar/tests/unit/transport/wsgi/v1_1/test_claims.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_claims.py index f3eb0864d..af01488c8 100644 --- a/zaqar/tests/unit/transport/wsgi/v1_1/test_claims.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_claims.py @@ -20,8 +20,8 @@ import uuid import ddt import falcon import mock -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_serialization import jsonutils +from oslo_utils import timeutils from testtools import matchers from zaqar import tests as testing diff --git a/zaqar/tests/unit/transport/wsgi/v1_1/test_default_limits.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_default_limits.py index 188fab05e..1f79b7cbb 100644 --- a/zaqar/tests/unit/transport/wsgi/v1_1/test_default_limits.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_default_limits.py @@ -17,7 +17,7 @@ import contextlib import uuid import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from zaqar import storage from zaqar.tests.unit.transport.wsgi import base diff --git a/zaqar/tests/unit/transport/wsgi/v1_1/test_flavors.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_flavors.py index 7455dc7bb..6ff96f60a 100644 --- a/zaqar/tests/unit/transport/wsgi/v1_1/test_flavors.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_flavors.py @@ -17,7 +17,7 @@ import uuid import ddt import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from zaqar import tests as testing from zaqar.tests.unit.transport.wsgi import base diff --git a/zaqar/tests/unit/transport/wsgi/v1_1/test_health.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_health.py index 05e2e3feb..f07a6442d 100644 --- a/zaqar/tests/unit/transport/wsgi/v1_1/test_health.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_health.py @@ -17,7 +17,7 @@ import ddt import falcon import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from zaqar.storage import errors import zaqar.storage.mongodb as mongo diff --git a/zaqar/tests/unit/transport/wsgi/v1_1/test_home.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_home.py index 5b18a1c45..7e67de944 100644 --- a/zaqar/tests/unit/transport/wsgi/v1_1/test_home.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_home.py @@ -15,7 +15,7 @@ import uuid import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six.moves.urllib.parse as urlparse from zaqar.tests.unit.transport.wsgi import base diff --git a/zaqar/tests/unit/transport/wsgi/v1_1/test_messages.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_messages.py index 5acf1ab1a..fa4cf3fac 100644 --- a/zaqar/tests/unit/transport/wsgi/v1_1/test_messages.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_messages.py @@ -19,8 +19,8 @@ import uuid import ddt import falcon import mock -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_serialization import jsonutils +from oslo_utils import timeutils import six from testtools import matchers diff --git a/zaqar/tests/unit/transport/wsgi/v1_1/test_pools.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_pools.py index 4f008a03c..4ce19ea3d 100644 --- a/zaqar/tests/unit/transport/wsgi/v1_1/test_pools.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_pools.py @@ -17,7 +17,7 @@ import uuid import ddt import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from zaqar import tests as testing from zaqar.tests.unit.transport.wsgi import base diff --git a/zaqar/tests/unit/transport/wsgi/v1_1/test_queue_lifecycle.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_queue_lifecycle.py index 768bc41e4..7cd4ac9f9 100644 --- a/zaqar/tests/unit/transport/wsgi/v1_1/test_queue_lifecycle.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_queue_lifecycle.py @@ -16,7 +16,7 @@ import uuid import ddt import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six from zaqar import tests as testing diff --git a/zaqar/tests/unit/transport/wsgi/v2_0/test_claims.py b/zaqar/tests/unit/transport/wsgi/v2_0/test_claims.py index 145828115..6e75d02e4 100644 --- a/zaqar/tests/unit/transport/wsgi/v2_0/test_claims.py +++ b/zaqar/tests/unit/transport/wsgi/v2_0/test_claims.py @@ -20,8 +20,8 @@ import uuid import ddt import falcon import mock -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_serialization import jsonutils +from oslo_utils import timeutils from testtools import matchers from zaqar import tests as testing diff --git a/zaqar/tests/unit/transport/wsgi/v2_0/test_default_limits.py b/zaqar/tests/unit/transport/wsgi/v2_0/test_default_limits.py index 5ae55c547..1fd54b139 100644 --- a/zaqar/tests/unit/transport/wsgi/v2_0/test_default_limits.py +++ b/zaqar/tests/unit/transport/wsgi/v2_0/test_default_limits.py @@ -17,7 +17,7 @@ import contextlib import uuid import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from zaqar import storage from zaqar.tests.unit.transport.wsgi import base diff --git a/zaqar/tests/unit/transport/wsgi/v2_0/test_flavors.py b/zaqar/tests/unit/transport/wsgi/v2_0/test_flavors.py index 3d9003116..6246b149c 100644 --- a/zaqar/tests/unit/transport/wsgi/v2_0/test_flavors.py +++ b/zaqar/tests/unit/transport/wsgi/v2_0/test_flavors.py @@ -17,7 +17,7 @@ import uuid import ddt import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from zaqar import tests as testing from zaqar.tests.unit.transport.wsgi import base diff --git a/zaqar/tests/unit/transport/wsgi/v2_0/test_health.py b/zaqar/tests/unit/transport/wsgi/v2_0/test_health.py index 05e2e3feb..f07a6442d 100644 --- a/zaqar/tests/unit/transport/wsgi/v2_0/test_health.py +++ b/zaqar/tests/unit/transport/wsgi/v2_0/test_health.py @@ -17,7 +17,7 @@ import ddt import falcon import mock -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from zaqar.storage import errors import zaqar.storage.mongodb as mongo diff --git a/zaqar/tests/unit/transport/wsgi/v2_0/test_home.py b/zaqar/tests/unit/transport/wsgi/v2_0/test_home.py index 8f62830e0..def6b171f 100644 --- a/zaqar/tests/unit/transport/wsgi/v2_0/test_home.py +++ b/zaqar/tests/unit/transport/wsgi/v2_0/test_home.py @@ -15,7 +15,7 @@ import uuid import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six.moves.urllib.parse as urlparse from zaqar.tests.unit.transport.wsgi import base diff --git a/zaqar/tests/unit/transport/wsgi/v2_0/test_messages.py b/zaqar/tests/unit/transport/wsgi/v2_0/test_messages.py index 3a4c1c873..fdaed9d1b 100644 --- a/zaqar/tests/unit/transport/wsgi/v2_0/test_messages.py +++ b/zaqar/tests/unit/transport/wsgi/v2_0/test_messages.py @@ -19,8 +19,8 @@ import uuid import ddt import falcon import mock -from oslo.serialization import jsonutils -from oslo.utils import timeutils +from oslo_serialization import jsonutils +from oslo_utils import timeutils import six from testtools import matchers diff --git a/zaqar/tests/unit/transport/wsgi/v2_0/test_pools.py b/zaqar/tests/unit/transport/wsgi/v2_0/test_pools.py index 081790ad3..d2891cc30 100644 --- a/zaqar/tests/unit/transport/wsgi/v2_0/test_pools.py +++ b/zaqar/tests/unit/transport/wsgi/v2_0/test_pools.py @@ -17,7 +17,7 @@ import uuid import ddt import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from zaqar import tests as testing from zaqar.tests.unit.transport.wsgi import base diff --git a/zaqar/tests/unit/transport/wsgi/v2_0/test_queue_lifecycle.py b/zaqar/tests/unit/transport/wsgi/v2_0/test_queue_lifecycle.py index 6fa528026..487f6cc7f 100644 --- a/zaqar/tests/unit/transport/wsgi/v2_0/test_queue_lifecycle.py +++ b/zaqar/tests/unit/transport/wsgi/v2_0/test_queue_lifecycle.py @@ -16,7 +16,7 @@ import uuid import ddt import falcon -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six from zaqar import tests as testing diff --git a/zaqar/transport/base.py b/zaqar/transport/base.py index 62df6bfb4..d171c1186 100644 --- a/zaqar/transport/base.py +++ b/zaqar/transport/base.py @@ -15,7 +15,7 @@ import abc -from oslo.config import cfg +from oslo_config import cfg import six @@ -69,7 +69,7 @@ class DriverBase(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 :param storage: The storage driver :type storage: zaqar.storage.base.DataDriverBase :param cache: caching object diff --git a/zaqar/transport/utils.py b/zaqar/transport/utils.py index eb687192f..ce69181fc 100644 --- a/zaqar/transport/utils.py +++ b/zaqar/transport/utils.py @@ -15,7 +15,7 @@ import json -from oslo.utils import encodeutils +from oslo_utils import encodeutils class MalformedJSON(ValueError): diff --git a/zaqar/transport/validation.py b/zaqar/transport/validation.py index 09cdbcb7e..585ed9ae2 100644 --- a/zaqar/transport/validation.py +++ b/zaqar/transport/validation.py @@ -15,7 +15,7 @@ import re -from oslo.config import cfg +from oslo_config import cfg from zaqar.i18n import _ diff --git a/zaqar/transport/wsgi/app.py b/zaqar/transport/wsgi/app.py index 589d400ba..312eb8552 100644 --- a/zaqar/transport/wsgi/app.py +++ b/zaqar/transport/wsgi/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 zaqar import bootstrap diff --git a/zaqar/transport/wsgi/driver.py b/zaqar/transport/wsgi/driver.py index 398f440d1..188dec699 100644 --- a/zaqar/transport/wsgi/driver.py +++ b/zaqar/transport/wsgi/driver.py @@ -17,7 +17,7 @@ import functools from wsgiref import simple_server import falcon -from oslo.config import cfg +from oslo_config import cfg from zaqar.common import decorators from zaqar.common.transport.wsgi import helpers