diff options
| author | Dan Prince <dprince@redhat.com> | 2012-07-23 17:06:54 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2012-07-23 17:23:27 -0400 |
| commit | 97478dbd48e343300cc71f3d5aae00843456d796 (patch) | |
| tree | c02e69840cfda07c8d94b4193e23be1f8057b8b0 /nova/api | |
| parent | 9b653109bb4cc83b610ca0eeb404b991157f3c9e (diff) | |
| download | nova-97478dbd48e343300cc71f3d5aae00843456d796.tar.gz nova-97478dbd48e343300cc71f3d5aae00843456d796.tar.xz nova-97478dbd48e343300cc71f3d5aae00843456d796.zip | |
Update NovaKeystoneContext to use jsonutils.
Minor fix to use jsonutils.loads instead of json.loads to
standardize w/ the rest of Nova.
Change-Id: I4a6912d29fbe425b29bd1b170b9bec19e3bfc46e
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/auth.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/auth.py b/nova/api/auth.py index a118b271e..8bc3c9d94 100644 --- a/nova/api/auth.py +++ b/nova/api/auth.py @@ -18,13 +18,13 @@ Common Auth Middleware. """ -import json import webob.dec import webob.exc from nova import context from nova import flags from nova.openstack.common import cfg +from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova import wsgi @@ -101,7 +101,7 @@ class NovaKeystoneContext(wsgi.Middleware): if req.headers.get('X_SERVICE_CATALOG') is not None: try: catalog_header = req.headers.get('X_SERVICE_CATALOG') - service_catalog = json.loads(catalog_header) + service_catalog = jsonutils.loads(catalog_header) except ValueError: raise webob.exc.HTTPInternalServerError( _('Invalid service catalog json.')) |