diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-18 12:47:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-18 12:47:32 +0000 |
| commit | f2be5181abf60fb84d7ea0b49eeec110e26a03d9 (patch) | |
| tree | a3bcb4ecb5373dbd79f25c89654f37a669dc1b0a | |
| parent | 6c0c988b69a778f907b0e6afc2d56409cbf2feb7 (diff) | |
| parent | 0d1fc6c81fa35e7f56e64cf22cea56bca7981930 (diff) | |
| download | keystonemiddleware-f2be5181abf60fb84d7ea0b49eeec110e26a03d9.tar.gz | |
Merge "Use jsonutils instead of ast for loading the service catalog"
| -rw-r--r-- | keystonemiddleware/audit/_api.py | 5 | ||||
| -rw-r--r-- | keystonemiddleware/tests/unit/audit/base.py | 4 | ||||
| -rw-r--r-- | keystonemiddleware/tests/unit/audit/test_audit_api.py | 16 |
3 files changed, 12 insertions, 13 deletions
diff --git a/keystonemiddleware/audit/_api.py b/keystonemiddleware/audit/_api.py index ad50b4b..0d3361f 100644 --- a/keystonemiddleware/audit/_api.py +++ b/keystonemiddleware/audit/_api.py @@ -10,11 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -import ast import collections import logging import re +from oslo_serialization import jsonutils from pycadf import cadftaxonomy as taxonomy from pycadf import cadftype from pycadf import credential @@ -251,8 +251,7 @@ class OpenStackAuditApi(object): catalog = {} try: - catalog = ast.literal_eval( - req.environ['HTTP_X_SERVICE_CATALOG']) + catalog = jsonutils.loads(req.environ['HTTP_X_SERVICE_CATALOG']) except KeyError: msg = _LW('Unable to discover target information because ' 'service catalog is missing. Either the incoming ' diff --git a/keystonemiddleware/tests/unit/audit/base.py b/keystonemiddleware/tests/unit/audit/base.py index d2ea250..f159808 100644 --- a/keystonemiddleware/tests/unit/audit/base.py +++ b/keystonemiddleware/tests/unit/audit/base.py @@ -82,8 +82,8 @@ class BaseAuditMiddlewareTest(utils.BaseTestCase): "internalURL": "http://internal_host:8774", "id": "resource_id"}], - "type": "compute", - "name": "nova"},]''', + "type": "compute", + "name": "nova"}]''', 'HTTP_X_USER_ID': 'user_id', 'HTTP_X_USER_NAME': 'user_name', 'HTTP_X_AUTH_TOKEN': 'token', diff --git a/keystonemiddleware/tests/unit/audit/test_audit_api.py b/keystonemiddleware/tests/unit/audit/test_audit_api.py index d6ff469..b84254c 100644 --- a/keystonemiddleware/tests/unit/audit/test_audit_api.py +++ b/keystonemiddleware/tests/unit/audit/test_audit_api.py @@ -225,8 +225,8 @@ class AuditApiLogicTest(base.BaseAuditMiddlewareTest): "http://public_host:8774", "internalURL": "http://internal_host:8774"}], - "type": "compute", - "name": "nova"},]''', + "type": "compute", + "name": "nova"}]''', 'HTTP_X_USER_ID': 'user_id', 'HTTP_X_USER_NAME': 'user_name', 'HTTP_X_AUTH_TOKEN': 'token', @@ -246,8 +246,8 @@ class AuditApiLogicTest(base.BaseAuditMiddlewareTest): "region": "RegionOne", "publicURL": "http://public_host:8774"}], - "type": "compute", - "name": "nova"},]''', + "type": "compute", + "name": "nova"}]''', 'HTTP_X_USER_ID': 'user_id', 'HTTP_X_USER_NAME': 'user_name', 'HTTP_X_AUTH_TOKEN': 'token', @@ -267,8 +267,8 @@ class AuditApiLogicTest(base.BaseAuditMiddlewareTest): "region": "RegionOne", "internalURL": "http://internal_host:8774"}], - "type": "compute", - "name": "nova"},]''', + "type": "compute", + "name": "nova"}]''', 'HTTP_X_USER_ID': 'user_id', 'HTTP_X_USER_NAME': 'user_name', 'HTTP_X_AUTH_TOKEN': 'token', @@ -288,8 +288,8 @@ class AuditApiLogicTest(base.BaseAuditMiddlewareTest): "http://public_host:8774", "internalURL": "http://internal_host:8774"}], - "type": "compute", - "name": "nova"},]''', + "type": "compute", + "name": "nova"}]''', 'HTTP_X_USER_ID': 'user_id', 'HTTP_X_USER_NAME': 'user_name', 'HTTP_X_AUTH_TOKEN': 'token', |