From b965dde9e95e16a9a207697d5729bd146c2dfd23 Mon Sep 17 00:00:00 2001
From: Michael Gundlach <michael.gundlach@rackspace.com>
Date: Wed, 1 Sep 2010 13:55:38 -0400
Subject: Fix simple errors to the point where we can run the tests [but not
 pass]

---
 nova/api/ec2/__init__.py          | 10 ++++++----
 nova/api/ec2/apirequestcontext.py | 33 ---------------------------------
 nova/api/ec2/cloud.py             |  2 +-
 nova/api/ec2/context.py           | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 38 deletions(-)
 delete mode 100644 nova/api/ec2/apirequestcontext.py
 create mode 100644 nova/api/ec2/context.py

(limited to 'nova/api')

diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index aee9915d0..3335338e0 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -26,9 +26,11 @@ import webob
 import webob.dec
 import webob.exc
 
+from nova import exception
+from nova import wsgi
+from nova.api.ec2 import context
 from nova.api.ec2 import admin
 from nova.api.ec2 import cloud
-from nova import exception
 from nova.auth import manager
 
 
@@ -74,7 +76,7 @@ class Authenticate(wsgi.Middleware):
             raise webob.exc.HTTPForbidden()
 
         # Authenticated!
-        req.environ['ec2.context'] = APIRequestContext(user, project)
+        req.environ['ec2.context'] = context.APIRequestContext(user, project)
 
         return self.application
 
@@ -188,7 +190,7 @@ class Authorization(wsgi.Middleware):
                    for role in roles)
     
 
-class Executor(wsg.Application):
+class Executor(wsgi.Application):
     """
     Executes 'ec2.action' upon 'ec2.controller', passing 'ec2.context' and 
     'ec2.action_args' (all variables in WSGI environ.)  Returns an XML
@@ -217,6 +219,6 @@ class Executor(wsg.Application):
         resp.body = ('<?xml version="1.0"?>\n'
                      '<Response><Errors><Error><Code>%s</Code>'
                      '<Message>%s</Message></Error></Errors>'
-                     '<RequestID>?</RequestID></Response>') % (code, message))
+                     '<RequestID>?</RequestID></Response>') % (code, message)
         return resp
 
diff --git a/nova/api/ec2/apirequestcontext.py b/nova/api/ec2/apirequestcontext.py
deleted file mode 100644
index fb3118020..000000000
--- a/nova/api/ec2/apirequestcontext.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.
-
-"""
-APIRequestContext
-"""
-
-import random
-
-class APIRequestContext(object):
-    def __init__(self, handler, user, project):
-        self.handler = handler
-        self.user = user
-        self.project = project
-        self.request_id = ''.join(
-                [random.choice('ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-')
-                 for x in xrange(20)]
-                )
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 566887c1a..fc0eb2711 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -357,7 +357,7 @@ class CloudController(object):
                 'instanceId': instance_id,
                 'requestId': context.request_id,
                 'status': volume['attach_status'],
-                'volumeId': volume_id})
+                'volumeId': volume_id}
 
     def _convert_to_set(self, lst, label):
         if lst == None or lst == []:
diff --git a/nova/api/ec2/context.py b/nova/api/ec2/context.py
new file mode 100644
index 000000000..fb3118020
--- /dev/null
+++ b/nova/api/ec2/context.py
@@ -0,0 +1,33 @@
+# 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.
+
+"""
+APIRequestContext
+"""
+
+import random
+
+class APIRequestContext(object):
+    def __init__(self, handler, user, project):
+        self.handler = handler
+        self.user = user
+        self.project = project
+        self.request_id = ''.join(
+                [random.choice('ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-')
+                 for x in xrange(20)]
+                )
-- 
cgit