From 54122c0a156d1562be76dfde41bd62006f9ed426 Mon Sep 17 00:00:00 2001
From: Eric Day <eday@oddments.org>
Date: Wed, 22 Sep 2010 17:54:57 -0700
Subject: Various loose ends for endpoint and tornado removal cleanup,
 including cloudpipe API addition, rpc.call() cleanup by removing tornado
 ioloop, and fixing bin/* programs. Tornado still exists as part of some test
 cases and those should be reworked to not require it.

---
 nova/api/__init__.py           |  2 ++
 nova/api/cloudpipe/__init__.py | 68 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 nova/api/cloudpipe/__init__.py

(limited to 'nova/api')

diff --git a/nova/api/__init__.py b/nova/api/__init__.py
index 821f1deea..ff9b94de9 100644
--- a/nova/api/__init__.py
+++ b/nova/api/__init__.py
@@ -24,6 +24,7 @@ import routes
 import webob.dec
 
 from nova import wsgi
+from nova.api import cloudpipe
 from nova.api import ec2
 from nova.api import rackspace
 
@@ -36,6 +37,7 @@ class API(wsgi.Router):
         mapper.connect("/", controller=self.versions)
         mapper.connect("/v1.0/{path_info:.*}", controller=rackspace.API())
         mapper.connect("/services/{path_info:.*}", controller=ec2.API())
+        mapper.connect("/cloudpipe/{path_info:.*}", controller=cloudpipe.API())
         super(API, self).__init__(mapper)
 
     @webob.dec.wsgify
diff --git a/nova/api/cloudpipe/__init__.py b/nova/api/cloudpipe/__init__.py
new file mode 100644
index 000000000..642f8ef6c
--- /dev/null
+++ b/nova/api/cloudpipe/__init__.py
@@ -0,0 +1,68 @@
+# 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.
+
+"""
+REST API Request Handlers for CloudPipe
+"""
+
+import logging
+import urllib
+import webob
+import webob.dec
+import webob.exc
+
+from nova import crypto
+from nova import wsgi
+from nova.auth import manager
+from nova.api.ec2 import cloud
+
+
+_log = logging.getLogger("api")
+_log.setLevel(logging.DEBUG)
+
+
+class API(wsgi.Application):
+
+    def __init__(self):
+        self.controller = cloud.CloudController()
+
+    @webob.dec.wsgify
+    def __call__(self, req):
+        if req.method == 'POST':
+            return self.sign_csr(req)
+        _log.debug("Cloudpipe path is %s" % req.path_info)
+        if req.path_info.endswith("/getca/"):
+            return self.send_root_ca(req)
+        return webob.exc.HTTPNotFound()
+
+    def get_project_id_from_ip(self, ip):
+        instance = self.controller.get_instance_by_ip(ip)
+        return instance['project_id']
+
+    def send_root_ca(self, req):
+        _log.debug("Getting root ca")
+        project_id = self.get_project_id_from_ip(req.remote_addr)
+        res = webob.Response()
+        res.headers["Content-Type"] = "text/plain"
+        res.body = crypto.fetch_ca(project_id)
+        return res
+
+    def sign_csr(self, req):
+        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)
-- 
cgit 


From c9ac49b2425b932f60a87da80887d4556806ca60 Mon Sep 17 00:00:00 2001
From: Eric Day <eday@oddments.org>
Date: Thu, 23 Sep 2010 11:21:14 -0700
Subject: Fixed cloudpipe lib init.

---
 nova/api/cloudpipe/__init__.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nova/api')

diff --git a/nova/api/cloudpipe/__init__.py b/nova/api/cloudpipe/__init__.py
index 642f8ef6c..6d40990a8 100644
--- a/nova/api/cloudpipe/__init__.py
+++ b/nova/api/cloudpipe/__init__.py
@@ -51,6 +51,7 @@ class API(wsgi.Application):
         return webob.exc.HTTPNotFound()
 
     def get_project_id_from_ip(self, ip):
+        # TODO(eday): This was removed with the ORM branch, fix!
         instance = self.controller.get_instance_by_ip(ip)
         return instance['project_id']
 
-- 
cgit 


From 2b30ffe2f3c79e3701487d18fe1d4eef671aa335 Mon Sep 17 00:00:00 2001
From: Eric Day <eday@oddments.org>
Date: Thu, 23 Sep 2010 13:18:40 -0700
Subject: Applied vish's fixes.

---
 nova/api/ec2/metadatarequesthandler.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/ec2/metadatarequesthandler.py b/nova/api/ec2/metadatarequesthandler.py
index 229e5a78d..08a8040ca 100644
--- a/nova/api/ec2/metadatarequesthandler.py
+++ b/nova/api/ec2/metadatarequesthandler.py
@@ -18,6 +18,8 @@
 
 """Metadata request handler."""
 
+import logging
+
 import webob.dec
 import webob.exc
 
@@ -63,9 +65,9 @@ class MetadataRequestHandler(object):
         cc = cloud.CloudController()
         meta_data = cc.get_metadata(req.remote_addr)
         if meta_data is None:
-            _log.error('Failed to get metadata for ip: %s' % req.remote_addr)
+            logging.error('Failed to get metadata for ip: %s' % req.remote_addr)
             raise webob.exc.HTTPNotFound()
-        data = self.lookup(path, meta_data)
+        data = self.lookup(req.path_info, meta_data)
         if data is None:
             raise webob.exc.HTTPNotFound()
         return self.print_data(data)
-- 
cgit