Updating common/extensions.py in order not to instantiate a QuantumManager when retri...

Also renaming API router: APIRouterV01 --> APIRouterV1

diff --git a/etc/quantum.conf b/etc/quantum.conf
index 9fd2036554acb313ee27b6547e7387a123fc6ae9..42347c76388c19d12b9fe2135cd85c080e7f1e95 100644 (file)
--- a/etc/quantum.conf
+++ b/etc/quantum.conf
@@ -29,4 +29,4 @@ paste.filter_factory = quantum.common.extensions:plugin_aware_extension_middlewa
 paste.app_factory = quantum.api.versions:Versions.factory
 
 [app:quantumapiapp]
-paste.app_factory = quantum.api:APIRouterV01.factory
+paste.app_factory = quantum.api:APIRouterV1.factory

diff --git a/quantum/api/__init__.py b/quantum/api/__init__.py
index 0ff7ea23494ce4b2b34618a9ada9da008c0b924e..ea02d26779525e1d1ca13d2d900e840556409128 100644 (file)
--- a/quantum/api/__init__.py
+++ b/quantum/api/__init__.py
@@ -37,7 +37,7 @@ LOG = logging.getLogger('quantum.api')
 FLAGS = flags.FLAGS
 
 
-class APIRouterV01(wsgi.Router):
+class APIRouterV1(wsgi.Router):
     """
     Routes requests on the Quantum API to the appropriate controller
     """
@@ -45,7 +45,7 @@ class APIRouterV01(wsgi.Router):
     def __init__(self, options=None):
         mapper = routes.Mapper()
         self._setup_routes(mapper, options)
-        super(APIRouterV01, self).__init__(mapper)
+        super(APIRouterV1, self).__init__(mapper)
 
     def _setup_routes(self, mapper, options):
         # Loads the quantum plugin
@@ -64,9 +64,7 @@ class APIRouterV01(wsgi.Router):
                         parent_resource=dict(member_name='network',
                                              collection_name=uri_prefix +\
                                                  'networks'))
-
         attachments_ctrl = attachments.Controller(plugin)
-
         mapper.connect("get_resource",
                        uri_prefix + 'networks/{network_id}/' \
                                     'ports/{id}/attachment{.format}',

diff --git a/quantum/common/extensions.py b/quantum/common/extensions.py
index 79680b2254651dd91126ddfebc63271a79412a93..cfe6bc786a9b343ddb473dd27fc5fff5af985e51 100644 (file)
--- a/quantum/common/extensions.py
+++ b/quantum/common/extensions.py
@@ -338,7 +338,7 @@ def plugin_aware_extension_middleware_factory(global_config, **local_config):
     def _factory(app):
         extensions_path = global_config.get('api_extensions_path', '')
         ext_mgr = PluginAwareExtensionManager(extensions_path,
-                                              QuantumManager().get_plugin())
+                                              QuantumManager.get_plugin())
         return ExtensionMiddleware(app, global_config, ext_mgr=ext_mgr)
     return _factory
 

diff --git a/quantum/manager.py b/quantum/manager.py
index 727a2c81040576dce911a1e5ca9d7aee17c4d80a..782b71cee7a622620f78a9756a3d88f16d570aa2 100644 (file)
--- a/quantum/manager.py
+++ b/quantum/manager.py
@@ -26,7 +26,7 @@ The caller should make sure that QuantumManager is a singleton.
 import gettext
 import logging
 import os
-import logging
+
 gettext.install('quantum', unicode=1)
 
 from common import utils

diff --git a/quantum/plugins/cisco/tests/unit/test_cisco_extension.py b/quantum/plugins/cisco/tests/unit/test_cisco_extension.py
index e1f2391bf4044aaddcf67ed224ac4877c689aaac..9054fd6c3057abae567c808f1d1c6587ec56c7a4 100644 (file)
--- a/quantum/plugins/cisco/tests/unit/test_cisco_extension.py
+++ b/quantum/plugins/cisco/tests/unit/test_cisco_extension.py
@@ -87,7 +87,7 @@ class PortprofileExtensionTest(unittest.TestCase):
         options = {}
         options['plugin_provider'] = 'quantum.plugins.cisco.l2network_plugin'\
                                      '.L2Network'
-        self.api = server.APIRouterV01(options)
+        self.api = server.APIRouterV1(options)
         self._l2network_plugin = l2network_plugin.L2Network()
 
     def test_list_portprofile(self):

diff --git a/tests/unit/test_api.py b/tests/unit/test_api.py
index a374dffcebccf44d85244c01a52a1dba5d945fae..2b865cd69c7484d7c1d4f402c3d210f3907b9736 100644 (file)
--- a/tests/unit/test_api.py
+++ b/tests/unit/test_api.py
@@ -763,7 +763,7 @@ class APITest(unittest.TestCase):
     def setUp(self):
         options = {}
         options['plugin_provider'] = test_config['plugin_name']
-        self.api = server.APIRouterV01(options)
+        self.api = server.APIRouterV1(options)
         self.tenant_id = "test_tenant"
         self.network_name = "test_network"
         self._net_serializer = \