Merge "Drop use of 'oslo' namespace package"
This commit is contained in:
commit
3b84f30c16
@ -20,7 +20,7 @@ eventlet.monkey_patch()
|
||||
import os
|
||||
import socket
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log
|
||||
from oslo_concurrency import lockutils
|
||||
from oslo import messaging
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
cfg.CONF.register_group(cfg.OptGroup(
|
||||
name='service:agent', title="Configuration for the Agent Service"
|
||||
|
@ -19,7 +19,7 @@ import dns.rcode
|
||||
import dns.message
|
||||
import dns.flags
|
||||
import dns.opcode
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import utils
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_log import log as logging
|
||||
|
||||
from designate import utils
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
|
||||
cfg.CONF.register_group(cfg.OptGroup(
|
||||
|
@ -13,7 +13,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
import pecan.deploy
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
import pecan
|
||||
import pecan.deploy
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate.api.v2 import patches
|
||||
|
@ -15,7 +15,7 @@ from dns import zone as dnszone
|
||||
from dns import exception as dnsexception
|
||||
import pecan
|
||||
from oslo_log import log as logging
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
from designate.api.v2.controllers import rest
|
||||
from designate import dnsutils
|
||||
|
@ -12,7 +12,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_log import log as logging
|
||||
from stevedore import named
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
import urllib
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import exceptions
|
||||
|
@ -15,12 +15,12 @@
|
||||
# under the License.
|
||||
import flask
|
||||
import webob.dec
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo import messaging
|
||||
from oslo_log import log as logging
|
||||
from oslo_middleware import base
|
||||
from oslo_middleware import request_id
|
||||
from oslo.serialization import jsonutils as json
|
||||
from oslo_serialization import jsonutils as json
|
||||
from oslo_utils import strutils
|
||||
|
||||
from designate import exceptions
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_log import log as logging
|
||||
from paste import deploy
|
||||
|
||||
|
@ -20,9 +20,9 @@ from werkzeug import exceptions as wexceptions
|
||||
from werkzeug import wrappers
|
||||
from werkzeug.routing import BaseConverter
|
||||
from werkzeug.routing import ValidationError
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
from oslo.serialization import jsonutils
|
||||
from oslo_serialization import jsonutils
|
||||
|
||||
from designate import exceptions
|
||||
from designate import utils
|
||||
|
@ -14,7 +14,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
import flask
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import exceptions
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
import flask
|
||||
from oslo_log import log as logging
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
from designate import schema
|
||||
from designate.central import rpcapi as central_rpcapi
|
||||
|
@ -14,7 +14,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
import pecan.deploy
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate.api.v2 import patches # flake8: noqa
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
import pecan
|
||||
import pecan.deploy
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate.api.v2 import patches
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_log import log as logging
|
||||
from stevedore import named
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
import pecan
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
from designate import exceptions
|
||||
from designate import utils
|
||||
|
@ -14,7 +14,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
import pecan
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
from designate.api.v2.controllers import rest
|
||||
from designate.objects.adapters import DesignateAdapter
|
||||
|
@ -16,7 +16,7 @@
|
||||
from inspect import ismethod
|
||||
from inspect import getargspec
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
from oslo_serialization import jsonutils
|
||||
import pecan.core
|
||||
|
||||
from designate import exceptions
|
||||
|
@ -14,7 +14,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
import flask
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
|
||||
def factory(global_config, **local_conf):
|
||||
|
@ -22,7 +22,7 @@ import dns.flags
|
||||
import dns.rcode
|
||||
import dns.message
|
||||
import dns.opcode
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate.i18n import _LI
|
||||
|
@ -17,8 +17,8 @@ import os
|
||||
|
||||
import dns
|
||||
import dns.resolver
|
||||
from oslo.config import cfg
|
||||
from oslo.concurrency import lockutils
|
||||
from oslo_concurrency import lockutils
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate.backend.agent_backend import base
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
import abc
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate.i18n import _LI
|
||||
|
@ -17,7 +17,7 @@ import json
|
||||
import time
|
||||
|
||||
from eventlet import Timeout
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
import requests
|
||||
from requests.adapters import HTTPAdapter
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
from sqlalchemy import MetaData, Table, Column, String, Integer
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
from designate.sqlalchemy.types import UUID
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
cfg.CONF.register_group(cfg.OptGroup(
|
||||
name='service:central', title="Configuration for Central Service"
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_log import log as logging
|
||||
from oslo import messaging
|
||||
|
||||
|
@ -24,7 +24,7 @@ import string
|
||||
import random
|
||||
import time
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo import messaging
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
import sys
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import service
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
import sys
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate.openstack.common import service
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
import sys
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import service
|
||||
|
@ -19,7 +19,7 @@ import os
|
||||
import sys
|
||||
|
||||
import eventlet
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
from stevedore.extension import ExtensionManager
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
import sys
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import service
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
import sys
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import service
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
import sys
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import service
|
||||
|
@ -23,7 +23,7 @@ import dns.zone
|
||||
import eventlet
|
||||
from dns import rdatatype
|
||||
from oslo_log import log as logging
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
from designate import context
|
||||
from designate import exceptions
|
||||
|
@ -16,7 +16,7 @@
|
||||
import os
|
||||
|
||||
from migrate.versioning import api as versioning_api
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate.manage import base
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
import pprint
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate.manage import base
|
||||
|
@ -16,7 +16,7 @@
|
||||
import os
|
||||
|
||||
from migrate.versioning import api as versioning_api
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate.manage import base
|
||||
|
@ -16,7 +16,7 @@
|
||||
import os
|
||||
|
||||
from migrate.versioning import api as versioning_api
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_db.sqlalchemy.migration_cli import manager as migration_manager
|
||||
from oslo_log import log as logging
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
import csv
|
||||
import os
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import exceptions
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 designate import dnsutils
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
from oslo import messaging
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate.pool_manager import rpcapi as pool_mngr_api
|
||||
|
@ -20,7 +20,7 @@ import dns.rcode
|
||||
import dns.rdataclass
|
||||
import dns.rdatatype
|
||||
import dns.message
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import exceptions
|
||||
|
@ -23,7 +23,7 @@ import dns.flags
|
||||
import dns.rcode
|
||||
import dns.message
|
||||
import dns.opcode
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate.mdns import base
|
||||
|
@ -12,7 +12,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_log import log as logging
|
||||
from oslo import messaging
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_log import log as logging
|
||||
|
||||
from designate import utils
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_utils import timeutils
|
||||
from oslo_log import log as logging
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
import logging
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
from designate.network_api.base import NetworkAPI
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
import eventlet.patcher
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import exceptions
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
from neutronclient.v2_0 import client as clientv20
|
||||
from neutronclient.common import exceptions as neutron_exceptions
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import exceptions
|
||||
|
@ -16,7 +16,7 @@
|
||||
# under the License.
|
||||
import abc
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import exceptions
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_log import log as logging
|
||||
|
||||
from designate.notification_handler.base import BaseAddressHandler
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_log import log as logging
|
||||
|
||||
from designate.notification_handler.base import BaseAddressHandler
|
||||
|
@ -16,7 +16,7 @@
|
||||
#
|
||||
# Copied: nova.notifications
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import rpc
|
||||
|
@ -14,7 +14,7 @@
|
||||
import urllib
|
||||
|
||||
from oslo_log import log as logging
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
from designate.objects.adapters import base
|
||||
from designate.objects import base as obj_base
|
||||
|
@ -19,7 +19,7 @@ import six
|
||||
from stevedore import driver
|
||||
from stevedore import enabled
|
||||
from stevedore import extension
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_log import log as logging
|
||||
from oslo_policy import policy
|
||||
from oslo_policy import opts
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 designate import exceptions
|
||||
from designate import objects
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_db import options
|
||||
from oslo_log import log as logging
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_log import log as logging
|
||||
from oslo import messaging
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
from contextlib import contextmanager
|
||||
from decimal import Decimal
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo import messaging
|
||||
from oslo_log import log as logging
|
||||
from oslo_concurrency import lockutils
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_log import log as logging
|
||||
|
||||
from designate.quota.base import Quota
|
||||
|
@ -16,7 +16,7 @@
|
||||
import abc
|
||||
|
||||
import six
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
from designate import exceptions
|
||||
from designate.plugin import DriverPlugin
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_log import log as logging
|
||||
|
||||
from designate import exceptions
|
||||
|
@ -26,11 +26,11 @@ __all__ = [
|
||||
'TRANSPORT_ALIASES',
|
||||
]
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo import messaging
|
||||
from oslo.messaging import server as msg_server
|
||||
from oslo.messaging.rpc import dispatcher as rpc_dispatcher
|
||||
from oslo.serialization import jsonutils
|
||||
from oslo_messaging import server as msg_server
|
||||
from oslo_messaging.rpc import dispatcher as rpc_dispatcher
|
||||
from oslo_serialization import jsonutils
|
||||
|
||||
import designate.context
|
||||
import designate.exceptions
|
||||
|
@ -26,7 +26,7 @@ import time
|
||||
import six
|
||||
import eventlet.wsgi
|
||||
from oslo import messaging
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
from oslo_log import loggers
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
cfg.CONF.register_group(cfg.OptGroup(
|
||||
name='service:sink', title="Configuration for Sink Service"
|
||||
|
@ -14,7 +14,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_log import log as logging
|
||||
from oslo import messaging
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
"""Session Handling for SQLAlchemy backend."""
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_db.sqlalchemy import session
|
||||
from oslo_log import log as logging
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
import time
|
||||
import hashlib
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
from oslo_db import options
|
||||
from sqlalchemy import select, distinct, func
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_utils import timeutils
|
||||
|
||||
from sqlalchemy import Integer, String, DateTime, Unicode, UniqueConstraint, \
|
||||
|
@ -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 sqlalchemy.schema import Table, Column, MetaData
|
||||
from migrate.changeset.constraint import UniqueConstraint
|
||||
|
@ -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 sqlalchemy.schema import Table, MetaData
|
||||
from sqlalchemy.sql import select
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 sqlalchemy import Enum
|
||||
from sqlalchemy.schema import Table, MetaData, Column
|
||||
from migrate.changeset.constraint import UniqueConstraint
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
from oslo.utils import timeutils
|
||||
from oslo_utils import timeutils
|
||||
|
||||
from sqlalchemy import DateTime, Enum, Integer, String, ForeignKeyConstraint
|
||||
from sqlalchemy.schema import Column, MetaData, Table
|
||||
|
@ -18,7 +18,7 @@
|
||||
from sqlalchemy import Integer, String, DateTime, ForeignKeyConstraint
|
||||
from sqlalchemy.schema import Table, Column, MetaData
|
||||
from sqlalchemy.sql import select
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
from designate import utils
|
||||
from designate.sqlalchemy.types import UUID
|
||||
|
@ -17,7 +17,7 @@ from sqlalchemy import (Table, MetaData, Column, String, Text, Integer, CHAR,
|
||||
DateTime, Enum, Boolean, Unicode, UniqueConstraint,
|
||||
ForeignKeyConstraint)
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_utils import timeutils
|
||||
|
||||
from designate import utils
|
||||
|
@ -21,9 +21,9 @@ import inspect
|
||||
from testtools import testcase
|
||||
from oslotest import base
|
||||
from oslo_log import log as logging
|
||||
from oslo.config import cfg
|
||||
from oslo.config import fixture as cfg_fixture
|
||||
from oslo.messaging import conffixture as messaging_fixture
|
||||
from oslo_config import cfg
|
||||
from oslo_config import fixture as cfg_fixture
|
||||
from oslo_messaging import conffixture as messaging_fixture
|
||||
|
||||
from designate import policy
|
||||
from designate import utils
|
||||
|
@ -21,7 +21,7 @@ import tempfile
|
||||
import fixtures
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import importutils
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
from designate import policy
|
||||
from designate import network_api
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 designate.backend import agent_backend
|
||||
from designate.agent import service
|
||||
|
@ -14,7 +14,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 designate.tests.test_api.test_admin import AdminApiTestCase
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 designate.tests.test_api.test_admin import AdminApiTestCase
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
from dns import zone as dnszone
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
from designate.tests.test_api.test_admin import AdminApiTestCase
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
import mock
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_messaging.notify import notifier
|
||||
|
||||
from designate.tests.test_api import ApiTestCase
|
||||
|
@ -14,7 +14,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
from oslo_log import log as logging
|
||||
from oslo.serialization import jsonutils as json
|
||||
from oslo_serialization import jsonutils as json
|
||||
|
||||
from designate.api import v1 as api_v1
|
||||
from designate.api import middleware
|
||||
|
@ -18,7 +18,7 @@ import datetime
|
||||
|
||||
from mock import patch
|
||||
from oslo import messaging
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import exceptions
|
||||
|
@ -13,7 +13,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 designate.tests.test_api.test_v2 import ApiV2TestCase
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 oslo_log import log as logging
|
||||
|
||||
from designate.tests.test_api.test_v2 import ApiV2TestCase
|
||||
|
@ -14,7 +14,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
from mock import patch
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo import messaging
|
||||
from oslo_log import log as logging
|
||||
|
||||
|
@ -20,7 +20,7 @@ import random
|
||||
import mock
|
||||
import testtools
|
||||
from testtools.matchers import GreaterThan
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
from oslo_db import exception as db_exception
|
||||
from oslo_messaging.notify import notifier
|
||||
|
@ -21,7 +21,7 @@ import dns.rdatatype
|
||||
import dns.resolver
|
||||
import dns.rrset
|
||||
import mock
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
|
||||
from designate import context
|
||||
from designate import objects
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
from neutronclient.v2_0 import client as clientv20
|
||||
from neutronclient.common import exceptions as neutron_exceptions
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from mock import patch
|
||||
import testtools
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
from oslo import messaging
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from mock import call
|
||||
from mock import patch
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
# under the License.
|
||||
from testscenarios import load_tests_apply_scenarios as load_tests # noqa
|
||||
import testtools
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import quota
|
||||
|
@ -18,7 +18,7 @@ import math
|
||||
|
||||
import mock
|
||||
import testtools
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from designate import exceptions
|
||||
|
@ -23,7 +23,7 @@ import uuid
|
||||
import six
|
||||
import pkg_resources
|
||||
from jinja2 import Template
|
||||
from oslo.config import cfg
|
||||
from oslo_config import cfg
|
||||
from oslo_concurrency import processutils
|
||||
from oslo_log import log as logging
|
||||
from oslo_utils import timeutils
|
||||
|
Loading…
Reference in New Issue
Block a user