Fix Audit Update functional test

Change-Id: Iffd70302d0b1d7a919db3e6e44bd3bbebcb1e7ce

watcherclient/common/utils.py

@@ -75,7 +75,7 @@ def import_versioned_module(version, submodule=None):
     return importutils.import_module(module)
 
 
-def split_and_deserialize(string):
+def split_and_deserialize(string, exclude_fields=[]):
     """Split and try to JSON deserialize a string.
 
     Gets a string with the KEY=VALUE format, split it (using '=' as the
@@ -88,10 +88,11 @@ def split_and_deserialize(string):
     except ValueError:
         raise exc.CommandError(_('Attributes must be a list of '
                                  'PATH=VALUE not "%s"') % string)
-    try:
+    if key not in exclude_fields:
-        value = jsonutils.loads(value)
+        try:
-    except ValueError:
+            value = jsonutils.loads(value)
-        pass
+        except ValueError:
+            pass
 
     return (key, value)
 
@@ -104,7 +105,7 @@ def args_array_to_dict(kwargs, key_to_convert):
     return kwargs
 
 
-def args_array_to_patch(op, attributes):
+def args_array_to_patch(op, attributes, exclude_fields=[]):
     patch = []
     for attr in attributes:
         # Sanitize
@@ -112,7 +113,8 @@ def args_array_to_patch(op, attributes):
             attr = '/' + attr
 
         if op in ['add', 'replace']:
-            path, value = split_and_deserialize(attr)
+            path, value = split_and_deserialize(attr,
+                                                exclude_fields=exclude_fields)
             patch.append({'op': op, 'path': path, 'value': value})
 
         elif op == "remove":

watcherclient/v1/audit_shell.py

@@ -242,7 +242,8 @@ class UpdateAudit(command.ShowOne):
             raise exceptions.ValidationError()
 
         patch = common_utils.args_array_to_patch(
-            parsed_args.op, parsed_args.attributes[0])
+            parsed_args.op, parsed_args.attributes[0],
+            exclude_fields=['/interval'])
 
         audit = client.audit.update(parsed_args.audit, patch)