Use paste.deploy for running the api server.

8 files changed, 235 insertions, 4 deletions

diff --git a/bin/nova-api-paste b/bin/nova-api-paste
new file mode 100755
index 000000000..dcb76522f
--- /dev/null
+++ b/bin/nova-api-paste
@@ -0,0 +1,103 @@
+#!/usr/bin/env python
+# pylint: disable-msg=C0103
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    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.
+
+"""Starter script for Nova API."""
+
+import gettext
+import logging
+import os
+import sys
+
+from paste import deploy
+
+from nova import flags
+from nova import wsgi
+
+# If ../nova/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
+                                   os.pardir))
+if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
+    sys.path.insert(0, possible_topdir)
+
+gettext.install('nova', unicode=1)
+
+LOG = logging.getLogger('nova.api')
+LOG.setLevel(logging.DEBUG)
+LOG.addHandler(logging.StreamHandler())
+
+FLAGS = flags.FLAGS
+
+API_ENDPOINTS = ['ec2', 'openstack']
+
+def load_configuration(paste_config):
+    """Load the paste configuration from the config file and return it."""
+    config = None
+    # Try each known name to get the global DEFAULTS, which will give ports
+    for name in API_ENDPOINTS:
+        try:
+            config = deploy.appconfig("config:%s" % paste_config, name=name)
+        except LookupError:
+            pass
+        if config:
+            verbose = config.get('verbose', None)
+            if verbose:
+                FLAGS.verbose = int(verbose) == 1
+                if FLAGS.verbose:
+                    logging.getLogger().setLevel(logging.DEBUG)
+            return config
+    LOG.debug("Paste config at %s has no secion for known apis", paste_config)
+    print "Paste config at %s has no secion for any known apis" % paste_config
+    os.exit(1)
+
+def launch_api(paste_config_file, section, server, port, host):
+    """Launch an api server from the specified port and IP."""
+    LOG.debug("Launching api %s on %s:%s", section, host, port)
+    app = deploy.loadapp('config:%s' % paste_config_file, name=section)
+    server.start(app, int(port), host)
+
+def run_app(paste_config_file):
+    LOG.debug("Using paste.deploy config at: %s", configfile)
+    config = load_configuration(paste_config_file)
+    LOG.debug("Configuration: %r", config)
+    server = wsgi.Server()
+    ip = config.get('host', None)
+    for api in API_ENDPOINTS:
+        port = config.get("%s_port" % api, None)
+        if not port:
+            continue
+        host = config.get("%s_host" % api, None) or ip or '0.0.0.0'
+        launch_api(configfile, api, server, port, host)
+    LOG.debug("All api servers launched, now waiting")
+    server.wait()
+
+if __name__ == '__main__':
+    FLAGS(sys.argv)
+    configfiles = ['/etc/nova/nova-api.conf']
+    if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
+        configfiles.insert(0,
+                       os.path.join(possible_topdir, 'etc', 'nova-api.conf'))
+    for configfile in configfiles:
+        if os.path.exists(configfile):
+            run_app(configfile)
+            break
+        else:
+            LOG.debug("Skipping missing configuration: %s", configfile)
diff --git a/etc/nova-api.conf b/etc/nova-api.conf
new file mode 100644
index 000000000..eaa74639e
--- /dev/null
+++ b/etc/nova-api.conf
@@ -0,0 +1,62 @@
+[DEFAULT]
+verbose = 1
+ec2_port = 8773
+ec2_address = 0.0.0.0
+openstack_port = 8774
+openstack_address = 0.0.0.0
+
+#######
+# EC2 #
+#######
+
+[app:ec2]
+use = ec2composite
+
+[composite:ec2composite]
+use = egg:Paste#urlmap
+/: ec2versions
+/services: ec2api
+/cloudpipe: cloudpipe
+/latest: ec2metadata
+/200: ec2metadata
+/1.0: ec2metadata
+
+[pipeline:ec2api]
+pipeline = authenticate router authorizer ec2executor
+
+[filter:authenticate]
+paste.filter_factory = nova.api.ec2:authenticate_factory
+
+[filter:router]
+paste.filter_factory = nova.api.ec2:router_factory
+
+[filter:authorizer]
+paste.filter_factory = nova.api.ec2:authorizer_factory
+
+[app:ec2executor]
+paste.app_factory = nova.api.ec2:executor_factory
+
+[app:ec2versions]
+paste.app_factory = nova.api.ec2:versions_factory
+
+[app:ec2metadata]
+paste.app_factory = nova.api.ec2.metadatarequesthandler:metadata_factory
+
+[app:cloudpipe]
+paste.app_factory = nova.api.cloudpipe:cloudpipe_factory
+
+#############
+# Openstack #
+############
+
+[pipeline:openstack]
+pipeline = auth ratelimit osapi
+
+[filter:auth]
+paste.filter_factory = nova.api.openstack:auth_factory
+
+[filter:ratelimit]
+paste.filter_factory = nova.api.openstack:ratelimit_factory
+
+[app:osapi]
+paste.app_factory = nova.api.openstack:router_factory
diff --git a/nova/api/__init__.py b/nova/api/__init__.py
index 80f9f2109..92b495e8c 100644
--- a/nova/api/__init__.py
+++ b/nova/api/__init__.py
@@ -29,7 +29,6 @@ import routes
 import webob.dec
 
 from nova import flags
-from nova import utils
 from nova import wsgi
 from nova.api import cloudpipe
 from nova.api import ec2
diff --git a/nova/api/cloudpipe/__init__.py b/nova/api/cloudpipe/__init__.py
index 6d40990a8..47349d9f9 100644
--- a/nova/api/cloudpipe/__init__.py
+++ b/nova/api/cloudpipe/__init__.py
@@ -67,3 +67,6 @@ class API(wsgi.Application):
         project_id = self.get_project_id_from_ip(req.remote_addr)
         cert = self.str_params['cert']
         return crypto.sign_csr(urllib.unquote(cert), project_id)
+
+def cloudpipe_factory(global_opts, **local_opts):
+    return API()
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index a6ee16c33..50cb18078 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -225,10 +225,9 @@ class Executor(wsgi.Application):
         args = req.environ['ec2.action_args']
 
         api_request = apirequest.APIRequest(controller, action)
+        result = None
         try:
             result = api_request.send(context, **args)
-            req.headers['Content-Type'] = 'text/xml'
-            return result
         except exception.ApiError as ex:
 
             if ex.code:
@@ -238,6 +237,13 @@ class Executor(wsgi.Application):
         # TODO(vish): do something more useful with unknown exceptions
         except Exception as ex:
             return self._error(req, type(ex).__name__, str(ex))
+        else:
+            resp = webob.Response()
+            resp.status = 200
+            resp.headers['Content-Type'] = 'text/xml'
+            resp.body = str(result)
+            return resp
+
 
     def _error(self, req, code, message):
         logging.error("%s: %s", code, message)
@@ -249,3 +255,43 @@ class Executor(wsgi.Application):
                      '<Message>%s</Message></Error></Errors>'
                      '<RequestID>?</RequestID></Response>' % (code, message))
         return resp
+
+class Versions(wsgi.Application):
+
+    @webob.dec.wsgify
+    def __call__(self, req):
+        """Respond to a request for all EC2 versions."""
+        # available api versions
+        versions = [
+            '1.0',
+            '2007-01-19',
+            '2007-03-01',
+            '2007-08-29',
+            '2007-10-10',
+            '2007-12-15',
+            '2008-02-01',
+            '2008-09-01',
+            '2009-04-04',
+        ]
+        return ''.join('%s\n' % v for v in versions)
+
+def authenticate_factory(global_args, **local_args):
+    def authenticator(app):
+        return Authenticate(app)
+    return authenticator
+
+def router_factory(global_args, **local_args):
+    def router(app):
+        return Router(app)
+    return router
+
+def authorizer_factory(global_args, **local_args):
+    def authorizer(app):
+        return Authorizer(app)
+    return authorizer
+
+def executor_factory(global_args, **local_args):
+    return Executor()
+
+def versions_factory(global_args, **local_args):
+    return Versions()
diff --git a/nova/api/ec2/metadatarequesthandler.py b/nova/api/ec2/metadatarequesthandler.py
index 2f4f414cc..fffefb97b 100644
--- a/nova/api/ec2/metadatarequesthandler.py
+++ b/nova/api/ec2/metadatarequesthandler.py
@@ -72,3 +72,6 @@ class MetadataRequestHandler(object):
         if data is None:
             raise webob.exc.HTTPNotFound()
         return self.print_data(data)
+
+def metadata_factory(global_args, **local_args):
+    return MetadataRequestHandler()
diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index b9ecbd9b8..cb825cf41 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -210,3 +210,16 @@ def limited(items, req):
     limit = min(1000, limit)
     range_end = offset + limit
     return items[offset:range_end]
+
+def auth_factory(global_conf, **local_conf):
+    def auth(app):
+        return AuthMiddleware(app)
+    return auth
+
+def ratelimit_factory(global_conf, **local_conf):
+    def rl(app):
+        return RateLimitingMiddleware(app)
+    return rl
+
+def router_factory(global_cof, **local_conf):
+    return APIRouter()
diff --git a/tools/pip-requires b/tools/pip-requires
index 52451b8cb..4fd147670 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -21,4 +21,6 @@ mox==0.5.0
 greenlet==0.3.1
 nose
 bzr
-Twisted>=10.1.0
\ No newline at end of file
+Twisted>=10.1.0
+PasteDeploy
+paste