Merge "Pull echo service out of auth_token."

keystonemiddleware/auth_token/__init__.py

@@ -30,18 +30,6 @@ Refer to: http://docs.openstack.org/developer/keystonemiddleware/\
 middlewarearchitecture.html
 
 
-Echo test server
-----------------
-
-Run this module directly to start a protected echo service on port 8000::
-
- $ python -m keystonemiddleware.auth_token
-
-When the ``auth_token`` module authenticates a request, the echo service
-will respond with all the environment variables presented to it by this
-module.
-
-
 Headers
 -------
 
@@ -1146,24 +1134,6 @@ def app_factory(global_conf, **local_conf):
     return AuthProtocol(None, conf)
 
 
-if __name__ == '__main__':
-    def echo_app(environ, start_response):
-        """A WSGI application that echoes the CGI environment to the user."""
-        start_response('200 OK', [('Content-Type', 'application/json')])
-        environment = dict((k, v) for k, v in six.iteritems(environ)
-                           if k.startswith('HTTP_X_'))
-        yield jsonutils.dumps(environment)
-
-    from wsgiref import simple_server
-
-    # hardcode any non-default configuration here
-    conf = {'auth_protocol': 'http', 'admin_token': 'ADMIN'}
-    app = AuthProtocol(echo_app, conf)
-    server = simple_server.make_server('', 8000, app)
-    print('Serving on port 8000 (Ctrl+C to end)...')
-    server.serve_forever()
-
-
 # NOTE(jamielennox): Maintained here for public API compatibility.
 InvalidToken = exc.InvalidToken
 ServiceError = exc.ServiceError

keystonemiddleware/echo/__main__.py

@@ -0,0 +1,7 @@
+from keystonemiddleware.echo import service
+
+
+try:
+    service.EchoService()
+except KeyboardInterrupt:
+    pass

keystonemiddleware/echo/service.py

@@ -0,0 +1,46 @@
+# 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.
+
+"""
+Run the echo service directly on port 8000 by executing the following::
+
+ $ python -m keystonemiddleware.echo
+
+When the ``auth_token`` module authenticates a request, the echo service
+will respond with all the environment variables presented to it by this
+module.
+"""
+
+from wsgiref import simple_server
+
+from oslo_serialization import jsonutils
+import six
+
+from keystonemiddleware import auth_token
+
+
+class EchoService(object):
+    """A WSGI application that echoes the CGI environment to the user."""
+    def __init__(self):
+        def echo_app(environ, start_response):
+            start_response('200 OK', [('Content-Type', 'application/json')])
+            environment = dict((k, v) for k, v in six.iteritems(environ)
+                               if k.startswith('HTTP_X_'))
+            yield jsonutils.dumps(environment)
+
+        # hardcode any non-default configuration here
+        conf = {'auth_protocol': 'http', 'admin_token': 'ADMIN'}
+        app = auth_token.AuthProtocol(echo_app, conf)
+        server = simple_server.make_server('', 8000, app)
+        print('Serving on port 8000 (Ctrl+C to end)...')
+        server.serve_forever()