Merge "Fix callback_type for validation_json.py"

validations_common/callback_plugins/validation_json.py

@@ -31,7 +31,7 @@ DOCUMENTATION = '''
     description:
         - This callback converts all events into a JSON file
           stored in /var/log/validations
-    type: agregate
+    type: aggregate
     requirements: None
 '''
 
@@ -59,7 +59,7 @@ def secondsToStr(t):
 
 class CallbackModule(CallbackBase):
     CALLBACK_VERSION = 2.0
-    CALLBACK_TYPE = 'agregate'
+    CALLBACK_TYPE = 'aggregate'
     CALLBACK_NAME = 'validation_json'
     CALLBACK_NEEDS_WHITELIST = True
 

validations_common/tests/callback_plugins/test_validation_json.py

@@ -81,7 +81,7 @@ class TestValidationJson(base.TestCase):
         self.assertIn('CALLBACK_TYPE', dir(callback))
         self.assertEqual(callback.CALLBACK_NAME, 'validation_json')
         self.assertIsInstance(callback.CALLBACK_VERSION, float)
-        self.assertEqual(callback.CALLBACK_TYPE, 'agregate')
+        self.assertEqual(callback.CALLBACK_TYPE, 'aggregate')
         """
         Additionally, the 'validation_json' callback performs several
         other operations during instantiation.