Merge "Replace voluptuous with JSONSchema to validate nop action"

watcher/applier/actions/nop.py

@@ -17,9 +17,8 @@
 # limitations under the License.
 #
 
+import jsonschema
 from oslo_log import log
-import six
-import voluptuous
 
 from watcher.applier.actions import base
 
@@ -42,10 +41,23 @@ class Nop(base.BaseAction):
 
     @property
     def schema(self):
-        return voluptuous.Schema({
+        return {
-            voluptuous.Required(self.MESSAGE): voluptuous.Any(
+            'type': 'object',
-                voluptuous.Any(*six.string_types), None)
+            'properties': {
-        })
+                'message': {
+                    'type': ['string', 'null']
+                }
+            },
+            'required': ['message'],
+            'additionalProperties': False,
+        }
+
+    def validate_parameters(self):
+        try:
+            jsonschema.validate(self.input_parameters, self.schema)
+            return True
+        except jsonschema.ValidationError as e:
+            raise e
 
     @property
     def message(self):