X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2Fnorm_json.py;h=cc208277d8e15dd4853cbd160f131c0174510e0f;hb=refs%2Fchanges%2F41%2F86341%2F2;hp=e113e7fe656ac36c835b52554225827799f6ec9a;hpb=035e62e375d95d4025d1f4e7b5013d9b070310ff;p=integration%2Ftest.git

diff --git a/csit/libraries/norm_json.py b/csit/libraries/norm_json.py
index e113e7fe65..cc208277d8 100644
--- a/csit/libraries/norm_json.py
+++ b/csit/libraries/norm_json.py
@@ -154,7 +154,31 @@ def sort_bits(obj, keys_with_bits=[]):
     return obj
 
 
-def normalize_json_text(text, strict=False, indent=1, keys_with_bits=[], jmes_path=None):
+def hide_volatile(obj, keys_with_volatiles=[]):
+    """
+    Takes list of keys with volatile values, and replaces them with generic "*"
+
+    :param obj: python dict from json
+    :param keys_with_volatiles: list of volatile keys
+    :return: corrected
+    """
+    if isinstance(obj, dict):
+        for key, value in obj.iteritems():
+            # Unicode is not str and vice versa, isinstance has to check for both.
+            # Luckily, "in" recognizes equivalent strings in different encodings.
+            # Type "bytes" is added for Python 3 compatibility.
+            if key in keys_with_volatiles and isinstance(value, (unicode, str, bytes, int, bool)):
+                obj[key] = "*"
+            else:
+                hide_volatile(value, keys_with_volatiles)
+    # A string is not a list, so there is no risk of recursion over characters.
+    elif isinstance(obj, list):
+        for item in obj:
+            hide_volatile(item, keys_with_volatiles)
+    return obj
+
+
+def normalize_json_text(text, strict=False, indent=1, keys_with_bits=[], keys_with_volatiles=[], jmes_path=None):
     """
     Attempt to return sorted indented JSON string.
 
@@ -187,6 +211,8 @@ def normalize_json_text(text, strict=False, indent=1, keys_with_bits=[], jmes_pa
             return str(err) + '\n' + text
     if keys_with_bits:
         sort_bits(object_decoded, keys_with_bits)
+    if keys_with_volatiles:
+        hide_volatile(object_decoded, keys_with_volatiles)
 
     pretty_json = dumps_indented(object_decoded, indent=indent)