From 4bc07a55ff686deb3a3747150a8068ce161d3011 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 5 Nov 2012 11:57:53 -0500 Subject: [PATCH] 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 --- etc/api-paste.ini | 2 +- quantum/{extensions => api}/extensions.py | 0 quantum/api/v2/router.py | 2 +- quantum/extensions/credential.py | 2 +- quantum/extensions/l3.py | 2 +- quantum/extensions/multiport.py | 2 +- quantum/extensions/novatenant.py | 2 +- quantum/extensions/portprofile.py | 2 +- quantum/extensions/qos.py | 2 +- quantum/extensions/quotasv2.py | 2 +- quantum/extensions/securitygroup.py | 2 +- .../plugins/cisco/tests/unit/test_cisco_extension.py | 10 +++++----- quantum/plugins/cisco/tests/unit/v2/test_api_v2.py | 2 +- quantum/plugins/nec/extensions/packetfilter.py | 2 +- quantum/tests/unit/extension_stubs.py | 2 +- quantum/tests/unit/extensions/foxinsocks.py | 2 +- quantum/tests/unit/test_api_v2.py | 2 +- quantum/tests/unit/test_db_plugin.py | 2 +- quantum/tests/unit/test_extension_security_group.py | 2 +- quantum/tests/unit/test_extensions.py | 10 +++++----- quantum/tests/unit/test_l3_plugin.py | 2 +- quantum/tests/unit/test_quota_per_tenant_ext.py | 2 +- 22 files changed, 29 insertions(+), 29 deletions(-) rename quantum/{extensions => api}/extensions.py (100%) diff --git a/etc/api-paste.ini b/etc/api-paste.ini index a028d5bf8..d697876a5 100644 --- a/etc/api-paste.ini +++ b/etc/api-paste.ini @@ -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 diff --git a/quantum/extensions/extensions.py b/quantum/api/extensions.py similarity index 100% rename from quantum/extensions/extensions.py rename to quantum/api/extensions.py diff --git a/quantum/api/v2/router.py b/quantum/api/v2/router.py index ca561d01f..f9d2ced2d 100644 --- a/quantum/api/v2/router.py +++ b/quantum/api/v2/router.py @@ -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 diff --git a/quantum/extensions/credential.py b/quantum/extensions/credential.py index 45e9ddcd3..24caa6c34 100644 --- a/quantum/extensions/credential.py +++ b/quantum/extensions/credential.py @@ -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 diff --git a/quantum/extensions/l3.py b/quantum/extensions/l3.py index ccd3a2ec1..7fe4a54f2 100644 --- a/quantum/extensions/l3.py +++ b/quantum/extensions/l3.py @@ -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 diff --git a/quantum/extensions/multiport.py b/quantum/extensions/multiport.py index 3be885462..5f632eabc 100644 --- a/quantum/extensions/multiport.py +++ b/quantum/extensions/multiport.py @@ -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 diff --git a/quantum/extensions/novatenant.py b/quantum/extensions/novatenant.py index e2145dae8..cae22484e 100644 --- a/quantum/extensions/novatenant.py +++ b/quantum/extensions/novatenant.py @@ -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 diff --git a/quantum/extensions/portprofile.py b/quantum/extensions/portprofile.py index 18fcf51ae..1e65d14c9 100644 --- a/quantum/extensions/portprofile.py +++ b/quantum/extensions/portprofile.py @@ -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 diff --git a/quantum/extensions/qos.py b/quantum/extensions/qos.py index c596f1ffb..179eaa4a9 100644 --- a/quantum/extensions/qos.py +++ b/quantum/extensions/qos.py @@ -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 diff --git a/quantum/extensions/quotasv2.py b/quantum/extensions/quotasv2.py index e00eadc8d..ddc35d361 100644 --- a/quantum/extensions/quotasv2.py +++ b/quantum/extensions/quotasv2.py @@ -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 diff --git a/quantum/extensions/securitygroup.py b/quantum/extensions/securitygroup.py index 148ed4726..6d647abe1 100644 --- a/quantum/extensions/securitygroup.py +++ b/quantum/extensions/securitygroup.py @@ -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 diff --git a/quantum/plugins/cisco/tests/unit/test_cisco_extension.py b/quantum/plugins/cisco/tests/unit/test_cisco_extension.py index 4e272f9f8..0ddfe7879 100644 --- a/quantum/plugins/cisco/tests/unit/test_cisco_extension.py +++ b/quantum/plugins/cisco/tests/unit/test_cisco_extension.py @@ -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 diff --git a/quantum/plugins/cisco/tests/unit/v2/test_api_v2.py b/quantum/plugins/cisco/tests/unit/v2/test_api_v2.py index c20427de7..5fe091542 100644 --- a/quantum/plugins/cisco/tests/unit/v2/test_api_v2.py +++ b/quantum/plugins/cisco/tests/unit/v2/test_api_v2.py @@ -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 diff --git a/quantum/plugins/nec/extensions/packetfilter.py b/quantum/plugins/nec/extensions/packetfilter.py index 719a7143e..18f95328e 100644 --- a/quantum/plugins/nec/extensions/packetfilter.py +++ b/quantum/plugins/nec/extensions/packetfilter.py @@ -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 diff --git a/quantum/tests/unit/extension_stubs.py b/quantum/tests/unit/extension_stubs.py index f45491082..7797a2a25 100644 --- a/quantum/tests/unit/extension_stubs.py +++ b/quantum/tests/unit/extension_stubs.py @@ -16,7 +16,7 @@ from abc import abstractmethod -from quantum.extensions import extensions +from quantum.api import extensions from quantum import wsgi diff --git a/quantum/tests/unit/extensions/foxinsocks.py b/quantum/tests/unit/extensions/foxinsocks.py index e0ac2eda6..31e201880 100644 --- a/quantum/tests/unit/extensions/foxinsocks.py +++ b/quantum/tests/unit/extensions/foxinsocks.py @@ -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 diff --git a/quantum/tests/unit/test_api_v2.py b/quantum/tests/unit/test_api_v2.py index 619af9f45..02a7f4848 100644 --- a/quantum/tests/unit/test_api_v2.py +++ b/quantum/tests/unit/test_api_v2.py @@ -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 diff --git a/quantum/tests/unit/test_db_plugin.py b/quantum/tests/unit/test_db_plugin.py index e5dc0ef3f..a2c9b2f62 100644 --- a/quantum/tests/unit/test_db_plugin.py +++ b/quantum/tests/unit/test_db_plugin.py @@ -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 diff --git a/quantum/tests/unit/test_extension_security_group.py b/quantum/tests/unit/test_extension_security_group.py index 83c17713d..647a7f594 100644 --- a/quantum/tests/unit/test_extension_security_group.py +++ b/quantum/tests/unit/test_extension_security_group.py @@ -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 diff --git a/quantum/tests/unit/test_extensions.py b/quantum/tests/unit/test_extensions.py index 8a72b4c06..ffabca041 100644 --- a/quantum/tests/unit/test_extensions.py +++ b/quantum/tests/unit/test_extensions.py @@ -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 diff --git a/quantum/tests/unit/test_l3_plugin.py b/quantum/tests/unit/test_l3_plugin.py index 951f73f97..11f7eae1b 100644 --- a/quantum/tests/unit/test_l3_plugin.py +++ b/quantum/tests/unit/test_l3_plugin.py @@ -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 diff --git a/quantum/tests/unit/test_quota_per_tenant_ext.py b/quantum/tests/unit/test_quota_per_tenant_ext.py index a375bee92..1f8ff5c99 100644 --- a/quantum/tests/unit/test_quota_per_tenant_ext.py +++ b/quantum/tests/unit/test_quota_per_tenant_ext.py @@ -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 -- 2.45.2