Move extension.py into quantum/api.

This change moves extensions.py out of the extensions module
and into the api module. This resolves an issue where the
following log WARNING message would occur each time the Quantum
API starts:

Did not find expected name "Extensions" in
/usr/lib/python2.7/site-packages/quantum/extensions/extensions.py

Fixes LP Bug #1074895.

Change-Id: Ia5ed206870551f9b33b74dcdc9d0503e447f298d
changes/25/15425/5
Dan Prince 2012-11-05 11:57:53 -05:00
parent bf0e73f300
commit 4bc07a55ff
22 changed files with 29 additions and 29 deletions

View File

@ -21,7 +21,7 @@ admin_user = %SERVICE_USER%
admin_password = %SERVICE_PASSWORD%
[filter:extensions]
paste.filter_factory = quantum.extensions.extensions:plugin_aware_extension_middleware_factory
paste.filter_factory = quantum.api.extensions:plugin_aware_extension_middleware_factory
[app:quantumversions]
paste.app_factory = quantum.api.versions:Versions.factory

View File

@ -20,9 +20,9 @@ import webob
import webob.dec
import webob.exc
from quantum.api import extensions
from quantum.api.v2 import attributes
from quantum.api.v2 import base
from quantum.extensions import extensions
from quantum import manager
from quantum.openstack.common import cfg
from quantum.openstack.common import log as logging

View File

@ -21,8 +21,8 @@ import logging
from webob import exc
from quantum.api import api_common as common
from quantum.api import extensions
from quantum.extensions import _credential_view as credential_view
from quantum.extensions import extensions
from quantum.manager import QuantumManager
from quantum.plugins.cisco.common import cisco_exceptions as exception
from quantum.plugins.cisco.common import cisco_faults as faults

View File

@ -21,10 +21,10 @@
from abc import abstractmethod
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.extensions import extensions
from quantum import manager
from quantum.openstack.common import cfg
from quantum import quota

View File

@ -21,8 +21,8 @@ import logging
from webob import exc
from quantum.api import api_common as common
from quantum.api import extensions
from quantum.api.views import ports as port_view
from quantum.extensions import extensions
from quantum.manager import QuantumManager
from quantum.plugins.cisco.common import cisco_faults as faults
from quantum import wsgi

View File

@ -19,9 +19,9 @@
from webob import exc
from quantum.api import api_common as common
from quantum.api import extensions
from quantum.common import exceptions as qexception
from quantum.extensions import _novatenant_view as novatenant_view
from quantum.extensions import extensions
from quantum.manager import QuantumManager
from quantum.plugins.cisco.common import cisco_faults as faults
from quantum import wsgi

View File

@ -19,9 +19,9 @@
from webob import exc
from quantum.api import api_common as common
from quantum.api import extensions
from quantum.common import exceptions as qexception
from quantum.extensions import _pprofiles as pprofiles_view
from quantum.extensions import extensions
from quantum.manager import QuantumManager
from quantum.plugins.cisco.common import cisco_exceptions as exception
from quantum.plugins.cisco.common import cisco_faults as faults

View File

@ -21,8 +21,8 @@ import logging
from webob import exc
from quantum.api import api_common as common
from quantum.api import extensions
from quantum.extensions import _qos_view as qos_view
from quantum.extensions import extensions
from quantum.manager import QuantumManager
from quantum.plugins.cisco.common import cisco_exceptions as exception
from quantum.plugins.cisco.common import cisco_faults as faults

View File

@ -17,11 +17,11 @@
import webob
from quantum.api import extensions
from quantum.api.v2 import base
from quantum.common import exceptions
from quantum.extensions import _quotav2_driver as quotav2_driver
from quantum.extensions import _quotav2_model as quotav2_model
from quantum.extensions import extensions
from quantum.manager import QuantumManager
from quantum.openstack.common import cfg
from quantum import quota

View File

@ -16,10 +16,10 @@
from abc import abstractmethod
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.extensions import extensions
from quantum import manager
from quantum.openstack.common import cfg
from quantum import quota

View File

@ -27,19 +27,19 @@ import webob
from webtest import TestApp
from quantum import api as server
from quantum.api import extensions
from quantum.api.extensions import (
ExtensionMiddleware,
PluginAwareExtensionManager,
)
from quantum.common import config
from quantum.extensions import (
credential,
extensions,
multiport,
novatenant,
portprofile,
qos,
)
from quantum.extensions.extensions import (
ExtensionMiddleware,
PluginAwareExtensionManager,
)
from quantum.manager import QuantumManager
from quantum.openstack.common import jsonutils
from quantum.plugins.cisco.db import api as db

View File

@ -20,7 +20,7 @@ import webtest
from quantum.api.v2 import router
from quantum.common import config
from quantum.extensions.extensions import PluginAwareExtensionManager
from quantum.api.extensions import PluginAwareExtensionManager
from quantum.manager import QuantumManager
from quantum.openstack.common import cfg
from quantum.tests.unit import test_api_v2

View File

@ -15,9 +15,9 @@
# under the License.
# @author: Ryota MIBU
from quantum.api import extensions
from quantum.api.v2 import attributes
from quantum.api.v2 import base
from quantum.extensions import extensions
from quantum.manager import QuantumManager
from quantum.openstack.common import cfg
from quantum import quota

View File

@ -16,7 +16,7 @@
from abc import abstractmethod
from quantum.extensions import extensions
from quantum.api import extensions
from quantum import wsgi

View File

@ -17,7 +17,7 @@
from abc import abstractmethod
from quantum.extensions import extensions
from quantum.api import extensions
from quantum.openstack.common import jsonutils
from quantum import wsgi

View File

@ -22,6 +22,7 @@ import webtest
from webob import exc
from quantum.api.extensions import PluginAwareExtensionManager
from quantum.api.v2 import attributes
from quantum.api.v2 import base
from quantum.api.v2 import resource as wsgi_resource
@ -29,7 +30,6 @@ from quantum.api.v2 import router
from quantum.common import config
from quantum.common import exceptions as q_exc
from quantum import context
from quantum.extensions.extensions import PluginAwareExtensionManager
from quantum.manager import QuantumManager
from quantum.openstack.common import cfg
from quantum.openstack.common.notifier import api as notifer_api

View File

@ -24,6 +24,7 @@ import unittest2
import webob.exc
import quantum
from quantum.api.extensions import PluginAwareExtensionManager
from quantum.api.v2 import attributes
from quantum.api.v2.attributes import ATTR_NOT_SPECIFIED
from quantum.api.v2.router import APIRouter
@ -34,7 +35,6 @@ from quantum import context
from quantum.db import api as db
from quantum.db import db_base_plugin_v2
from quantum.db import models_v2
from quantum.extensions.extensions import PluginAwareExtensionManager
from quantum.manager import QuantumManager
from quantum.openstack.common import cfg
from quantum.openstack.common import timeutils

View File

@ -20,6 +20,7 @@ import mock
import unittest2
import webob.exc
from quantum.api.extensions import PluginAwareExtensionManager
from quantum.api.v2 import attributes
from quantum.api.v2.router import APIRouter
from quantum.common import config
@ -28,7 +29,6 @@ from quantum import context
from quantum.db import api as db
from quantum.db import db_base_plugin_v2
from quantum.db import securitygroups_db
from quantum.extensions.extensions import PluginAwareExtensionManager
from quantum.extensions import securitygroup as ext_sg
from quantum.manager import QuantumManager
from quantum.openstack.common import cfg

View File

@ -23,15 +23,15 @@ import webob
from webtest import AppError
from webtest import TestApp
from quantum.common import config
from quantum.common import exceptions
from quantum.db.db_base_plugin_v2 import QuantumDbPluginV2
from quantum.extensions import extensions
from quantum.extensions.extensions import (
from quantum.api import extensions
from quantum.api.extensions import (
ExtensionManager,
ExtensionMiddleware,
PluginAwareExtensionManager,
)
from quantum.common import config
from quantum.common import exceptions
from quantum.db.db_base_plugin_v2 import QuantumDbPluginV2
from quantum.openstack.common import jsonutils
from quantum.plugins.common import constants
from quantum.tests.unit import BaseTest

View File

@ -29,6 +29,7 @@ import mock
from webob import exc
import webtest
from quantum.api import extensions
from quantum.api.v2 import attributes
from quantum.common import config
from quantum.common import exceptions as q_exc
@ -38,7 +39,6 @@ from quantum import context
from quantum.db import db_base_plugin_v2
from quantum.db import l3_db
from quantum.db import models_v2
from quantum.extensions import extensions
from quantum.extensions import l3
from quantum import manager
from quantum.openstack.common import cfg

View File

@ -3,11 +3,11 @@ import webtest
import mock
from quantum.api import extensions
from quantum.api.v2 import attributes
from quantum.common import config
from quantum import context
from quantum.db import api as db
from quantum.extensions import extensions
from quantum import manager
from quantum.openstack.common import cfg
from quantum.plugins.linuxbridge.db import l2network_db_v2