Add audit.strategy events

In this changeset, I implemented the following notifications:

- audit.strategy.start
- audit.strategy.end
- audit.strategy.error

Partially Implements: blueprint audit-versioned-notifications-api

Change-Id: I6ae8468caf8d215bc8bc694813beb4dc94f53fdb

watcher/notifications/audit.py

@@ -20,6 +20,7 @@ from oslo_config import cfg
 
 from watcher.common import exception
 from watcher.notifications import base as notificationbase
+from watcher.notifications import exception as exception_notifications
 from watcher.notifications import goal as goal_notifications
 from watcher.notifications import strategy as strategy_notifications
 from watcher.objects import base
@@ -38,8 +39,6 @@ class AuditPayload(notificationbase.NotificationPayloadBase):
         'parameters': ('audit', 'parameters'),
         'interval': ('audit', 'interval'),
         'scope': ('audit', 'scope'),
-        # 'goal_uuid': ('audit', 'goal_uuid'),
-        # 'strategy_uuid': ('audit', 'strategy_uuid'),
 
         'created_at': ('audit', 'created_at'),
         'updated_at': ('audit', 'updated_at'),
@@ -111,6 +110,22 @@ class AuditUpdatePayload(AuditPayload):
             strategy=strategy)
 
 
+@base.WatcherObjectRegistry.register_notification
+class AuditActionPayload(AuditPayload):
+    # Version 1.0: Initial version
+    VERSION = '1.0'
+    fields = {
+        'fault': wfields.ObjectField('ExceptionPayload', nullable=True),
+    }
+
+    def __init__(self, audit, goal, strategy, **kwargs):
+        super(AuditActionPayload, self).__init__(
+            audit=audit,
+            goal=goal,
+            strategy=strategy,
+            **kwargs)
+
+
 @base.WatcherObjectRegistry.register_notification
 class AuditDeletePayload(AuditPayload):
     # Version 1.0: Initial version
@@ -124,16 +139,17 @@ class AuditDeletePayload(AuditPayload):
             strategy=strategy)
 
 
-# @notificationbase.notification_sample('audit-create.json')
-# @notificationbase.notification_sample('audit-delete.json')
-# @base.WatcherObjectRegistry.register_notification
-# class AuditActionNotification(notificationbase.NotificationBase):
-#     # Version 1.0: Initial version
-#     VERSION = '1.0'
+@notificationbase.notification_sample('audit-strategy-error.json')
+@notificationbase.notification_sample('audit-strategy-end.json')
+@notificationbase.notification_sample('audit-strategy-start.json')
+@base.WatcherObjectRegistry.register_notification
+class AuditActionNotification(notificationbase.NotificationBase):
+    # Version 1.0: Initial version
+    VERSION = '1.0'
 
-#     fields = {
-#         'payload': wfields.ObjectField('AuditActionPayload')
-#     }
+    fields = {
+        'payload': wfields.ObjectField('AuditActionPayload')
+    }
 
 
 @notificationbase.notification_sample('audit-create.json')
@@ -261,3 +277,34 @@ def send_delete(context, audit, service='infra-optim', host=None):
         payload=versioned_payload)
 
     notification.emit(context)
+
+
+def send_action_notification(context, audit, action, phase=None,
+                             priority=wfields.NotificationPriority.INFO,
+                             service='infra-optim', host=None):
+    """Emit an audit action notification."""
+    goal_payload, strategy_payload = _get_common_payload(audit)
+
+    fault = None
+    if phase == wfields.NotificationPhase.ERROR:
+        fault = exception_notifications.ExceptionPayload.from_exception()
+
+    versioned_payload = AuditActionPayload(
+        audit=audit,
+        goal=goal_payload,
+        strategy=strategy_payload,
+        fault=fault,
+    )
+
+    notification = AuditActionNotification(
+        priority=priority,
+        event_type=notificationbase.EventType(
+            object='audit',
+            action=action,
+            phase=phase),
+        publisher=notificationbase.NotificationPublisher(
+            host=host or CONF.host,
+            binary=service),
+        payload=versioned_payload)
+
+    notification.emit(context)

watcher/notifications/base.py

@@ -55,8 +55,10 @@ class NotificationObject(base.WatcherObject):
 
 @base.WatcherObjectRegistry.register_notification
 class EventType(NotificationObject):
+
     # Version 1.0: Initial version
-    VERSION = '1.0'
+    # Version 1.1: Added STRATEGY action in NotificationAction enum
+    VERSION = '1.1'
 
     fields = {
         'object': wfields.StringField(),

watcher/notifications/exception.py

@@ -11,6 +11,7 @@
 #    under the License.
 
 import inspect
+import sys
 
 import six
 
@@ -31,7 +32,8 @@ class ExceptionPayload(notificationbase.NotificationPayloadBase):
     }
 
     @classmethod
-    def from_exception(cls, fault):
+    def from_exception(cls, fault=None):
+        fault = fault or sys.exc_info()[1]
         trace = inspect.trace()[-1]
         # TODO(gibi): apply strutils.mask_password on exception_message and
         # consider emitting the exception_message only if the safe flag is