Merge "Move from oslo.config to oslo_config"

This commit is contained in:
Jenkins 2015-01-22 03:43:02 +00:00 committed by Gerrit Code Review
commit 90a9cc3cc8
76 changed files with 82 additions and 82 deletions

View File

@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from oslo_config import cfg
import paste.urlmap
CONF = cfg.CONF

View File

@ -15,7 +15,7 @@
import re
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import excutils
from oslo_utils import units

View File

@ -13,8 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
import webob.exc
from glance.api import policy

View File

@ -19,7 +19,7 @@ and/or Accept headers and attempts to negotiate an API controller to
return
"""
from oslo.config import cfg
from oslo_config import cfg
from glance.api import versions
from glance.common import wsgi

View File

@ -18,7 +18,7 @@
import copy
from oslo.config import cfg
from oslo_config import cfg
from glance.common import exception
import glance.domain.proxy

View File

@ -22,7 +22,7 @@ import copy
import eventlet
import glance_store as store
import glance_store.location
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import excutils
from oslo_utils import strutils
from webob.exc import HTTPBadRequest

View File

@ -14,7 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from oslo_config import cfg
import webob.exc
from glance.api import policy

View File

@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import glance_store as store_api
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import excutils
import webob.exc

View File

@ -16,8 +16,8 @@
import re
import glance_store
from oslo.config import cfg
from oslo.serialization import jsonutils as json
from oslo_config import cfg
from oslo_utils import timeutils
import six
import six.moves.urllib.parse as urlparse

View File

@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
import six
import six.moves.urllib.parse as urlparse
import webob.exc

View File

@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
import six
import webob.exc
from wsme.rest import json

View File

@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
import six
import webob.exc
from wsme.rest import json

View File

@ -17,8 +17,8 @@
import copy
import glance_store
from oslo.config import cfg
import oslo.serialization.jsonutils as json
from oslo_config import cfg
from oslo_utils import timeutils
import six
import six.moves.urllib.parse as urlparse

View File

@ -15,8 +15,8 @@
import httplib
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
import webob.dec
from glance.common import wsgi

View File

@ -14,8 +14,8 @@
# under the License.
import eventlet
from oslo.config import cfg
from oslo_concurrency import lockutils
from oslo_config import cfg
import glance.async
import glance.common.scripts as scripts

View File

@ -41,7 +41,7 @@ if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
sys.path.insert(0, possible_topdir)
import glance_store
from oslo.config import cfg
from oslo_config import cfg
import osprofiler.notifier
import osprofiler.web

View File

@ -39,7 +39,7 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
sys.path.insert(0, possible_topdir)
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import units
from six.moves import xrange

View File

@ -38,8 +38,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
sys.path.insert(0, possible_topdir)
from oslo.config import cfg
from oslo.db.sqlalchemy import migration
from oslo_config import cfg
from oslo_utils import encodeutils
from glance.common import config

View File

@ -37,7 +37,7 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
sys.path.insert(0, possible_topdir)
from oslo.config import cfg
from oslo_config import cfg
import osprofiler.notifier
import osprofiler.web

View File

@ -31,7 +31,7 @@ if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
sys.path.insert(0, possible_topdir)
import glance_store
from oslo.config import cfg
from oslo_config import cfg
from glance.common import config
from glance.openstack.common import log

View File

@ -25,8 +25,8 @@ import logging.handlers
import os
import tempfile
from oslo.config import cfg
from oslo_concurrency import lockutils
from oslo_config import cfg
from paste import deploy
from glance import i18n

View File

@ -15,7 +15,7 @@
import copy
from oslo.config import cfg
from oslo_config import cfg
import stevedore
from glance import i18n

View File

@ -15,7 +15,7 @@
"""Storage preference based location strategy module"""
from oslo.config import cfg
from oslo_config import cfg
import six
import six.moves.urllib.parse as urlparse

View File

@ -19,7 +19,7 @@ try:
except ImportError:
from ordereddict import OrderedDict
from oslo.config import cfg
from oslo_config import cfg
import glance.api.policy
from glance.common import exception

View File

@ -19,7 +19,7 @@ RPC Controller
import datetime
import traceback
from oslo.config import cfg
from oslo_config import cfg
import oslo_utils.importutils as imp
from oslo_utils import timeutils
import six

View File

@ -15,7 +15,7 @@
import sys
import glance_store as store_api
from oslo.config import cfg
from oslo_config import cfg
import six.moves.urllib.parse as urlparse
from glance.common import utils

View File

@ -18,7 +18,7 @@ try:
except ImportError:
from ordereddict import OrderedDict
from oslo.config import cfg
from oslo_config import cfg
from glance.common import exception
from glance import i18n

View File

@ -36,7 +36,7 @@ import sys
import uuid
from OpenSSL import crypto
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import encodeutils
from oslo_utils import excutils
from oslo_utils import netutils

View File

@ -34,9 +34,9 @@ from eventlet.green import socket
from eventlet.green import ssl
import eventlet.greenio
import eventlet.wsgi
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_concurrency import processutils
from oslo_config import cfg
import routes
import routes.middleware
import six

View File

@ -16,7 +16,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import importutils
from wsme.rest import json

View File

@ -21,8 +21,8 @@
import threading
from oslo.config import cfg
from oslo.db import options as db_options
from oslo_config import cfg
from stevedore import driver
from glance.db.sqlalchemy import api as db_api

View File

@ -22,8 +22,8 @@
import os
import threading
from oslo.config import cfg
from oslo.db import options as db_options
from oslo_config import cfg
from stevedore import driver
from glance.db.sqlalchemy import api as db_api

View File

@ -22,9 +22,9 @@
import threading
from oslo.config import cfg
from oslo.db import exception as db_exception
from oslo.db.sqlalchemy import session
from oslo_config import cfg
from oslo_utils import timeutils
import osprofiler.sqlalchemy
from retrying import retry

View File

@ -23,7 +23,7 @@ from os.path import isfile
from os.path import join
import re
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import timeutils
import six
import sqlalchemy

View File

@ -30,7 +30,7 @@ import types # noqa
# NOTE(flaper87): This is bad but there ain't better way to do it.
from glance_store._drivers import swift # noqa
from oslo.config import cfg
from oslo_config import cfg
import six.moves.urllib.parse as urlparse
import sqlalchemy

View File

@ -18,7 +18,7 @@ import collections
import datetime
import uuid
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import excutils
from oslo_utils import importutils
from oslo_utils import timeutils

View File

@ -19,7 +19,7 @@ LRU Cache for Image Data
import hashlib
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import excutils
from oslo_utils import importutils
from oslo_utils import units

View File

@ -19,7 +19,7 @@ Base attribute driver class
import os.path
from oslo.config import cfg
from oslo_config import cfg
from glance.common import exception
from glance.common import utils

View File

@ -26,7 +26,7 @@ import time
from eventlet import sleep
from eventlet import timeout
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import excutils
from glance.common import exception

View File

@ -58,7 +58,7 @@ import os
import stat
import time
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import excutils
import xattr

View File

@ -17,7 +17,7 @@ import collections
import copy
import glance_store as store
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import excutils
from glance.common import exception

View File

@ -15,8 +15,8 @@
# under the License.
import glance_store
from oslo.config import cfg
from oslo import messaging
from oslo_config import cfg
from oslo_utils import excutils
from oslo_utils import timeutils
import webob

View File

@ -37,7 +37,7 @@ import socket
import sys
import traceback
from oslo.config import cfg
from oslo_config import cfg
from oslo.serialization import jsonutils
from oslo_utils import importutils
import six

View File

@ -81,7 +81,7 @@ import copy
import os
import re
from oslo.config import cfg
from oslo_config import cfg
from oslo.serialization import jsonutils
import six
import six.moves.urllib.parse as urlparse

View File

@ -108,7 +108,7 @@ _manage_opts = [
def list_api_opts():
"""Return a list of oslo.config options available in Glance API service.
"""Return a list of oslo_config options available in Glance API service.
Each element of the list is a tuple. The first element is the name of the
group under which the list of elements in the second element will be
@ -116,7 +116,7 @@ def list_api_opts():
config files.
This function is also discoverable via the 'glance.api' entry point
under the 'oslo.config.opts' namespace.
under the 'oslo_config.opts' namespace.
The purpose of this is to allow tools like the Oslo sample config file
generator to discover the options exposed to users by Glance.
@ -128,26 +128,26 @@ def list_api_opts():
def list_registry_opts():
"""Return a list of oslo.config options available in Glance Registry
"""Return a list of oslo_config options available in Glance Registry
service.
"""
return [(g, copy.deepcopy(o)) for g, o in _registry_opts]
def list_scrubber_opts():
"""Return a list of oslo.config options available in Glance Scrubber
"""Return a list of oslo_config options available in Glance Scrubber
service.
"""
return [(g, copy.deepcopy(o)) for g, o in _scrubber_opts]
def list_cache_opts():
"""Return a list of oslo.config options available in Glance Cache
"""Return a list of oslo_config options available in Glance Cache
service.
"""
return [(g, copy.deepcopy(o)) for g, o in _cache_opts]
def list_manage_opts():
"""Return a list of oslo.config options available in Glance manage."""
"""Return a list of oslo_config options available in Glance manage."""
return [(g, copy.deepcopy(o)) for g, o in _manage_opts]

View File

@ -15,7 +15,7 @@
import copy
import glance_store as store
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import excutils
import six

View File

@ -17,7 +17,7 @@
Registry API
"""
from oslo.config import cfg
from oslo_config import cfg
from glance import i18n

View File

@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from oslo_config import cfg
from glance.common import wsgi
from glance.registry.api import v1

View File

@ -17,7 +17,7 @@
Reference implementation registry server WSGI controller
"""
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import strutils
from oslo_utils import timeutils
from webob import exc

View File

@ -17,7 +17,7 @@
RPC Controller
"""
from oslo.config import cfg
from oslo_config import cfg
from glance.common import rpc
from glance.common import wsgi

View File

@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from oslo_config import cfg
from glance import i18n

View File

@ -19,8 +19,8 @@ Registry's Client API
import os
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
from glance.common import exception
from glance import i18n

View File

@ -19,7 +19,7 @@ Registry's Client V2
import os
from oslo.config import cfg
from oslo_config import cfg
from glance.common import exception
from glance import i18n

View File

@ -19,8 +19,8 @@ import os
import time
import eventlet
from oslo.config import cfg
from oslo_concurrency import lockutils
from oslo_config import cfg
import six
from glance.common import crypt

View File

@ -13,8 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from oslo.db import options
from oslo_config import cfg
import glance.db
import glance.tests.functional.db as db_tests

View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from oslo.db import options
from oslo_config import cfg
from glance.common import exception
import glance.db.sqlalchemy.api

View File

@ -16,8 +16,8 @@ import tempfile
import fixtures
import glance_store
from oslo.config import cfg
from oslo.db import options
from oslo_config import cfg
import glance.common.client
from glance.common import config

View File

@ -19,8 +19,8 @@ import tempfile
import fixtures
import glance_store
from oslo.config import cfg
from oslo.db import options
from oslo_config import cfg
import glance.common.client
from glance.common import config

View File

@ -13,8 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
from glance.tests.integration.v2 import base

View File

@ -13,7 +13,7 @@ import sys
import glance_store as store
import mock
from oslo.config import cfg
from oslo_config import cfg
import six
import glance.cmd.api

View File

@ -17,10 +17,10 @@ import os
import glance_store as store
from glance_store import location
from oslo.config import cfg
from oslo.db import options
from oslo.serialization import jsonutils
from oslo_concurrency import lockutils
from oslo_config import cfg
from glance.openstack.common import local
from glance.tests import stubs

View File

@ -16,8 +16,8 @@
# under the License.
import datetime
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
import routes
import webob

View File

@ -17,8 +17,8 @@
import uuid
import mock
from oslo.config import cfg
from oslo.db import exception as db_exc
from oslo_config import cfg
from glance.common import crypt
from glance.common import exception

View File

@ -18,7 +18,7 @@ import datetime
import uuid
import mock
from oslo.config import cfg
from oslo_config import cfg
import oslo_utils.importutils
from oslo_utils import timeutils

View File

@ -33,11 +33,11 @@ import uuid
from migrate.versioning import api as migration_api
from migrate.versioning.repository import Repository
from oslo.config import cfg
from oslo.db.sqlalchemy import test_base
from oslo.db.sqlalchemy import test_migrations
from oslo.db.sqlalchemy import utils as db_utils
from oslo.serialization import jsonutils
from oslo_config import cfg
from oslo_utils import timeutils
import sqlalchemy

View File

@ -18,8 +18,8 @@ import datetime
import glance_store
import mock
from oslo.config import cfg
from oslo import messaging
from oslo_config import cfg
from oslo_utils import timeutils
import webob

View File

@ -17,7 +17,7 @@
import os.path
import mock
import oslo.config.cfg
import oslo_config.cfg
import glance.api.policy
from glance.common import exception
@ -178,7 +178,7 @@ class TestPolicyEnforcerNoFile(base.IsolatedUnitTest):
def fake_find_file(self, name):
return None
self.stubs.Set(oslo.config.cfg.ConfigOpts, 'find_file',
self.stubs.Set(oslo_config.cfg.ConfigOpts, 'find_file',
fake_find_file)
enforcer = glance.api.policy.Enforcer()

View File

@ -22,7 +22,7 @@ import eventlet
import glance_store
from mock import patch
import mox
from oslo.config import cfg
from oslo_config import cfg
from glance.common import exception
from glance import scrubber

View File

@ -16,7 +16,7 @@
import urllib
import glance_store as store
from oslo.config import cfg
from oslo_config import cfg
import six.moves.urllib.parse as urlparse
from glance.common import exception

View File

@ -23,8 +23,8 @@ import uuid
import glance_store as store
import mock
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
from oslo_utils import timeutils
import routes
import six

View File

@ -19,8 +19,8 @@ import datetime
import uuid
import mock
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
from oslo_utils import timeutils
import routes
import six

View File

@ -16,8 +16,8 @@
import datetime
import glance_store
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
import webob
import glance.api.v2.image_members

View File

@ -19,8 +19,8 @@ import uuid
import glance_store as store
import mock
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
import six
import testtools
import webob

View File

@ -18,8 +18,8 @@
import datetime
import uuid
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
from oslo_utils import timeutils
import routes
import six

View File

@ -24,8 +24,8 @@ import socket
import subprocess
import fixtures
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
from oslo_utils import timeutils
import six
import stubout

View File

@ -16,7 +16,7 @@
import sys
import keystoneclient.v2_0.client
from oslo.config import cfg
from oslo_config import cfg
import glance.context
import glance.db.sqlalchemy.api as db_api