Use oslo_config instead of deprecated oslo.config

Change-Id: I85d5c8d3d9f00f86fd14500be0da1289f5672614
This commit is contained in:
Dina Belova 2015-01-12 14:21:32 +03:00 committed by Lena Novokshonova
parent fb53883fcb
commit fc7e781344
113 changed files with 117 additions and 117 deletions

View File

@ -22,7 +22,7 @@ import collections
import fnmatch
import itertools
from oslo.config import cfg
from oslo_config import cfg
from oslo_context import context
import six
from six.moves.urllib import parse as urlparse

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
from ceilometer.agent import plugin_base as plugin
from ceilometer.i18n import _LW

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
from ceilometer.agent import plugin_base as plugin
from ceilometer.openstack.common import log

View File

@ -16,7 +16,7 @@
# under the License.
from keystoneclient.v2_0 import client as ksclient
from oslo.config import cfg
from oslo_config import cfg
from ceilometer.agent import base
from ceilometer.openstack.common import log

View File

@ -22,8 +22,8 @@ import collections
import fnmatch
from keystoneclient.v2_0 import client as ksclient
from oslo.config import cfg
import oslo.messaging
from oslo_config import cfg
from oslo_context import context
import six

View File

@ -21,7 +21,7 @@ import datetime
from ceilometerclient import client as ceiloclient
import croniter
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import timeutils
import pytz
import six

View File

@ -17,8 +17,8 @@
"""Rest alarm notifier."""
import eventlet
from oslo.config import cfg
from oslo.serialization import jsonutils
from oslo_config import cfg
from oslo_context import context
import requests
import six.moves.urllib.parse as urlparse

View File

@ -15,7 +15,7 @@
"""Rest alarm notifier with trusted authentication."""
from keystoneclient.v3 import client as keystone_client
from oslo.config import cfg
from oslo_config import cfg
from six.moves.urllib import parse
from ceilometer.alarm.notifier import rest

View File

@ -15,7 +15,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_context import context
import six

View File

@ -20,7 +20,7 @@
import abc
from ceilometerclient import client as ceiloclient
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import netutils
import six
from stevedore import extension

View File

@ -19,8 +19,8 @@
from __future__ import absolute_import
import os
from oslo.config import cfg
from oslo.db.sqlalchemy import session as db_session
from oslo_config import cfg
from sqlalchemy import desc
import ceilometer

View File

@ -15,7 +15,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from oslo_config import cfg
# Register options for the service
OPTS = [

View File

@ -21,7 +21,7 @@ import socket
from wsgiref import simple_server
import netaddr
from oslo.config import cfg
from oslo_config import cfg
from paste import deploy
import pecan

View File

@ -37,7 +37,7 @@ import uuid
import croniter
import jsonschema
from oslo.config import cfg
from oslo_config import cfg
from oslo_context import context
from oslo_utils import netutils
from oslo_utils import strutils

View File

@ -18,7 +18,7 @@
import threading
from oslo.config import cfg
from oslo_config import cfg
from pecan import hooks
from ceilometer import pipeline

View File

@ -28,7 +28,7 @@ import eventlet
# first read() or select(), thread need to be patched too, because
# oslo.messaging use threading.local
eventlet.monkey_patch(socket=True, select=True, thread=True)
from oslo.config import cfg
from oslo_config import cfg
from oslo_context import context
from oslo_utils import timeutils

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
from stevedore import driver
from ceilometer.alarm import service as alarm_service

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
from ceilometer.agent import manager
from ceilometer.openstack.common import service as os_service

View File

@ -16,7 +16,7 @@
import logging
from oslo.config import cfg
from oslo_config import cfg
from ceilometer.i18n import _
from ceilometer import service

View File

@ -18,8 +18,8 @@
import socket
import msgpack
from oslo.config import cfg
import oslo.messaging
from oslo_config import cfg
from oslo_utils import units
from ceilometer import dispatcher

View File

@ -15,7 +15,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from oslo_config import cfg
from ceilometer.agent import plugin_base
from ceilometer import nova_client

View File

@ -15,8 +15,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
import oslo.messaging
from oslo_config import cfg
from ceilometer.agent import plugin_base

View File

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

View File

@ -16,7 +16,7 @@
# under the License.
"""Implementation of Inspector abstraction for Hyper-V"""
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import units
from ceilometer.compute.pollsters import util

View File

@ -25,7 +25,7 @@ import sys
if sys.platform == 'win32':
import wmi
from oslo.config import cfg
from oslo_config import cfg
from ceilometer.compute.virt import inspector
from ceilometer.i18n import _

View File

@ -19,7 +19,7 @@
import collections
from oslo.config import cfg
from oslo_config import cfg
from stevedore import driver
import ceilometer

View File

@ -17,7 +17,7 @@
"""Implementation of Inspector abstraction for libvirt."""
from lxml import etree
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import units
import six

View File

@ -15,8 +15,8 @@
"""Implementation of Inspector abstraction for VMware vSphere"""
from oslo.config import cfg
from oslo.vmware import api
from oslo_config import cfg
from oslo_utils import units
from ceilometer.compute.virt import inspector as virt_inspector

View File

@ -16,7 +16,7 @@
"""Implementation of Inspector abstraction for XenAPI."""
from eventlet import timeout
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import units
try:
import XenAPI as api

View File

@ -17,7 +17,7 @@
import uuid
from oslo.config import cfg
from oslo_config import cfg
import tooz.coordination
from ceilometer.i18n import _LE, _LI

View File

@ -13,9 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from oslo.config import cfg
import oslo.messaging
from oslo_config import cfg
from ceilometer.agent import plugin_base
from ceilometer import sample

View File

@ -17,7 +17,7 @@
import abc
from oslo.config import cfg
from oslo_config import cfg
import six
from stevedore import named

View File

@ -18,7 +18,7 @@
import logging
import logging.handlers
from oslo.config import cfg
from oslo_config import cfg
from ceilometer import dispatcher

View File

@ -16,7 +16,7 @@
import json
from oslo.config import cfg
from oslo_config import cfg
import requests
from ceilometer import dispatcher

View File

@ -17,7 +17,7 @@
import datetime
from keystoneclient import exceptions
from oslo.config import cfg
from oslo_config import cfg
import requests
import six

View File

@ -19,7 +19,7 @@ import fnmatch
import os
import jsonpath_rw
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import timeutils
import six
import yaml

View File

@ -17,8 +17,8 @@
import logging
from oslo.config import cfg
import oslo.messaging
from oslo_config import cfg
from stevedore import extension
import ceilometer

View File

@ -17,9 +17,9 @@ from __future__ import absolute_import
import operator
import os
from oslo.config import cfg
from oslo.db import exception as dbexc
from oslo.db.sqlalchemy import session as db_session
from oslo_config import cfg
import six
import sqlalchemy as sa

View File

@ -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 ceilometer.agent import plugin_base
from ceilometer.i18n import _

View File

@ -11,8 +11,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
import oslo.messaging
from oslo_config import cfg
from ceilometer.agent import plugin_base
from ceilometer import sample

View File

@ -21,7 +21,7 @@ from __future__ import absolute_import
import itertools
import glanceclient
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import timeutils
from ceilometer.agent import plugin_base

View File

@ -18,8 +18,8 @@
events.
"""
from oslo.config import cfg
import oslo.messaging
from oslo_config import cfg
from ceilometer.agent import plugin_base
from ceilometer import sample

View File

@ -18,8 +18,8 @@
notification events.
"""
from oslo.config import cfg
from oslo import messaging
from oslo_config import cfg
from ceilometer.agent import plugin_base
from ceilometer.openstack.common import log

View File

@ -29,7 +29,7 @@ import collections
import tempfile
import time
from oslo.config import cfg
from oslo_config import cfg
from ceilometer.i18n import _
from ceilometer.ipmi.platform import exception as nmexcept

View File

@ -16,7 +16,7 @@
import abc
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import timeutils
import six

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
from oslo_utils import timeutils
from ceilometer.agent import plugin_base

View File

@ -10,8 +10,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
import oslo.messaging
from oslo_config import cfg
from ceilometer.agent import plugin_base
from ceilometer import sample

View File

@ -15,9 +15,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
import oslo.messaging
from oslo.serialization import jsonutils
from oslo_config import cfg
from oslo_context import context
DEFAULT_URL = "__default__"

View File

@ -15,8 +15,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
import oslo.messaging
from oslo_config import cfg
from ceilometer.agent import plugin_base
from ceilometer import sample

View File

@ -18,7 +18,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 timeutils
from ceilometer.agent import plugin_base

View File

@ -19,8 +19,8 @@
"""
from oslo.config import cfg
import oslo.messaging
from oslo_config import cfg
from ceilometer.agent import plugin_base
from ceilometer.i18n import _

View File

@ -15,7 +15,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from oslo_config import cfg
from ceilometer.agent import plugin_base
from ceilometer import neutron_client

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 requests
import six
from six.moves.urllib import parse as urlparse

View File

@ -15,7 +15,7 @@
import abc
from oslo.config import cfg
from oslo_config import cfg
import requests
from requests import auth
import six

View File

@ -18,7 +18,7 @@ import functools
from neutronclient.common import exceptions
from neutronclient.v2_0 import client as clientv20
from oslo.config import cfg
from oslo_config import cfg
from ceilometer.openstack.common import log

View File

@ -15,8 +15,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
import oslo.messaging
from oslo_config import cfg
from oslo_context import context
from stevedore import extension

View File

@ -17,7 +17,7 @@ import functools
import novaclient
from novaclient.v1_1 import client as nova_client
from oslo.config import cfg
from oslo_config import cfg
from ceilometer.openstack.common import log

View File

@ -20,7 +20,7 @@
from __future__ import absolute_import
from keystoneclient import exceptions
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import timeutils
import six.moves.urllib.parse as urlparse
from swiftclient import client as swift

View File

@ -15,8 +15,8 @@
events.
"""
from oslo.config import cfg
import oslo.messaging
from oslo_config import cfg
from ceilometer.agent import plugin_base
from ceilometer import sample

View File

@ -20,7 +20,7 @@
import fnmatch
import os
from oslo.config import cfg
from oslo_config import cfg
import yaml
from ceilometer.i18n import _

View File

@ -13,8 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
import oslo.messaging
from oslo_config import cfg
from ceilometer.agent import plugin_base
from ceilometer import sample

View File

@ -21,8 +21,8 @@ import abc
import itertools
import operator
from oslo.config import cfg
import oslo.messaging
from oslo_config import cfg
import six
import six.moves.urllib.parse as urlparse

View File

@ -21,7 +21,7 @@
import socket
import msgpack
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import netutils
from ceilometer.i18n import _

View File

@ -21,7 +21,7 @@
import hashlib
import hmac
from oslo.config import cfg
from oslo_config import cfg
import six
from ceilometer import utils

View File

@ -26,7 +26,7 @@ in by the plugins that create them.
import copy
import uuid
from oslo.config import cfg
from oslo_config import cfg
OPTS = [

View File

@ -20,8 +20,8 @@ import os
import socket
import sys
from oslo.config import cfg
from oslo import i18n
from oslo_config import cfg
from ceilometer.i18n import _
from ceilometer import messaging

View File

@ -17,8 +17,8 @@
"""Storage backend management
"""
from oslo.config import cfg
from oslo.db import options as db_options
from oslo_config import cfg
import retrying
import six
import six.moves.urllib.parse as urlparse

View File

@ -28,7 +28,7 @@ import sys
import bson.code
import bson.objectid
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import timeutils
import pymongo
import six

View File

@ -29,7 +29,7 @@ import uuid
import bson.code
import bson.objectid
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import timeutils
import pymongo
import six

View File

@ -21,10 +21,10 @@ import datetime
import hashlib
import os
from oslo.config import cfg
from oslo.db import exception as dbexc
from oslo.db.sqlalchemy import session as db_session
from oslo.serialization import jsonutils
from oslo_config import cfg
from oslo_utils import timeutils
import six
import sqlalchemy as sa

View File

@ -21,7 +21,7 @@
import time
import weakref
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import netutils
import pymongo
import six

View File

@ -26,7 +26,7 @@ import copy
import datetime
import mock
from oslo.config import fixture as fixture_config
from oslo_config import fixture as fixture_config
from oslotest import mockpatch
import six
from stevedore import extension

View File

@ -18,7 +18,7 @@
"""
import mock
from oslo.config import fixture as fixture_config
from oslo_config import fixture as fixture_config
from oslotest import base
from ceilometer.agent.discovery import endpoint

View File

@ -16,7 +16,7 @@
# under the License.
import mock
from oslo.config import fixture as fixture_config
from oslo_config import fixture as fixture_config
from oslotest import base
from ceilometer.agent import plugin_base

View File

@ -22,7 +22,7 @@ import uuid
from ceilometerclient import exc
from ceilometerclient.v2 import statistics
import mock
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import timeutils
import pytz
from six import moves

View File

@ -21,7 +21,7 @@ import logging
import uuid
import mock
from oslo.config import fixture as fixture_config
from oslo_config import fixture as fixture_config
from oslo_utils import timeutils
from six import moves

View File

@ -17,7 +17,7 @@
"""Tests for ceilometer.alarm.service.SingletonAlarmService.
"""
import mock
from oslo.config import fixture as fixture_config
from oslo_config import fixture as fixture_config
from stevedore import extension
from ceilometer.alarm import service

View File

@ -16,8 +16,8 @@
# under the License.
import mock
from oslo.config import fixture as fixture_config
from oslo.serialization import jsonutils
from oslo_config import fixture as fixture_config
from oslo_context import context
from oslotest import mockpatch
import requests

View File

@ -19,7 +19,7 @@
import contextlib
import mock
from oslo.config import fixture as fixture_config
from oslo_config import fixture as fixture_config
from stevedore import extension
from ceilometer.alarm import service

View File

@ -19,7 +19,7 @@ import uuid
from ceilometerclient.v2 import alarms
import eventlet
from oslo.config import fixture as fixture_config
from oslo_config import fixture as fixture_config
from oslo_utils import timeutils
import six

View File

@ -17,7 +17,7 @@
"""Tests for ceilometer.alarm.service.SingletonAlarmService.
"""
import mock
from oslo.config import fixture as fixture_config
from oslo_config import fixture as fixture_config
from stevedore import extension
from ceilometer.alarm import service

View File

@ -17,8 +17,8 @@
"""Base classes for API tests.
"""
from oslo.config import cfg
from oslo.config import fixture as fixture_config
from oslo_config import cfg
from oslo_config import fixture as fixture_config
import pecan
import pecan.testing

View File

@ -18,8 +18,8 @@
import socket
import mock
from oslo.config import cfg
from oslo.config import fixture as fixture_config
from oslo_config import cfg
from oslo_config import fixture as fixture_config
from ceilometer.api import app
from ceilometer.tests import base

View File

@ -16,7 +16,7 @@
import datetime
import mock
from oslo.config import cfg
from oslo_config import cfg
from oslotest import base
from ceilometer.data_processing import notifications

View File

@ -24,7 +24,7 @@ import warnings
import fixtures
import mock
from oslo.config import fixture as fixture_config
from oslo_config import fixture as fixture_config
from oslotest import mockpatch
import six
from six.moves.urllib import parse as urlparse

View File

@ -18,7 +18,7 @@ import datetime
import uuid
import mock
from oslo.config import fixture as fixture_config
from oslo_config import fixture as fixture_config
from oslotest import base
from ceilometer.dispatcher import database

View File

@ -18,7 +18,7 @@ import logging.handlers
import os
import tempfile
from oslo.config import fixture as fixture_config
from oslo_config import fixture as fixture_config
from oslotest import base
from ceilometer.dispatcher import file

View File

@ -16,7 +16,7 @@
# under the License.
import mock
from oslo.config import fixture as fixture_config
from oslo_config import fixture as fixture_config
from oslotest import base
import requests

View File

@ -19,7 +19,7 @@ import datetime
import jsonpath_rw
import mock
from oslo.config import cfg as oslo_cfg
from oslo_config import cfg as oslo_cfg
import six
from ceilometer.event import converter

View File

@ -17,9 +17,9 @@
"""Tests for Ceilometer notify daemon."""
import mock
from oslo.config import cfg
from oslo.config import fixture as fixture_config
import oslo.messaging
from oslo_config import cfg
from oslo_config import fixture as fixture_config
from stevedore import extension
import ceilometer

View File

@ -16,7 +16,7 @@
# under the License.
import mock
from oslo.config import fixture as fixture_config
from oslo_config import fixture as fixture_config
from oslo_context import context
from oslotest import base
from oslotest import mockpatch

View File

@ -15,7 +15,7 @@
# under the License.
import mock
from oslo.config import cfg
from oslo_config import cfg
from ceilometer.ipmi.pollsters import node
from ceilometer.tests.ipmi.pollsters import base

View File

@ -15,7 +15,7 @@
# under the License.
import mock
from oslo.config import cfg
from oslo_config import cfg
from ceilometer.ipmi.pollsters import sensor
from ceilometer.tests.ipmi.notifications import ipmi_test_data

View File

@ -17,7 +17,7 @@
# under the License.
import mock
from oslo.config import fixture as fixture_config
from oslo_config import fixture as fixture_config
from oslotest import mockpatch
import six

View File

@ -15,7 +15,7 @@
import datetime
import mock
from oslo.config import cfg
from oslo_config import cfg
from oslotest import base
from ceilometer.openstack.common import log

View File

@ -21,8 +21,8 @@ import datetime
import eventlet
import mock
from oslo.config import fixture as fixture_config
import oslo.messaging
from oslo_config import fixture as fixture_config
from oslo_context import context
from oslo_utils import netutils
import testscenarios.testcase

View File

@ -21,7 +21,7 @@ import datetime
import mock
import msgpack
from oslo.config import fixture as fixture_config
from oslo_config import fixture as fixture_config
from oslo_utils import netutils
from oslotest import base

View File

@ -17,7 +17,7 @@
"""Tests for ceilometer/storage/
"""
import mock
from oslo.config import fixture as fixture_config
from oslo_config import fixture as fixture_config
from oslotest import base
import retrying

View File

@ -30,7 +30,7 @@ from ceilometer.storage.mongo import utils as pymongo_utils
from ceilometer.tests import base as test_base
import mock
from oslo.config import cfg
from oslo_config import cfg
class CapabilitiesTest(test_base.BaseTestCase):

View File

@ -23,7 +23,7 @@ import datetime
import operator
import mock
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import timeutils
import pymongo

Some files were not shown because too many files have changed in this diff Show More