From 94a34e0e69a520e403a2d8e579186fad9acf14c7 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Fri, 29 Jun 2012 21:32:08 -0600
Subject: Add ServiceCatalog entries to enable Cinder usage

 * Part of of blueprint extract-nova-volumes
 * Adds usage of service catalog to ec2
 * Adds entries to auth.py
 * Implements tests for new authorization mods

Change-Id: I2efb375bbb130cde6a1ba119fa862ca45b126a1e
---
 nova/tests/api/test_auth.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/api/test_auth.py b/nova/tests/api/test_auth.py
index 10d2cecbf..e937da541 100644
--- a/nova/tests/api/test_auth.py
+++ b/nova/tests/api/test_auth.py
@@ -12,6 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import json
 import webob
 
 import nova.api.auth
@@ -33,6 +34,7 @@ class TestNovaKeystoneContextMiddleware(test.TestCase):
         self.request = webob.Request.blank('/')
         self.request.headers['X_TENANT_ID'] = 'testtenantid'
         self.request.headers['X_AUTH_TOKEN'] = 'testauthtoken'
+        self.request.headers['X_SERVICE_CATALOG'] = json.dumps({})
 
     def test_no_user_or_user_id(self):
         response = self.request.get_response(self.middleware)
-- 
cgit