Merge lp:~santhoshkumar/network-service/melange_framework into lp:~rajarammallya/network-service/melange_framework

[Santhosh Kumar Muniraj]

* Modified the way the extensions are loaded. Using Pipeline and Filter features of paste to load the extensions.

[lp:~santhoshkumar/network-service/melange_framework]

39. By Rajaram Mallya on 2011-06-09

Rajaram/Vinkesh | Added API to delete IpBlocks. Changed the way limit, marker and marker_column is applied to any query. Now, db_api.find_all_by method does not add a limit filter to the query

40. By Rajaram Mallya on 2011-06-09

Vinkesh | Merged from santhosh branch. Fixed conflicts

=== modified file 'etc/melange.conf.sample'
--- etc/melange.conf.sample	2011-06-02 12:26:41 +0000
+++ etc/melange.conf.sample	2011-06-09 07:21:01 +0000
@@ -5,14 +5,34 @@
 # Show debugging output in logs (sets DEBUG log level output)
 debug = False
 
-[app:melange]
-paste.app_factory = melange.ipam.service:app_factory
-
 # Address to bind the API server
 bind_host = 0.0.0.0
 
 # Port the bind the API server to
 bind_port = 9292
 
+# SQLAlchemy connection string for the reference implementation          
+# registry server. Any valid SQLAlchemy connection string is fine. 
+# See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
+sql_connection = sqlite:///melange_tests.sqlite
+
+# Period in seconds after which SQLAlchemy should reestablish its connection
+# to the database.
+#
+# MySQL uses a default `wait_timeout` of 8 hours, after which it will drop
+# idle connections. This can result in 'MySQL Gone Away' exceptions. If you
+# notice this, you can lower this value to ensure that SQLAlchemy reconnects
+# before MySQL can drop the connection.
+sql_idle_timeout = 3600
+
 # Path to the extensions
 api_extensions_path = extensions
+
+[pipeline:melange]
+pipeline = extensions melangeapp
+
+[filter:extensions]
+paste.filter_factory = melange.common.extensions:ExtensionMiddleware.factory
+
+[app:melangeapp]
+paste.app_factory = melange.ipam.service:app_factory
 
=== modified file 'etc/melange.conf.test'
--- etc/melange.conf.test	2011-06-03 10:27:12 +0000
+++ etc/melange.conf.test	2011-06-09 07:21:01 +0000
@@ -5,8 +5,8 @@
 # Show debugging output in logs (sets DEBUG log level output)
 debug = False
 
-[app:melange]
-paste.app_factory = melange.ipam.service:app_factory
+# Path to the extensions
+api_extensions_path = extensions
 
 # Address to bind the API server
 bind_host = 0.0.0.0
@@ -28,12 +28,14 @@
 # before MySQL can drop the connection.
 sql_idle_timeout = 3600
 
+[pipeline:extensions_app_with_filter]
+pipeline = extensions extensions_test_app
+
+[filter:extensions]
+paste.filter_factory = melange.common.extensions:ExtensionMiddleware.factory
 
 [app:extensions_test_app]
 paste.app_factory = tests.unit.test_extensions:app_factory
 
-# Path to the extensions
-api_extensions_path = extensions
-
-[filter:extensions]
-paste.filter_factory = melange.common.extensions:ExtensionMiddleware.factory
+[app:melange]
+paste.app_factory = melange.ipam.service:app_factory
 
=== added directory 'extensions'
=== added file 'extensions/__init__.py'
--- extensions/__init__.py	1970-01-01 00:00:00 +0000
+++ extensions/__init__.py	2011-06-09 07:21:01 +0000
@@ -0,0 +1,15 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 OpenStack LLC
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
 
=== modified file 'melange/common/config.py'
--- melange/common/config.py	2011-06-03 10:27:12 +0000
+++ melange/common/config.py	2011-06-09 07:21:01 +0000
@@ -203,6 +203,7 @@
 
     # Handle standard directory search for glance.conf
     config_file_dirs = [fix_path(os.getcwd()),
+                        fix_path(os.path.join(os.getcwd(), "etc")),
                         fix_path(os.path.join('~', '.melange')),
                         fix_path('~'),
                         '/etc/melange/',
@@ -301,10 +302,6 @@
                 logger.debug("%(key)-30s %(value)s" % locals())
             logger.debug("*" * 80)
         app = deploy.loadapp("config:%s" % conf_file, name=app_name)
-        extension_manager = options.get('extension_manager')
-        app = extensions.ExtensionMiddleware(app, conf,
-                                             ext_mgr=extension_manager)
-
     except (LookupError, ImportError), e:
         raise RuntimeError("Unable to load %(app_name)s from "
                            "configuration file %(conf_file)s."
 
=== modified file 'melange/common/extensions.py'
--- melange/common/extensions.py	2011-06-03 10:27:12 +0000
+++ melange/common/extensions.py	2011-06-09 07:21:01 +0000
@@ -185,7 +185,7 @@
     def factory(cls, global_config, **local_config):
         """Paste factory."""
         def _factory(app):
-            return cls(app, **local_config)
+            return cls(app, global_config, **local_config)
         return _factory
 
     def _action_ext_controllers(self, application, ext_mgr, mapper):
@@ -291,7 +291,7 @@
 class ExtensionManager(object):
     """Load extensions from the configured extension path.
 
-    See nova/tests/api/openstack/extensions/foxinsocks/extension.py for an
+    See melange/tests/unit/extensions/foxinsocks.py for an
     example extension implementation.
 
     """
@@ -362,7 +362,7 @@
 
         In addition, extensions are loaded from the 'contrib' directory.
 
-        See nova/tests/api/openstack/extensions/foxinsocks.py for an example
+        See melange/tests/unit/extensions/foxinsocks.py for an example
         extension implementation.
 
         """
@@ -405,10 +405,10 @@
 
 
 class RequestExtension(object):
-    """Extend requests and responses of core nova OpenStack API controllers.
+    """Extend requests and responses of core melange OpenStack API controllers.
 
     Provide a way to add data to responses and handle custom request data
-    that is sent to core nova OpenStack API controllers.
+    that is sent to core melange OpenStack API controllers.
 
     """
     def __init__(self, method, url_route, handler):
@@ -419,7 +419,7 @@
 
 
 class ActionExtension(object):
-    """Add custom actions to core nova OpenStack API controllers."""
+    """Add custom actions to core melange OpenStack API controllers."""
 
     def __init__(self, collection, action_name, handler):
         self.collection = collection
@@ -428,7 +428,7 @@
 
 
 class ResourceExtension(object):
-    """Add top level resources to the OpenStack API in nova."""
+    """Add top level resources to the OpenStack API in melange."""
 
     def __init__(self, collection, controller, parent=None,
                  collection_actions={}, member_actions={}):
 
=== modified file 'tests/unit/test_extensions.py'
--- tests/unit/test_extensions.py	2011-06-03 10:27:12 +0000
+++ tests/unit/test_extensions.py	2011-06-09 07:21:01 +0000
@@ -26,6 +26,9 @@
 
 
 response_body = "Try to say this Mr. Knox, sir..."
+conf_file = os.path.join(os.path.dirname(__file__),
+                         os.pardir, os.pardir,
+                         "etc", "melange.conf.test")
 
 
 class ExtensionControllerTest(unittest.TestCase):
@@ -108,7 +111,7 @@
         self.assertEqual(404, response.status_int)
 
 
-class RequestExtensionTest(BaseTest):
+class RequestExtensionTest(unittest.TestCase):
 
     def test_get_resources_with_stub_mgr(self):
 
@@ -146,6 +149,17 @@
         self.assertEqual("Pig Bands!", response_data['big_bands'])
 
 
+class TestExtensionMiddlewareFactory(unittest.TestCase):
+
+    def test_app_configured_with_extensions_as_filter(self):
+        conf, melange_app = config.load_paste_app('extensions_app_with_filter',
+                                                  {"config_file": conf_file},
+                                                  None)
+
+        response = TestApp(melange_app).get("/extensions")
+        self.assertEqual(response.status_int, 200)
+
+
 class ExtensionsTestApp(wsgi.Router):
 
     def __init__(self, options={}):
@@ -175,10 +189,11 @@
 
 
 def setup_extensions_test_app(extension_manager=None):
-    options = {'config_file': os.path.abspath("../../etc/melange.conf.test"),
+    options = {'config_file': conf_file,
                'extension_manager': extension_manager}
     conf, app = config.load_paste_app('extensions_test_app', options, None)
-    return TestApp(app)
+    extended_app = extensions.ExtensionMiddleware(app, conf, extension_manager)
+    return TestApp(extended_app)
 
 
 class StubExtensionManager(object):
 
=== modified file 'tools/pip-requires'
--- tools/pip-requires	2011-06-07 06:26:52 +0000
+++ tools/pip-requires	2011-06-09 07:21:01 +0000
@@ -2,6 +2,7 @@
 pep8==0.5.0
 eventlet>=0.9.12
 PasteDeploy
+Paste
 routes
 webob
 webtest