Use oslo-config-2013.1b3

The cfg API is now available via the oslo-config library, so switch to
it and remove the copied-and-pasted version.

Add the 2013.1b3 tarball to tools/pip-requires - this will be changed
to 'oslo-config>=2013.1' when oslo-config is published to pypi. This
will happen in time for grizzly final.

Remove the 'deps = pep8' from tox.ini as it means all the other deps
get installed with easy_install which can't install oslo-config from
the URL.

Retain dummy cfg.py file until keystoneclient middleware has been
updated (I18c450174277c8e2d15ed93879da6cd92074c27a).

Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
This commit is contained in:
Mark McLoughlin 2013-02-10 19:00:19 -05:00
parent 2d1762ced0
commit cfda6bc4fb
115 changed files with 164 additions and 1986 deletions

View File

@ -21,10 +21,11 @@ subnets.
"""
from oslo.config import cfg
from quantum import context
from quantum import manager
from quantum.common import config
from quantum.openstack.common import cfg
from quantum.openstack.common.notifier import api as notifier_api
if __name__ == '__main__':

View File

@ -1,5 +1,5 @@
[DEFAULT]
# The list of modules to copy from openstack-common
modules=cfg,context,eventlet_backdoor,exception,excutils,fileutils,gettextutils,importutils,iniparser,install_venv_common,jsonutils,local,lockutils,log,loopingcall,network_utils,notifier,periodic_task,policy,processutils,rpc,service,setup,threadgroup,timeutils,uuidutils,version
modules=context,eventlet_backdoor,exception,excutils,fileutils,gettextutils,importutils,install_venv_common,jsonutils,local,lockutils,log,loopingcall,network_utils,notifier,periodic_task,policy,processutils,rpc,service,setup,threadgroup,timeutils,uuidutils,version
# The base module to hold the copy of openstack.common
base=quantum

View File

@ -15,9 +15,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from quantum.common import config
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging

View File

@ -21,6 +21,7 @@ import uuid
import eventlet
import netaddr
from oslo.config import cfg
from quantum.agent.common import config
from quantum.agent.linux import dhcp
@ -31,7 +32,6 @@ from quantum.agent import rpc as agent_rpc
from quantum.common import exceptions
from quantum.common import topics
from quantum import context
from quantum.openstack.common import cfg
from quantum.openstack.common import importutils
from quantum.openstack.common import jsonutils
from quantum.openstack.common import log as logging

View File

@ -24,6 +24,7 @@ import sys
import eventlet
from eventlet import semaphore
import netaddr
from oslo.config import cfg
from quantum.agent.common import config
from quantum.agent.linux import external_process
@ -35,7 +36,6 @@ from quantum.common import constants as l3_constants
from quantum.common import topics
from quantum import context
from quantum import manager
from quantum.openstack.common import cfg
from quantum.openstack.common import importutils
from quantum.openstack.common import log as logging
from quantum.openstack.common import periodic_task

View File

@ -24,10 +24,10 @@ import sys
import tempfile
import netaddr
from oslo.config import cfg
from quantum.agent.linux import ip_lib
from quantum.agent.linux import utils
from quantum.openstack.common import cfg
from quantum.openstack.common import jsonutils
from quantum.openstack.common import log as logging

View File

@ -18,9 +18,10 @@
import os
from oslo.config import cfg
from quantum.agent.linux import ip_lib
from quantum.agent.linux import utils
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
LOG = logging.getLogger(__name__)

View File

@ -18,6 +18,7 @@
import abc
import netaddr
from oslo.config import cfg
from quantum.agent.common import config
from quantum.agent.linux import ip_lib
@ -25,7 +26,6 @@ from quantum.agent.linux import ovs_lib
from quantum.agent.linux import utils
from quantum.common import exceptions
from quantum.extensions.flavor import (FLAVOR_NETWORK)
from quantum.openstack.common import cfg
from quantum.openstack.common import importutils
from quantum.openstack.common import log as logging

View File

@ -16,11 +16,11 @@
# under the License.
import netaddr
from oslo.config import cfg
from quantum.agent import firewall
from quantum.agent.linux import iptables_manager
from quantum.common import constants
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging

View File

@ -24,8 +24,9 @@
import inspect
import os
from oslo.config import cfg
from quantum.agent.linux import utils
from quantum.openstack.common import cfg
from quantum.openstack.common import lockutils
from quantum.openstack.common import log as logging

View File

@ -24,11 +24,11 @@ import urlparse
import eventlet
import httplib2
from oslo.config import cfg
from quantumclient.v2_0 import client
import webob
from quantum.common import config
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum import wsgi

View File

@ -22,11 +22,11 @@ import urlparse
import eventlet
import httplib2
from oslo.config import cfg
import webob
from quantum.agent.linux import daemon
from quantum.common import config
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum import wsgi

View File

@ -18,6 +18,7 @@
import re
import eventlet
from oslo.config import cfg
from quantum.agent import dhcp_agent
from quantum.agent import l3_agent
@ -27,7 +28,6 @@ from quantum.agent.linux import ip_lib
from quantum.agent.linux import ovs_lib
from quantum.api.v2 import attributes
from quantum.common import config
from quantum.openstack.common import cfg
from quantum.openstack.common import importutils
from quantum.openstack.common import log as logging

View File

@ -15,13 +15,14 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from quantum.agent import l3_agent
from quantum.agent.common import config as agent_config
from quantum.agent.linux import interface
from quantum.agent.linux import ip_lib
from quantum.agent.linux import ovs_lib
from quantum.common import config
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging

View File

@ -16,8 +16,9 @@
# under the License.
#
from oslo.config import cfg
from quantum.common import topics
from quantum.openstack.common import cfg
from quantum.openstack.common import importutils
from quantum.openstack.common import log as logging

View File

@ -21,6 +21,7 @@ from abc import ABCMeta
import imp
import os
from oslo.config import cfg
import routes
import webob.dec
import webob.exc
@ -30,7 +31,6 @@ from quantum.common import constants
from quantum.common import exceptions
import quantum.extensions
from quantum.manager import QuantumManager
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum import wsgi

View File

@ -15,6 +15,7 @@
import urlparse
from oslo.config import cfg
import routes as routes_mapper
import webob
import webob.dec
@ -24,7 +25,6 @@ from quantum.api import extensions
from quantum.api.v2 import attributes
from quantum.api.v2 import base
from quantum import manager
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum import wsgi

View File

@ -14,11 +14,11 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
import webob.dec
import webob.exc
from quantum import context
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum import wsgi

View File

@ -21,11 +21,11 @@ Routines for configuring Quantum
import os
from oslo.config import cfg
from paste import deploy
from quantum.api.v2 import attributes
from quantum.common import utils
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum.openstack.common import rpc
from quantum.version import version_info as quantum_version

View File

@ -26,8 +26,8 @@ import signal
import socket
from eventlet.green import subprocess
from oslo.config import cfg
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging

View File

@ -25,6 +25,7 @@ try:
import MySQLdb
except ImportError:
MySQLdb = None
from oslo.config import cfg
import sqlalchemy as sql
from sqlalchemy import create_engine
from sqlalchemy.exc import DisconnectionError
@ -32,7 +33,6 @@ from sqlalchemy.interfaces import PoolListener
from sqlalchemy.orm import sessionmaker
from quantum.db import model_base
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
LOG = logging.getLogger(__name__)

View File

@ -19,6 +19,7 @@ import datetime
import random
import netaddr
from oslo.config import cfg
from sqlalchemy import orm
from sqlalchemy.orm import exc
@ -27,7 +28,6 @@ from quantum.common import constants
from quantum.common import exceptions as q_exc
from quantum.db import api as db
from quantum.db import models_v2
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum.openstack.common import timeutils
from quantum.openstack.common import uuidutils

View File

@ -15,6 +15,7 @@
# under the License.
#
from oslo.config import cfg
import sqlalchemy as sa
from sqlalchemy import orm
from sqlalchemy.orm import exc
@ -28,7 +29,6 @@ from quantum.db import model_base
from quantum.db import models_v2
from quantum.extensions import loadbalancer
from quantum.extensions.loadbalancer import LoadBalancerPluginBase
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum.openstack.common import uuidutils
from quantum.plugins.common import constants

View File

@ -22,9 +22,9 @@ import sys
from alembic import command as alembic_command
from alembic import config as alembic_config
from alembic import util as alembic_util
from oslo.config import cfg
from quantum import manager
from quantum.openstack.common import cfg
_core_opts = [
cfg.StrOpt('core_plugin',

View File

@ -16,6 +16,7 @@
#
# @author: Aaron Rosen, Nicira, Inc
from oslo.config import cfg
import sqlalchemy as sa
from sqlalchemy import orm
from sqlalchemy.orm import exc
@ -25,7 +26,6 @@ from quantum.api.v2 import attributes as attr
from quantum.db import model_base
from quantum.db import models_v2
from quantum.extensions import securitygroup as ext_sg
from quantum.openstack.common import cfg
from quantum.openstack.common import uuidutils

View File

@ -17,6 +17,7 @@
# @author: Salvatore Orlando, VMware
#
from oslo.config import cfg
import sqlalchemy as sa
from sqlalchemy import orm
from sqlalchemy.orm import exc as orm_exc
@ -27,7 +28,6 @@ from quantum import context
from quantum.db import api as db
from quantum.db import model_base
from quantum.db import models_v2
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum import policy

View File

@ -19,12 +19,12 @@ import shlex
import socket
import netaddr
from oslo.config import cfg
from quantum.agent.common import config
from quantum.agent.dhcp_agent import DictModel
from quantum.agent.linux import ip_lib
from quantum.agent.linux import utils
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging

View File

@ -17,10 +17,11 @@
import sys
from oslo.config import cfg
from quantum.agent.common import config
from quantum.agent.linux import interface
from quantum.debug.debug_agent import QuantumDebugAgent
from quantum.openstack.common import cfg
from quantum.openstack.common import importutils
from quantumclient.common import exceptions as exc
from quantumclient.common import utils

View File

@ -20,12 +20,13 @@
from abc import abstractmethod
from oslo.config import cfg
from quantum.api import extensions
from quantum.api.v2 import attributes as attr
from quantum.api.v2 import base
from quantum.common import exceptions as qexception
from quantum import manager
from quantum.openstack.common import cfg
from quantum import quota

View File

@ -15,13 +15,13 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
import webob
from quantum.api import extensions
from quantum.api.v2 import base
from quantum.common import exceptions
from quantum.manager import QuantumManager
from quantum.openstack.common import cfg
from quantum.openstack.common import importutils
from quantum import quota
from quantum import wsgi

View File

@ -17,12 +17,13 @@
from abc import abstractmethod
from oslo.config import cfg
from quantum.api import extensions
from quantum.api.v2 import attributes as attr
from quantum.api.v2 import base
from quantum.common import exceptions as qexception
from quantum import manager
from quantum.openstack.common import cfg
from quantum.openstack.common import uuidutils
from quantum import quota

View File

@ -16,8 +16,9 @@
# under the License.
# @author: Somik Behera, Nicira Networks, Inc.
from oslo.config import cfg
from quantum.common.exceptions import ClassNotFound
from quantum.openstack.common import cfg
from quantum.openstack.common import importutils
from quantum.openstack.common import log as logging
from quantum.openstack.common import periodic_task

File diff suppressed because it is too large Load Diff

View File

@ -24,8 +24,7 @@ import traceback
import eventlet
import eventlet.backdoor
import greenlet
from quantum.openstack.common import cfg
from oslo.config import cfg
eventlet_backdoor_opts = [
cfg.IntOpt('backdoor_port',

View File

@ -1,130 +0,0 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2012 OpenStack LLC.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
class ParseError(Exception):
def __init__(self, message, lineno, line):
self.msg = message
self.line = line
self.lineno = lineno
def __str__(self):
return 'at line %d, %s: %r' % (self.lineno, self.msg, self.line)
class BaseParser(object):
lineno = 0
parse_exc = ParseError
def _assignment(self, key, value):
self.assignment(key, value)
return None, []
def _get_section(self, line):
if line[-1] != ']':
return self.error_no_section_end_bracket(line)
if len(line) <= 2:
return self.error_no_section_name(line)
return line[1:-1]
def _split_key_value(self, line):
colon = line.find(':')
equal = line.find('=')
if colon < 0 and equal < 0:
return self.error_invalid_assignment(line)
if colon < 0 or (equal >= 0 and equal < colon):
key, value = line[:equal], line[equal + 1:]
else:
key, value = line[:colon], line[colon + 1:]
value = value.strip()
if ((value and value[0] == value[-1]) and
(value[0] == "\"" or value[0] == "'")):
value = value[1:-1]
return key.strip(), [value]
def parse(self, lineiter):
key = None
value = []
for line in lineiter:
self.lineno += 1
line = line.rstrip()
if not line:
# Blank line, ends multi-line values
if key:
key, value = self._assignment(key, value)
continue
elif line[0] in (' ', '\t'):
# Continuation of previous assignment
if key is None:
self.error_unexpected_continuation(line)
else:
value.append(line.lstrip())
continue
if key:
# Flush previous assignment, if any
key, value = self._assignment(key, value)
if line[0] == '[':
# Section start
section = self._get_section(line)
if section:
self.new_section(section)
elif line[0] in '#;':
self.comment(line[1:].lstrip())
else:
key, value = self._split_key_value(line)
if not key:
return self.error_empty_key(line)
if key:
# Flush previous assignment, if any
self._assignment(key, value)
def assignment(self, key, value):
"""Called when a full assignment is parsed"""
raise NotImplementedError()
def new_section(self, section):
"""Called when a new section is started"""
raise NotImplementedError()
def comment(self, comment):
"""Called when a comment is parsed"""
pass
def error_invalid_assignment(self, line):
raise self.parse_exc("No ':' or '=' found in assignment",
self.lineno, line)
def error_empty_key(self, line):
raise self.parse_exc('Key cannot be empty', self.lineno, line)
def error_unexpected_continuation(self, line):
raise self.parse_exc('Unexpected continuation line',
self.lineno, line)
def error_no_section_end_bracket(self, line):
raise self.parse_exc('Invalid section (must end with ])',
self.lineno, line)
def error_no_section_name(self, line):
raise self.parse_exc('Empty section name', self.lineno, line)

View File

@ -25,8 +25,8 @@ import time
import weakref
from eventlet import semaphore
from oslo.config import cfg
from quantum.openstack.common import cfg
from quantum.openstack.common import fileutils
from quantum.openstack.common.gettextutils import _
from quantum.openstack.common import local

View File

@ -40,7 +40,8 @@ import stat
import sys
import traceback
from quantum.openstack.common import cfg
from oslo.config import cfg
from quantum.openstack.common.gettextutils import _
from quantum.openstack.common import jsonutils
from quantum.openstack.common import local

View File

@ -15,7 +15,8 @@
import uuid
from quantum.openstack.common import cfg
from oslo.config import cfg
from quantum.openstack.common import context
from quantum.openstack.common.gettextutils import _
from quantum.openstack.common import importutils

View File

@ -14,7 +14,8 @@
# under the License.
from quantum.openstack.common import cfg
from oslo.config import cfg
from quantum.openstack.common import jsonutils
from quantum.openstack.common import log as logging

View File

@ -14,7 +14,8 @@
# under the License.
from quantum.openstack.common import cfg
from oslo.config import cfg
from quantum.openstack.common import context as req_context
from quantum.openstack.common.gettextutils import _
from quantum.openstack.common import log as logging

View File

@ -15,7 +15,8 @@
'''messaging based notification driver, with message envelopes'''
from quantum.openstack.common import cfg
from oslo.config import cfg
from quantum.openstack.common import context as req_context
from quantum.openstack.common.gettextutils import _
from quantum.openstack.common import log as logging

View File

@ -28,7 +28,8 @@ For some wrappers that add message versioning to rpc, see:
import inspect
import logging
from quantum.openstack.common import cfg
from oslo.config import cfg
from quantum.openstack.common.gettextutils import _
from quantum.openstack.common import importutils
from quantum.openstack.common import local

View File

@ -21,7 +21,8 @@ import copy
import sys
import traceback
from quantum.openstack.common import cfg
from oslo.config import cfg
from quantum.openstack.common.gettextutils import _
from quantum.openstack.common import importutils
from quantum.openstack.common import jsonutils

View File

@ -28,8 +28,8 @@ import kombu
import kombu.connection
import kombu.entity
import kombu.messaging
from oslo.config import cfg
from quantum.openstack.common import cfg
from quantum.openstack.common.gettextutils import _
from quantum.openstack.common import network_utils
from quantum.openstack.common.rpc import amqp as rpc_amqp

View File

@ -22,8 +22,8 @@ import uuid
import eventlet
import greenlet
from oslo.config import cfg
from quantum.openstack.common import cfg
from quantum.openstack.common.gettextutils import _
from quantum.openstack.common import importutils
from quantum.openstack.common import jsonutils

View File

@ -23,8 +23,8 @@ import uuid
import eventlet
import greenlet
from oslo.config import cfg
from quantum.openstack.common import cfg
from quantum.openstack.common.gettextutils import _
from quantum.openstack.common import importutils
from quantum.openstack.common import jsonutils

View File

@ -22,7 +22,8 @@ import contextlib
import itertools
import json
from quantum.openstack.common import cfg
from oslo.config import cfg
from quantum.openstack.common.gettextutils import _
from quantum.openstack.common import log as logging

View File

@ -28,8 +28,8 @@ import time
import eventlet
import logging as std_logging
from oslo.config import cfg
from quantum.openstack.common import cfg
from quantum.openstack.common import eventlet_backdoor
from quantum.openstack.common.gettextutils import _
from quantum.openstack.common import importutils

View File

@ -50,6 +50,8 @@ import httplib
import json
import socket
from oslo.config import cfg
from quantum.common import constants as const
from quantum.common import exceptions
from quantum.common import rpc as q_rpc
@ -61,7 +63,6 @@ from quantum.db import db_base_plugin_v2
from quantum.db import dhcp_rpc_base
from quantum.db import l3_db
from quantum.extensions import l3
from quantum.openstack.common import cfg
from quantum.openstack.common import lockutils
from quantum.openstack.common import log as logging
from quantum.openstack.common import rpc

View File

@ -26,6 +26,9 @@
"""
Implentation of Brocade Quantum Plugin.
"""
from oslo.config import cfg
from quantum.agent import securitygroups_rpc as sg_rpc
from quantum.common import rpc as q_rpc
from quantum.common import topics
@ -38,7 +41,6 @@ from quantum.db import l3_rpc_base
from quantum.db import securitygroups_rpc_base as sg_db_rpc
from quantum.extensions import portbindings
from quantum.extensions import securitygroup as ext_sg
from quantum.openstack.common import cfg
from quantum.openstack.common import context
from quantum.openstack.common import importutils
from quantum.openstack.common import log as logging

View File

@ -17,15 +17,16 @@
import inspect
import logging
import mock
import os
import mock
from oslo.config import cfg
import webtest
from quantum.api.extensions import PluginAwareExtensionManager
from quantum.api.v2 import router
from quantum.common import config
from quantum.manager import QuantumManager
from quantum.openstack.common import cfg
from quantum.tests.unit import test_api_v2

View File

@ -24,11 +24,12 @@ import re
import sys
import time
from oslo.config import cfg
from quantum.agent import rpc as agent_rpc
from quantum.common import config as logging_config
from quantum.common import topics
from quantum import context
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum.openstack.common.rpc import dispatcher
from quantum.plugins.hyperv.agent import utils

View File

@ -21,8 +21,9 @@
import sys
import time
from oslo.config import cfg
from quantum.common import exceptions as q_exc
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
# Check needed for unit testing on Unix

View File

@ -16,6 +16,8 @@
# under the License.
# @author: Alessandro Pilotti, Cloudbase Solutions Srl
from oslo.config import cfg
from quantum.api.v2 import attributes
from quantum.common import exceptions as q_exc
from quantum.common import topics
@ -25,7 +27,6 @@ from quantum.db import l3_db
from quantum.db import quota_db
from quantum.extensions import portbindings
from quantum.extensions import providernet as provider
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum.openstack.common import rpc
from quantum.plugins.hyperv import agent_notifier_api

View File

@ -27,6 +27,7 @@ import sys
import time
import eventlet
from oslo.config import cfg
import pyudev
from quantum.agent.linux import ip_lib
@ -37,7 +38,6 @@ from quantum.common import config as logging_config
from quantum.common import topics
from quantum.common import utils as q_utils
from quantum import context
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum.openstack.common.rpc import dispatcher
# NOTE (e0ne): this import is needed for config init

View File

@ -17,8 +17,9 @@
# @author: Sumit Naiksatam, Cisco Systems, Inc.
# @author: Rohit Agarwalla, Cisco Systems, Inc.
from oslo.config import cfg
from quantum.agent.common import config
from quantum.openstack.common import cfg
DEFAULT_VLAN_RANGES = []
DEFAULT_INTERFACE_MAPPINGS = []

View File

@ -15,6 +15,8 @@
import sys
from oslo.config import cfg
from quantum.agent import securitygroups_rpc as sg_rpc
from quantum.api.v2 import attributes
from quantum.common import constants as q_const
@ -33,7 +35,6 @@ from quantum.db import securitygroups_rpc_base as sg_db_rpc
from quantum.extensions import portbindings
from quantum.extensions import providernet as provider
from quantum.extensions import securitygroup as ext_sg
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum.openstack.common import rpc
from quantum.openstack.common.rpc import proxy

View File

@ -15,7 +15,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from quantum.openstack.common import cfg
from oslo.config import cfg
meta_plugin_opts = [

View File

@ -15,13 +15,14 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from quantum.common import exceptions as exc
from quantum.db import api as db
from quantum.db import db_base_plugin_v2
from quantum.db import l3_db
from quantum.db import models_v2
from quantum.extensions.flavor import (FLAVOR_NETWORK, FLAVOR_ROUTER)
from quantum.openstack.common import cfg
from quantum.openstack.common import importutils
from quantum.openstack.common import log as logging
# NOTE (e0ne): this import is needed for config init

View File

@ -15,10 +15,11 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from quantum.db import api as db
from quantum.db import db_base_plugin_v2
from quantum.db import l3_db
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantumclient.common import exceptions
from quantumclient.v2_0 import client

View File

@ -15,8 +15,9 @@
# under the License.
# @author: Ryota MIBU
from oslo.config import cfg
from quantum.agent.common import config
from quantum.openstack.common import cfg
# import rpc config options
from quantum.openstack.common import rpc

View File

@ -18,11 +18,12 @@
# @author: Ryota MIBU
#
from oslo.config import cfg
from quantum.api import extensions
from quantum.api.v2 import attributes
from quantum.api.v2 import base
from quantum.manager import QuantumManager
from quantum.openstack.common import cfg
from quantum import quota

View File

@ -23,6 +23,7 @@
import hashlib
import logging
from oslo.config import cfg
from sqlalchemy.orm import exc as sa_exc
import webob.exc
@ -45,7 +46,6 @@ from quantum.extensions import l3
from quantum.extensions import portsecurity as psec
from quantum.extensions import providernet as pnet
from quantum.extensions import securitygroup as ext_sg
from quantum.openstack.common import cfg
from quantum.openstack.common import rpc
from quantum.plugins.nicira.nicira_nvp_plugin.common import (securitygroups
as nvp_sec)

View File

@ -14,8 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from quantum.openstack.common import cfg
from oslo.config import cfg
core_opts = [
cfg.BoolOpt('metadata_dhcp_host_route', default=False),

View File

@ -24,6 +24,7 @@ import sys
import time
import eventlet
from oslo.config import cfg
from quantum.agent.linux import ip_lib
from quantum.agent.linux import ovs_lib
@ -34,7 +35,6 @@ from quantum.common import config as logging_config
from quantum.common import topics
from quantum.common import utils as q_utils
from quantum import context
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum.openstack.common.rpc import dispatcher
from quantum.plugins.openvswitch.common import config

View File

@ -14,8 +14,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from quantum.agent.common import config
from quantum.openstack.common import cfg
DEFAULT_BRIDGE_MAPPINGS = []

View File

@ -18,13 +18,14 @@
from sqlalchemy.orm import exc
from oslo.config import cfg
from quantum.common import exceptions as q_exc
import quantum.db.api as db
from quantum.db import models_v2
from quantum.db import securitygroups_db as sg_db
from quantum.extensions import securitygroup as ext_sg
from quantum import manager
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum.plugins.openvswitch.common import constants
from quantum.plugins.openvswitch import ovs_models_v2

View File

@ -22,6 +22,8 @@
import sys
from oslo.config import cfg
from quantum.agent import securitygroups_rpc as sg_rpc
from quantum.api.v2 import attributes
from quantum.common import constants as q_const
@ -38,7 +40,6 @@ from quantum.db import securitygroups_rpc_base as sg_db_rpc
from quantum.extensions import portbindings
from quantum.extensions import providernet as provider
from quantum.extensions import securitygroup as ext_sg
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum.openstack.common import rpc
from quantum.openstack.common.rpc import proxy

View File

@ -23,9 +23,10 @@ to the Network Operating System by PLUMgrid called NOS
import sys
from oslo.config import cfg
from quantum.db import api as db
from quantum.db import db_base_plugin_v2
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum.plugins.plumgrid.common import exceptions as plum_excep
from quantum.plugins.plumgrid.plumgrid_nos_plugin import plumgrid_nos_snippets

View File

@ -25,6 +25,7 @@ import socket
import sys
import netifaces
from oslo.config import cfg
from ryu.app import client
from ryu.app import conf_switch_key
from ryu.app import rest_nw_id
@ -36,9 +37,6 @@ from quantum.common import config as logging_config
from quantum.common import exceptions as q_exc
from quantum.common import topics
from quantum import context as q_context
from quantum.openstack.common import cfg
from quantum.openstack.common.cfg import NoSuchGroupError
from quantum.openstack.common.cfg import NoSuchOptError
from quantum.openstack.common import log
from quantum.plugins.ryu.common import config
@ -68,7 +66,7 @@ def _get_ip(cfg_ip_str, cfg_interface_str):
ip = None
try:
ip = getattr(cfg.CONF.OVS, cfg_ip_str)
except (NoSuchOptError, NoSuchGroupError):
except (cfg.NoSuchOptError, cfg.NoSuchGroupError):
pass
if ip:
return ip
@ -76,7 +74,7 @@ def _get_ip(cfg_ip_str, cfg_interface_str):
iface = None
try:
iface = getattr(cfg.CONF.OVS, cfg_interface_str)
except (NoSuchOptError, NoSuchGroupError):
except (cfg.NoSuchOptError, cfg.NoSuchGroupError):
pass
if iface:
iface = netifaces.ifaddresses(iface)[netifaces.AF_INET][0]

View File

@ -14,8 +14,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
from quantum.agent.common import config
from quantum.openstack.common import cfg
ovs_opts = [

View File

@ -16,6 +16,7 @@
# under the License.
# @author: Isaku Yamahata
from oslo.config import cfg
from ryu.app import client
from ryu.app import rest_nw_id
@ -29,7 +30,6 @@ from quantum.db import dhcp_rpc_base
from quantum.db import l3_db
from quantum.db import l3_rpc_base
from quantum.db import models_v2
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum.openstack.common import rpc
from quantum.plugins.ryu.common import config

View File

@ -19,10 +19,11 @@
Policy engine for quantum. Largely copied from nova.
"""
from oslo.config import cfg
from quantum.api.v2 import attributes
from quantum.common import exceptions
import quantum.common.utils as utils
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging
from quantum.openstack.common import policy

View File

@ -16,8 +16,9 @@
"""Quotas for instances, volumes, and floating ips."""
from oslo.config import cfg
from quantum.common import exceptions
from quantum.openstack.common import cfg
from quantum.openstack.common import importutils
from quantum.openstack.common import log as logging

View File

@ -21,8 +21,9 @@
import sys
from oslo.config import cfg
from quantum.common import config
from quantum.openstack.common import cfg
from quantum import service

View File

@ -20,9 +20,10 @@ import logging as std_logging
import os
import random
from oslo.config import cfg
from quantum.common import config
from quantum import context
from quantum.openstack.common import cfg
from quantum.openstack.common import importutils
from quantum.openstack.common import log as logging
from quantum.openstack.common import loopingcall

View File

@ -24,7 +24,7 @@ import unittest
setattr(__builtin__, '_', lambda x: x)
from quantum.openstack.common import cfg
from oslo.config import cfg
reldir = os.path.join(os.path.dirname(__file__), '..', '..', '..')

View File

@ -20,10 +20,11 @@
import contextlib
from oslo.config import cfg
from quantum import context
from quantum.extensions import portbindings
from quantum.manager import QuantumManager
from quantum.openstack.common import cfg
from quantum.tests.unit import test_db_plugin

View File

@ -21,12 +21,12 @@
import os
from mock import patch
from oslo.config import cfg
from webob import exc
from quantum.common.test_lib import test_config
from quantum.extensions import l3
from quantum.manager import QuantumManager
from quantum.openstack.common import cfg
from quantum.openstack.common.notifier import api as notifier_api
from quantum.openstack.common.notifier import test_notifier
from quantum.tests.unit import test_l3_plugin

View File

@ -17,6 +17,7 @@ import contextlib
import logging
import os
from oslo.config import cfg
import webob.exc
from quantum.api.extensions import ExtensionMiddleware
@ -29,7 +30,6 @@ from quantum.db import api as db
import quantum.extensions
from quantum.extensions import loadbalancer
from quantum.manager import QuantumManager
from quantum.openstack.common import cfg
from quantum.plugins.common import constants
from quantum.plugins.services.loadbalancer import loadbalancerPlugin
from quantum.tests.unit import testlib_api

View File

@ -23,9 +23,9 @@ Unit tests for Windows Hyper-V virtual switch quantum driver
import sys
import mock
from oslo.config import cfg
import unittest2 as unittest
from quantum.openstack.common import cfg
from quantum.plugins.hyperv.agent import hyperv_quantum_agent

View File

@ -18,10 +18,11 @@
import contextlib
from oslo.config import cfg
from quantum import context
from quantum.extensions import portbindings
from quantum.manager import QuantumManager
from quantum.openstack.common import cfg
from quantum.tests.unit import test_db_plugin as test_plugin

View File

@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from oslo.config import cfg
import unittest2 as unittest
from quantum.openstack.common import cfg
#NOTE this import loads tests required options
from quantum.plugins.linuxbridge.common import config

View File

@ -15,9 +15,9 @@
# under the License.
import mock
from oslo.config import cfg
import unittest2 as unittest
from quantum.openstack.common import cfg
from quantum.plugins.linuxbridge.agent import linuxbridge_quantum_agent
from quantum.plugins.linuxbridge.common import constants as lconst

View File

@ -19,6 +19,7 @@ import os
import mock
import mox
from oslo.config import cfg
import stubout
import unittest2 as unittest
@ -26,7 +27,6 @@ from quantum import context
from quantum.db import api as db
from quantum.db import models_v2
from quantum.extensions.flavor import (FLAVOR_NETWORK, FLAVOR_ROUTER)
from quantum.openstack.common import cfg
from quantum.openstack.common import uuidutils
from quantum.plugins.metaplugin.meta_quantum_plugin import FlavorNotFound
from quantum.plugins.metaplugin.meta_quantum_plugin import MetaPluginV2

View File

@ -15,7 +15,8 @@
import unittest2 as unittest
from quantum.openstack.common import cfg
from oslo.config import cfg
from quantum.plugins.nicira.nicira_nvp_plugin.common import config

View File

@ -18,6 +18,7 @@ import logging
import os
import mock
from oslo.config import cfg
import webob.exc
import quantum.common.test_lib as test_lib
@ -25,7 +26,6 @@ from quantum import context
from quantum.extensions import providernet as pnet
from quantum.extensions import securitygroup as secgrp
from quantum import manager
from quantum.openstack.common import cfg
from quantum.plugins.nicira.nicira_nvp_plugin.extensions import (nvp_qos
as ext_qos)
from quantum.plugins.nicira.nicira_nvp_plugin import nvplib

View File

@ -15,7 +15,8 @@
import unittest
from quantum.openstack.common import cfg
from oslo.config import cfg
#NOTE this import loads tests required options
from quantum.plugins.openvswitch.common import config

View File

@ -15,9 +15,9 @@
# under the License.
import mock
from oslo.config import cfg
import unittest2 as unittest
from quantum.openstack.common import cfg
from quantum.plugins.openvswitch.agent import ovs_quantum_agent

View File

@ -19,12 +19,12 @@
import unittest
import mox
from oslo.config import cfg
from quantum.agent.linux import ip_lib
from quantum.agent.linux import ovs_lib
from quantum.agent.linux import utils
from quantum.agent import rpc
from quantum.openstack.common import cfg
from quantum.openstack.common import log
from quantum.plugins.openvswitch.agent import ovs_quantum_agent
from quantum.plugins.openvswitch.common import constants

View File

@ -15,9 +15,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo.config import cfg
import unittest2
from quantum.openstack.common import cfg
#NOTE this import loads tests required options
from quantum.plugins.ryu.common import config

View File

@ -18,8 +18,9 @@
from contextlib import nested
import operator
from oslo.config import cfg
from quantum.db import api as db
from quantum.openstack.common import cfg
# NOTE: this import is needed for correct plugin code work
from quantum.plugins.ryu.common import config
from quantum.plugins.ryu.db import api_v2 as db_api_v2

View File

@ -16,10 +16,10 @@
# under the License.
import mock
from oslo.config import cfg
import unittest2 as unittest
from quantum.agent import netns_cleanup_util as util
from quantum.openstack.common import cfg
class TestNullDelegate(unittest.TestCase):

View File

@ -18,12 +18,12 @@
import contextlib
import itertools
import mock
from oslo.config import cfg
import unittest2 as unittest
from quantum.agent.linux import ip_lib
from quantum.agent.linux import ovs_lib
from quantum.agent import ovs_cleanup_util as util
from quantum.openstack.common import cfg
from quantum.openstack.common import uuidutils

View File

@ -18,9 +18,9 @@
import unittest
import mock
from oslo.config import cfg
from quantum.agent import rpc
from quantum.openstack.common import cfg
from quantum.openstack.common import context

View File

@ -18,6 +18,7 @@
import os
import mock
from oslo.config import cfg
import unittest2 as unittest
import webob
from webob import exc
@ -32,7 +33,6 @@ from quantum.common import constants
from quantum.common import exceptions as q_exc
from quantum import context
from quantum.manager import QuantumManager
from quantum.openstack.common import cfg
from quantum.openstack.common.notifier import api as notifer_api
from quantum.openstack.common import uuidutils
from quantum.tests.unit import testlib_api

View File

@ -16,8 +16,9 @@
import os
import unittest
from oslo.config import cfg
from quantum.common import config
from quantum.openstack.common import cfg
class ConfigurationTest(unittest.TestCase):

View File

@ -15,12 +15,11 @@
"""Test of DB API"""
import mock
from oslo.config import cfg
import unittest2 as unittest
import mock
import quantum.db.api as db
from quantum.openstack.common import cfg
class DBTestCase(unittest.TestCase):

View File

@ -22,6 +22,7 @@ import os
import random
import mock
from oslo.config import cfg
import sqlalchemy as sa
import unittest2
import webob.exc
@ -39,7 +40,6 @@ from quantum.db import api as db
from quantum.db import db_base_plugin_v2
from quantum.db import models_v2
from quantum.manager import QuantumManager
from quantum.openstack.common import cfg
from quantum.openstack.common import timeutils
from quantum.tests.unit import test_extensions
from quantum.tests.unit import testlib_api

View File

@ -18,13 +18,13 @@
import socket
import mock
from oslo.config import cfg
import unittest2 as unittest
from quantum.agent.common import config
from quantum.agent.linux import interface
from quantum.debug import commands
from quantum.debug.debug_agent import DEVICE_OWNER_PROBE, QuantumDebugAgent
from quantum.openstack.common import cfg
class MyApp(object):

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