fix request.content_type if WebOb<1.7.4

Author: auhlig

watcher/common.py

@@ -163,8 +163,14 @@ def is_content_json(req):
     :param req: the request
     :return: bool
     """
-    return req.content_type == 'application/json' \
-        and int(req.content_length) > 0
+    content_type = ''
+    try:
+        content_type = req.content_type
+    except AttributeError:
+        content_type = req.environ.get(['CONTENT_TYPE'], '')
+    finally:
+        return 'application/json' in content_type \
+            and int(req.content_length) > 0
 
 
 def is_uid_string(string):

watcher/tests/test_common.py

@@ -14,11 +14,11 @@
 
 import six
 import unittest
-
-from pycadf import cadftaxonomy as taxonomy
+import webob
 
 import watcher.common as common
 
+from . import fake
 
 class TestCommon(unittest.TestCase):
     def test_is_version_string(self):
@@ -82,6 +82,42 @@ def test_get_project_id_from_path(self):
                 stim.get('help')
             )
 
+    def test_is_content_json(self):
+        stimuli = [
+            {
+                'request': fake.create_request(
+                    path='/v2.1/os-aggregates/0123456789abcdef0123456789abcdef/action',
+                    method='POST',
+                    body_dict={"add_host": {"host": "21549b2f665945baaa7101926a00143c"}},
+                ),
+                'expected': True
+            },
+            {
+                'request': fake.create_request(
+                    path='/v2.1/os-aggregates/0123456789abcdef0123456789abcdef/action'
+                ),
+                'expected': False
+            },
+            {
+                'request': webob.Request.blank(
+                    path='/v1/foobar'
+                ),
+                'expected': False
+            }
+        ]
+
+        for s in stimuli:
+            req = s.get('request')
+            expected = s.get('expected')
+            actual = common.is_content_json(req)
+
+            self.assertEqual(
+                actual,
+                expected,
+                "should be '{0}' but got '{1}'".format(expected, actual)
+            )
+
+
 
 if __name__ == '__main__':
     unittest.main()