diff options
| -rw-r--r-- | doc/source/middleware.rst | 2 | ||||
| -rw-r--r-- | pycadf/helper/__init__.py | 0 | ||||
| -rw-r--r-- | pycadf/helper/api.py | 40 | ||||
| -rw-r--r-- | pycadf/tests/helper/__init__.py | 0 | ||||
| -rw-r--r-- | pycadf/tests/helper/test_api.py | 44 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
6 files changed, 86 insertions, 2 deletions
diff --git a/doc/source/middleware.rst b/doc/source/middleware.rst index 920279a..22d7410 100644 --- a/doc/source/middleware.rst +++ b/doc/source/middleware.rst @@ -72,7 +72,7 @@ example using Nova's WSGI pipeline:: keystone = faultwrap sizelimit authtoken keystonecontext ratelimit audit osapi_compute_app_v2 keystone_nolimit = faultwrap sizelimit authtoken keystonecontext audit osapi_compute_app_v2 -.. _oslo.messaging: http://www.dmtf.org/standards/cadf +.. _oslo.messaging: https://github.com/openstack/oslo.messaging .. _old notification system: https://github.com/openstack/oslo-incubator .. _middleware code base: https://github.com/openstack/oslo-incubator/tree/master/openstack/common/middleware diff --git a/pycadf/helper/__init__.py b/pycadf/helper/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/pycadf/helper/__init__.py diff --git a/pycadf/helper/api.py b/pycadf/helper/api.py new file mode 100644 index 0000000..c9656ae --- /dev/null +++ b/pycadf/helper/api.py @@ -0,0 +1,40 @@ +# +# 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. + +import six + +from pycadf import cadftaxonomy + + +def convert_req_action(method, details=None): + """Maps standard HTTP methods to equivalent CADF action + + :param method: HTTP request method + :param details: Extra details to append to action. + """ + + mapping = {'get': cadftaxonomy.ACTION_READ, + 'head': cadftaxonomy.ACTION_READ, + 'post': cadftaxonomy.ACTION_CREATE, + 'put': cadftaxonomy.ACTION_UPDATE, + 'delete': cadftaxonomy.ACTION_DELETE, + 'patch': cadftaxonomy.ACTION_UPDATE, + 'options': cadftaxonomy.ACTION_READ, + 'trace': 'capture'} + + action = None + if isinstance(method, six.string_types): + action = mapping.get(method.lower()) + if action and isinstance(details, six.string_types): + action += '/%s' % details + return action or cadftaxonomy.UNKNOWN diff --git a/pycadf/tests/helper/__init__.py b/pycadf/tests/helper/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/pycadf/tests/helper/__init__.py diff --git a/pycadf/tests/helper/test_api.py b/pycadf/tests/helper/test_api.py new file mode 100644 index 0000000..16466ce --- /dev/null +++ b/pycadf/tests/helper/test_api.py @@ -0,0 +1,44 @@ +# +# 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. + +from pycadf import cadftaxonomy +from pycadf.helper import api +from pycadf.tests import base + + +class TestApiHelper(base.TestCase): + def test_convert_req_action(self): + self.assertEqual(cadftaxonomy.ACTION_READ, + api.convert_req_action('get')) + self.assertEqual(cadftaxonomy.ACTION_CREATE, + api.convert_req_action('POST')) + self.assertEqual(cadftaxonomy.ACTION_DELETE, + api.convert_req_action('deLetE')) + + def test_convert_req_action_invalid(self): + self.assertEqual(cadftaxonomy.UNKNOWN, api.convert_req_action(124)) + self.assertEqual(cadftaxonomy.UNKNOWN, api.convert_req_action('blah')) + + def test_convert_req_action_with_details(self): + detail = 'compute/instance' + self.assertEqual(cadftaxonomy.ACTION_READ + '/%s' % detail, + api.convert_req_action('GET', detail)) + self.assertEqual(cadftaxonomy.ACTION_DELETE + '/%s' % detail, + api.convert_req_action('DELETE', detail)) + + def test_convert_req_action_with_details_invalid(self): + detail = 123 + self.assertEqual(cadftaxonomy.ACTION_READ, + api.convert_req_action('GET', detail)) + self.assertEqual(cadftaxonomy.ACTION_DELETE, + api.convert_req_action('DELETE', detail)) diff --git a/test-requirements.txt b/test-requirements.txt index b512f0f..f68f957 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,7 +8,7 @@ coverage>=3.6 discover fixtures>=0.3.14 mock>=1.0 -oslo.messaging>=1.4.0,!=1.5.0 +oslo.messaging>=1.6.0 # Apache-2.0 oslotest>=1.2.0 # Apache-2.0 python-subunit>=0.0.18 testrepository>=0.0.18 |