From 1e403e56dc1147ce3feea1b8931948bc35f23a44 Mon Sep 17 00:00:00 2001
From: Eric Day <eday@oddments.org>
Date: Tue, 17 Aug 2010 16:43:37 -0700
Subject: In an effort to keep new and old API code separate, I've created a
 nova.api to put all new API code under. This means nova.endpoint only
 contains the old Tornado implementation. I also cleaned up a few pep8 and
 other style nits in the new API code.

---
 bin/nova-api-new | 34 ++++++++++++++++++++++++++++++++++
 bin/nova-rsapi   | 34 ----------------------------------
 2 files changed, 34 insertions(+), 34 deletions(-)
 create mode 100755 bin/nova-api-new
 delete mode 100755 bin/nova-rsapi

(limited to 'bin')

diff --git a/bin/nova-api-new b/bin/nova-api-new
new file mode 100755
index 000000000..fda42339c
--- /dev/null
+++ b/bin/nova-api-new
@@ -0,0 +1,34 @@
+#!/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.
+"""
+Nova API daemon.
+"""
+
+from nova import api
+from nova import flags
+from nova import utils
+from nova import wsgi
+
+FLAGS = flags.FLAGS
+flags.DEFINE_integer('api_port', 8773, 'API port')
+
+if __name__ == '__main__':
+    utils.default_flagfile()
+    wsgi.run_server(api.API(), FLAGS.api_port)
diff --git a/bin/nova-rsapi b/bin/nova-rsapi
deleted file mode 100755
index e2722422e..000000000
--- a/bin/nova-rsapi
+++ /dev/null
@@ -1,34 +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.
-"""
-  Daemon for the Rackspace API endpoint.
-"""
-
-from nova import flags
-from nova import utils
-from nova import wsgi
-from nova.endpoint import newapi
-
-FLAGS = flags.FLAGS
-flags.DEFINE_integer('cc_port', 8773, 'cloud controller port')
-
-if __name__ == '__main__':
-    utils.default_flagfile()
-    wsgi.run_server(newapi.APIVersionRouter(), FLAGS.cc_port)
-- 
cgit