From 35d3050511ef513ff440fbd9f8b44695ea8be797 Mon Sep 17 00:00:00 2001
From: Andy Smith <code@term.ie>
Date: Tue, 4 Jan 2011 14:07:46 -0800
Subject: rename Easy API to Direct API

---
 bin/nova-direct-api | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 bin/nova-easy-api   | 61 -----------------------------------------------------
 2 files changed, 61 insertions(+), 61 deletions(-)
 create mode 100755 bin/nova-direct-api
 delete mode 100755 bin/nova-easy-api

(limited to 'bin')

diff --git a/bin/nova-direct-api b/bin/nova-direct-api
new file mode 100755
index 000000000..43046e6c2
--- /dev/null
+++ b/bin/nova-direct-api
@@ -0,0 +1,61 @@
+#!/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 Easy API."""
+
+import gettext
+import os
+import sys
+
+# 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)
+
+from nova import flags
+from nova import utils
+from nova import wsgi
+from nova.api import direct
+from nova.compute import api as compute_api
+
+
+FLAGS = flags.FLAGS
+flags.DEFINE_integer('direct_port', 8001, 'Direct API port')
+flags.DEFINE_string('direct_host', '0.0.0.0', 'Direct API host')
+
+if __name__ == '__main__':
+    utils.default_flagfile()
+    FLAGS(sys.argv)
+
+    direct.register_service('compute', compute_api.ComputeAPI())
+    direct.register_service('reflect', direct.Reflection())
+    router = direct.Router()
+    with_json = direct.JsonParamsMiddleware(router)
+    with_req = direct.PostParamsMiddleware(with_json)
+    with_auth = direct.DelegatedAuthMiddleware(with_req)
+
+    server = wsgi.Server()
+    server.start(with_auth, FLAGS.direct_port, host=FLAGS.direct_host)
+    server.wait()
diff --git a/bin/nova-easy-api b/bin/nova-easy-api
deleted file mode 100755
index e8e86b4fb..000000000
--- a/bin/nova-easy-api
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/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 Easy API."""
-
-import gettext
-import os
-import sys
-
-# 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)
-
-from nova import flags
-from nova import utils
-from nova import wsgi
-from nova.api import easy
-from nova.compute import api as compute_api
-
-
-FLAGS = flags.FLAGS
-flags.DEFINE_integer('easy_port', 8001, 'Easy API port')
-flags.DEFINE_string('easy_host', '0.0.0.0', 'Easy API host')
-
-if __name__ == '__main__':
-    utils.default_flagfile()
-    FLAGS(sys.argv)
-
-    easy.register_service('compute', compute_api.ComputeAPI())
-    easy.register_service('reflect', easy.Reflection())
-    router = easy.SundayMorning()
-    with_json = easy.JsonParamsMiddleware(router)
-    with_req = easy.ReqParamsMiddleware(with_json)
-    with_auth = easy.DelegatedAuthMiddleware(with_req)
-
-    server = wsgi.Server()
-    server.start(with_auth, FLAGS.easy_port, host=FLAGS.easy_host)
-    server.wait()
-- 
cgit