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

diff --git a/etc/api-paste.ini b/etc/api-paste.ini
index a028d5bf871f48b7d7bd090332ff04380854c98c..d697876a524a34e7c66a98706bc3f9ebf4c6abc1 100644 (file)
--- 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 ca561d01fab5b16ab856cb0304da68d9be4df39f..f9d2ced2d3a4efd09960b373bc41134869ae9ef8 100644 (file)
--- 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 45e9ddcd3f631fb0b20b33d62895df066b29e502..24caa6c34fb336d48177dd508ff513a4a9c1c383 100644 (file)
--- 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 ccd3a2ec11956d0f9fc4bd0143c1c3a5bef4c747..7fe4a54f24d5f08ba3b0d9e280569bf1ef18e105 100644 (file)
--- 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 3be8854626ff5c9ce6f2955feeeaa99272ffab27..5f632eabc126c45f4a28df5bfde99bab114a4dea 100644 (file)
--- 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 e2145dae8004befd1a24acbf31fb26faa5445c7d..cae22484e9cef4f04d4cd8869fa6768d6fd8a19c 100644 (file)
--- 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 18fcf51ae17289ff82cca3047778cd104dd6e687..1e65d14c95b9f5892c17cdf9ad35fcfd4ab70bce 100644 (file)
--- 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 c596f1ffb3c157aa4f5ed51d2f6e10eb03e8dc94..179eaa4a992ed9f108da65a28db406053c242dd2 100644 (file)
--- 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 e00eadc8db0c2d9078415f2e5444a319281bb7d1..ddc35d361b1f67a3a6525fe86a7a19fd1c7f2c0d 100644 (file)
--- 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 148ed47269870294f6ceab6e3a25c7def366f7a6..6d647abe1f05f846c995172ef079c76fb217dad3 100644 (file)
--- 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 4e272f9f87853142afa004d9f70a6019d94e2957..0ddfe7879f07ede362678f849e5a9453f7ffeb11 100644 (file)
--- 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 c20427de7e724769a7ad530255fbbf1274e172be..5fe09154229799b882d235ec3074c2d5146ff351 100644 (file)
--- 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 719a7143e8a12baaee331e35c91b0e5840050dd2..18f95328e198371118e64e3a1482e1bc57cd8aaa 100644 (file)
--- 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 f4549108240cc88e3da16b6891add34c01533faf..7797a2a25bb1b76039e6a8597e0e1e507ed8aef4 100644 (file)
--- 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 e0ac2eda669cf957f1d97249c7c179d294295401..31e201880baba6dd0a16ac9a57a5d39a4ee48f78 100644 (file)
--- 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 619af9f45dd36f29013b193e938e4171be4cc989..02a7f4848e857bd91a617e610e4df6af5863e3dc 100644 (file)
--- 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 e5dc0ef3f74e69505e41641c57c260d06c6f1446..a2c9b2f62f5248036932bbefa98a740e98bcba1b 100644 (file)
--- 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 83c17713d381d0faa2cdd965560ca7a7a6eb93b9..647a7f594f212b0b56bab138fcf2e7824b8a568a 100644 (file)
--- 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 8a72b4c069c57c1b8fdc5b98a98252a72ef0d68b..ffabca041f3cde4609544f03a3aaedd9775fd6ec 100644 (file)
--- 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 951f73f97cf52ae01b5abbb1cfc901ce6bc23102..11f7eae1bf8cb365c84d13e8e9f6946aa9caf81a 100644 (file)
--- 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 a375bee925b40fb2a73e22d928d6e49d7670b3cf..1f8ff5c999d140de48873146c10194de37329a38 100644 (file)
--- 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