Merge lp:~salvatore-orlando/neutron/bug804237 into lp:neutron/diablo

[Salvatore Orlando]

The proposed bug fix will avoid loading the plugin multiple times by loading it once when API routes are set up.
The same plugin instance will be passed to all controllers.

[Salvatore Orlando (salvatore-orlando)]

Moving back to WIP until we merge the unit-tests branch

[Somik Behera (somikbehera)]

Changes look good and uptil they pass the existing unit test, I dont see this change requiring full exhaustive tests, since if this change works ok for couple of API tests, it will work for everything else.

This seems to be a critical fix, so I vote that we merge it to trunk.

review: Approve (netstack-core)

[Brad Hall (bgh)]

Looks good to me

review: Approve

=== modified file 'quantum/api/__init__.py'
--- quantum/api/__init__.py	2011-06-08 10:21:47 +0000
+++ quantum/api/__init__.py	2011-07-05 10:28:00 +0000
@@ -24,6 +24,7 @@
 import webob.dec
 import webob.exc
 
+from quantum import manager
 from quantum.api import faults
 from quantum.api import networks
 from quantum.api import ports
@@ -46,32 +47,32 @@
         super(APIRouterV01, self).__init__(mapper)
 
     def _setup_routes(self, mapper):
-
+        # Loads the quantum plugin
+        plugin = manager.QuantumManager().get_plugin()
         uri_prefix = '/tenants/{tenant_id}/'
         mapper.resource('network', 'networks',
-                        controller=networks.Controller(),
+                        controller=networks.Controller(plugin),
                         path_prefix=uri_prefix)
         mapper.resource('port', 'ports',
-                        controller=ports.Controller(),
+                        controller=ports.Controller(plugin),
                         parent_resource=dict(member_name='network',
                                              collection_name=uri_prefix +\
                                                  'networks'))
-
         mapper.connect("get_resource",
                        uri_prefix + 'networks/{network_id}/' \
                                     'ports/{id}/attachment{.format}',
-                       controller=ports.Controller(),
+                       controller=ports.Controller(plugin),
                        action="get_resource",
                        conditions=dict(method=['GET']))
         mapper.connect("attach_resource",
                        uri_prefix + 'networks/{network_id}/' \
                                     'ports/{id}/attachment{.format}',
-                       controller=ports.Controller(),
+                       controller=ports.Controller(plugin),
                        action="attach_resource",
                        conditions=dict(method=['PUT']))
         mapper.connect("detach_resource",
                        uri_prefix + 'networks/{network_id}/' \
                                     'ports/{id}/attachment{.format}',
-                       controller=ports.Controller(),
+                       controller=ports.Controller(plugin),
                        action="detach_resource",
                        conditions=dict(method=['DELETE']))

=== modified file 'quantum/api/api_common.py'
--- quantum/api/api_common.py	2011-05-31 17:15:00 +0000
+++ quantum/api/api_common.py	2011-07-05 10:28:00 +0000
@@ -19,7 +19,6 @@
 
 from webob import exc
 
-from quantum import manager
 from quantum.common import wsgi
 
 XML_NS_V01 = 'http://netstack.org/quantum/api/v0.1'
@@ -30,8 +29,8 @@
 class QuantumController(wsgi.Controller):
     """ Base controller class for Quantum API """
 
-    def __init__(self, plugin_conf_file=None):
-        self._setup_network_manager()
+    def __init__(self, plugin):
+        self._plugin = plugin
         super(QuantumController, self).__init__()
 
     def _parse_request_params(self, req, params):
@@ -65,6 +64,3 @@
                     raise exc.HTTPBadRequest(msg)
             results[param_name] = param_value or param.get('default-value')
         return results
-
-    def _setup_network_manager(self):
-        self.network_manager = manager.QuantumManager().get_manager()

=== modified file 'quantum/api/networks.py'
--- quantum/api/networks.py	2011-06-08 10:21:47 +0000
+++ quantum/api/networks.py	2011-07-05 10:28:00 +0000
@@ -40,9 +40,9 @@
         },
     }
 
-    def __init__(self, plugin_conf_file=None):
+    def __init__(self, plugin):
         self._resource_name = 'network'
-        super(Controller, self).__init__()
+        super(Controller, self).__init__(plugin)
 
     def index(self, request, tenant_id):
         """ Returns a list of network ids """
@@ -51,7 +51,7 @@
 
     def _items(self, request, tenant_id, is_detail):
         """ Returns a list of networks. """
-        networks = self.network_manager.get_all_networks(tenant_id)
+        networks = self._plugin.get_all_networks(tenant_id)
         builder = networks_view.get_view_builder(request)
         result = [builder.build(network, is_detail)['network']
                   for network in networks]
@@ -60,7 +60,7 @@
     def show(self, request, tenant_id, id):
         """ Returns network details for the given network id """
         try:
-            network = self.network_manager.get_network_details(
+            network = self._plugin.get_network_details(
                             tenant_id, id)
             builder = networks_view.get_view_builder(request)
             #build response with details
@@ -78,7 +78,7 @@
                                            self._network_ops_param_list)
         except exc.HTTPError as e:
             return faults.Fault(e)
-        network = self.network_manager.\
+        network = self._plugin.\
                        create_network(tenant_id,
                                       request_params['network-name'])
         builder = networks_view.get_view_builder(request)
@@ -94,7 +94,7 @@
         except exc.HTTPError as e:
             return faults.Fault(e)
         try:
-            network = self.network_manager.rename_network(tenant_id,
+            network = self._plugin.rename_network(tenant_id,
                         id, request_params['network-name'])
 
             builder = networks_view.get_view_builder(request)
@@ -106,7 +106,7 @@
     def delete(self, request, tenant_id, id):
         """ Destroys the network with the given id """
         try:
-            self.network_manager.delete_network(tenant_id, id)
+            self._plugin.delete_network(tenant_id, id)
             return exc.HTTPAccepted()
         except exception.NetworkNotFound as e:
             return faults.Fault(faults.NetworkNotFound(e))

=== modified file 'quantum/api/ports.py'
--- quantum/api/ports.py	2011-06-08 10:21:47 +0000
+++ quantum/api/ports.py	2011-07-05 10:28:00 +0000
@@ -42,9 +42,9 @@
             "attributes": {
                 "port": ["id", "state"], }, }, }
 
-    def __init__(self, plugin_conf_file=None):
+    def __init__(self, plugin):
         self._resource_name = 'port'
-        super(Controller, self).__init__()
+        super(Controller, self).__init__(plugin)
 
     def index(self, request, tenant_id, network_id):
         """ Returns a list of port ids for a given network """
@@ -53,7 +53,7 @@
     def _items(self, request, tenant_id, network_id, is_detail):
         """ Returns a list of networks. """
         try:
-            ports = self.network_manager.get_all_ports(tenant_id, network_id)
+            ports = self._plugin.get_all_ports(tenant_id, network_id)
             builder = ports_view.get_view_builder(request)
             result = [builder.build(port, is_detail)['port']
                       for port in ports]
@@ -64,7 +64,7 @@
     def show(self, request, tenant_id, network_id, id):
         """ Returns port details for given port and network """
         try:
-            port = self.network_manager.get_port_details(
+            port = self._plugin.get_port_details(
                             tenant_id, network_id, id)
             builder = ports_view.get_view_builder(request)
             #build response with details
@@ -84,7 +84,7 @@
         except exc.HTTPError as e:
             return faults.Fault(e)
         try:
-            port = self.network_manager.create_port(tenant_id,
+            port = self._plugin.create_port(tenant_id,
                                             network_id,
                                             request_params['port-state'])
             builder = ports_view.get_view_builder(request)
@@ -104,7 +104,7 @@
         except exc.HTTPError as e:
             return faults.Fault(e)
         try:
-            port = self.network_manager.update_port(tenant_id, network_id, id,
+            port = self._plugin.update_port(tenant_id, network_id, id,
                                                  request_params['port-state'])
             builder = ports_view.get_view_builder(request)
             result = builder.build(port, True)
@@ -120,7 +120,7 @@
         """ Destroys the port with the given id """
         #look for port state in request
         try:
-            self.network_manager.delete_port(tenant_id, network_id, id)
+            self._plugin.delete_port(tenant_id, network_id, id)
             return exc.HTTPAccepted()
             #TODO(salvatore-orlando): Handle portInUse error
         except exception.NetworkNotFound as e:
@@ -132,7 +132,7 @@
 
     def get_resource(self, request, tenant_id, network_id, id):
         try:
-            result = self.network_manager.get_interface_details(
+            result = self._plugin.get_interface_details(
                             tenant_id, network_id, id)
             return dict(attachment=result)
         except exception.NetworkNotFound as e:
@@ -151,7 +151,7 @@
         except exc.HTTPError as e:
             return faults.Fault(e)
         try:
-            self.network_manager.plug_interface(tenant_id,
+            self._plugin.plug_interface(tenant_id,
                                             network_id, id,
                                             request_params['attachment-id'])
             return exc.HTTPAccepted()
@@ -167,7 +167,7 @@
     #TODO - Complete implementation of these APIs
     def detach_resource(self, request, tenant_id, network_id, id):
         try:
-            self.network_manager.unplug_interface(tenant_id,
+            self._plugin.unplug_interface(tenant_id,
                                                   network_id, id)
             return exc.HTTPAccepted()
         except exception.NetworkNotFound as e:

=== modified file 'quantum/manager.py'
--- quantum/manager.py	2011-06-08 10:21:47 +0000
+++ quantum/manager.py	2011-07-05 10:28:00 +0000
@@ -26,10 +26,9 @@
 """
 import gettext
 import os
+
 gettext.install('quantum', unicode=1)
 
-import os
-
 from common import utils
 from quantum_plugin_base import QuantumPluginBase
 
@@ -51,7 +50,6 @@
         else:
             self.configuration_file = config
         plugin_location = utils.getPluginFromConfig(self.configuration_file)
-        print "PLUGIN LOCATION:%s" % plugin_location
         plugin_klass = utils.import_class(plugin_location)
         if not issubclass(plugin_klass, QuantumPluginBase):
             raise Exception("Configured Quantum plug-in " \
@@ -61,5 +59,5 @@
                   "All compatibility tests passed\n")
         self.plugin = plugin_klass()
 
-    def get_manager(self):
+    def get_plugin(self):
         return self.plugin