logging to debug. manila parse json body fix

Author: auhlig

watcher/cadf_strategy.py

@@ -12,7 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import json
 import logging
 import re
 import six
@@ -122,12 +121,13 @@ def determine_target_type_uri(self, req):
                 target_type_uri = self._determine_target_type_uri_by_parts(path.split('/'))
 
         except Exception as e:
-            self.logger.warning("exception while determining the target type URI of '{0} {1}': {2}"
-                                .format(req.method, req.path, str(e)))
+            self.logger.debug(
+                "exception while determining the target type URI of '{0} {1}': {2}".format(req.method, req.path, str(e))
+            )
 
         finally:
             if common.is_none_or_unknown(target_type_uri):
-                self.logger.warning("failed to determine target type URI of '{0} {1}'".format(req.method, req.path))
+                self.logger.debug("failed to determine target type URI of '{0} {1}'".format(req.method, req.path))
                 return
 
             return self._add_prefix_target_type_uri(target_type_uri)
@@ -211,16 +211,18 @@ def _cadf_action_from_body(self, json_body):
         """
         cadf_action = taxonomy.UNKNOWN
         try:
-            if json_body:
-                d = json.loads(json_body)
-                # the 1st key specifies the action type
-                os_action = next(iter(d))
-                if os_action:
-                    # add prefix to os_action
-                    cadf_action = self.cadf_os_action_prefix + os_action
-                    return
+            if isinstance(json_body, str) or isinstance(json_body, unicode):
+                json_body = common.load_json_dict(json_body)
+            # the 1st key specifies the action type
+            os_action = next(iter(json_body))
+            # avoid empty string '""'
+            if os_action and len(os_action) > 2:
+                # add prefix to os_action
+                cadf_action = self.cadf_os_action_prefix + str(os_action)
+                return
         except Exception as e:
-            self.logger.error("error while determining action from json body: {0}".format(str(e)))
+            self.logger.debug("error while determining action from json body: {0}".format(str(e)))
+
         finally:
             return cadf_action
 
@@ -303,7 +305,7 @@ def _determine_target_type_uri_by_regex(self, path):
                     return new_path
 
             except Exception as e:
-                self.logger.warning('failed to apply regex {0} to path: {1}: {2}'.format(regex, path, e))
+                self.logger.debug('failed to apply regex {0} to path: {1}: {2}'.format(regex, path, e))
                 continue
 
         # return 'None' if path is unchanged or new path
@@ -335,7 +337,7 @@ def _determine_target_type_uri_by_parts(self, path_parts):
                     target_type_uri.append(part)
 
         except Exception as e:
-            self.logger.warning("failed to get target_type_uri from request path: %s" % str(e))
+            self.logger.debug("failed to get target_type_uri from request path: %s" % str(e))
             target_type_uri = []
         finally:
             # we need at least one part
@@ -485,7 +487,7 @@ def determine_target_type_uri(self, req):
                 target_type_uri.append('object')
 
         except Exception as e:
-            self.logger.error("error while determining target type URI from request '{0} {1}': {2}"
+            self.logger.debug("error while determining target type URI from request '{0} {1}': {2}"
                               .format(req.method, req.path, str(e)))
 
         finally:

watcher/common.py

@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import json
 import re
 import six
 
@@ -207,3 +208,17 @@ def endswith_version(string):
 
 def string_to_bool(bool_string):
     return bool_string.lower() == 'true'
+
+
+def load_json_dict(json_body):
+    """
+    converts a json body to a dictionary
+
+    :param json_body: the json body of a request might be string, unicode or dict
+    :return: the json body as a dictionary
+    """
+    if isinstance(json_body, str) or isinstance(json_body, unicode):
+        json_body = json.loads(json_body)
+    if isinstance(json_body, dict):
+        return json_body
+    return load_json_dict(json_body)

watcher/tests/test_manila.py

@@ -88,6 +88,20 @@ def test_cadf_action(self):
                 ),
                 'expected': 'update/unmanage'
             },
+            {
+                'request': fake.create_request(
+                    path='/v2/b206a1900310484f8a9504754c84b067/shares/b206a1900310484f8a9504754c84b067/action',
+                    body_dict='{ "access_list": null }'
+                ),
+                'expected': 'update/access_list'
+            },
+            {
+                'request': fake.create_request(
+                    path='/v2/b206a1900310484f8a9504754c84b067/shares/b206a1900310484f8a9504754c84b067/action',
+                    body_dict=u'{ "access_list": null }'
+                ),
+                'expected': 'update/access_list'
+            },
         ]
 
         for stim in stimuli:

watcher/watcher.py

@@ -59,7 +59,7 @@ def __init__(self, app, config, logger=logging.getLogger(__name__)):
             try:
                 self.watcher_config = load_config(config_file_path)
             except errors.ConfigError as e:
-                self.logger.warning("custom actions not available: %s", str(e))
+                self.logger.debug("custom actions not available: %s", str(e))
 
         custom_action_config = self.watcher_config.get('custom_actions', {})
         path_keywords = self.watcher_config.get('path_keywords', {})
@@ -204,7 +204,7 @@ def _start_response_wrapper(status, headers, exc_info=None):
                 self.metric_client.timing('api_requests_duration_seconds', time.time() - start, tags=labels)
                 self.metric_client.increment('api_requests_total', tags=labels)
             except Exception as e:
-                self.logger.info("failed to submit metrics for %s: %s" % (str(labels), str(e)))
+                self.logger.debug("failed to submit metrics for %s: %s" % (str(labels), str(e)))
             finally:
                 self.metric_client.close_buffer()
 
@@ -340,7 +340,7 @@ def get_project_domain_and_user_id_from_keystone_authentication_request(self, re
             domain_id = common.find_domain_id_in_auth_dict(json_body_dict)
             user_id = common.find_user_id_in_auth_dict(json_body_dict)
         except ValueError as e:
-            self.logger.warning('unable to read request body: ', str(e))
+            self.logger.debug('unable to read request body: ', str(e))
         finally:
             return project_id, domain_id, user_id