Remove stale notification code

In this changeset, I cleaned up the Watcher codebase to remove
the old notification mechanism that is actually unused.

Partially Implements: blueprint watcher-notifications-ovo

Change-Id: I1901e65f031441b98a7d6f6c9c1c0364eaaaf481

watcher/decision_engine/audit/base.py

@@ -22,8 +22,6 @@ import six
 
 from oslo_log import log
 
-from watcher.common.messaging.events import event as watcher_event
-from watcher.decision_engine.messaging import events as de_events
 from watcher.decision_engine.planner import manager as planner_manager
 from watcher.decision_engine.strategy.context import default as default_context
 from watcher import objects
@@ -72,19 +70,11 @@ class AuditHandler(BaseAuditHandler):
     def strategy_context(self):
         return self._strategy_context
 
-    def notify(self, audit_uuid, event_type, status):
-        event = watcher_event.Event()
-        event.type = event_type
-        event.data = {}
-        payload = {'audit_uuid': audit_uuid,
-                   'audit_status': status}
-        self.messaging.publish_status_event(event.type.name, payload)
-
-    def update_audit_state(self, audit, state):
+    @staticmethod
+    def update_audit_state(audit, state):
         LOG.debug("Update audit state: %s", state)
         audit.state = state
         audit.save()
-        self.notify(audit.uuid, de_events.Events.TRIGGER_AUDIT, state)
 
     def pre_execute(self, audit, request_context):
         LOG.debug("Trigger audit %s", audit.uuid)

watcher/decision_engine/messaging/events.py

@@ -1,26 +0,0 @@
-# -*- encoding: utf-8 -*-
-# Copyright (c) 2015 b<>com
-#
-# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-import enum
-
-
-class Events(enum.Enum):
-    ALL = '*',
-    ACTION_PLAN = "action_plan"
-    TRIGGER_AUDIT = "trigger_audit"

watcher/decision_engine/model/mapping.py

@@ -14,8 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import threading
-
+from oslo_concurrency import lockutils
 from oslo_log import log
 
 from watcher._i18n import _LW
@@ -28,7 +27,6 @@ class Mapping(object):
         self.model = model
         self.compute_node_mapping = {}
         self.instance_mapping = {}
-        self.lock = threading.Lock()
 
     def map(self, node, instance):
         """Select the node where the instance is launched
@@ -36,9 +34,7 @@ class Mapping(object):
         :param node: the node
         :param instance: the virtual machine or instance
         """
-        try:
-            self.lock.acquire()
-
+        with lockutils.lock(__name__):
             # init first
             if node.uuid not in self.compute_node_mapping.keys():
                 self.compute_node_mapping[node.uuid] = set()
@@ -49,9 +45,6 @@ class Mapping(object):
             # map instance => node
             self.instance_mapping[instance.uuid] = node.uuid
 
-        finally:
-            self.lock.release()
-
     def unmap(self, node, instance):
         """Remove the instance from the node
 
@@ -65,8 +58,7 @@ class Mapping(object):
 
         :rtype : object
         """
-        try:
-            self.lock.acquire()
+        with lockutils.lock(__name__):
             if str(node_uuid) in self.compute_node_mapping:
                 self.compute_node_mapping[str(node_uuid)].remove(
                     str(instance_uuid))
@@ -77,8 +69,6 @@ class Mapping(object):
                     _LW("Trying to delete the instance %(instance)s but it "
                         "was not found on node %(node)s") %
                     {'instance': instance_uuid, 'node': node_uuid})
-        finally:
-            self.lock.release()
 
     def get_mapping(self):
         return self.compute_node_mapping

watcher/decision_engine/rpcapi.py

@@ -20,7 +20,6 @@
 from oslo_config import cfg
 
 from watcher.common import exception
-from watcher.common.messaging import notification_handler
 from watcher.common import service
 from watcher.common import utils
 from watcher.decision_engine import manager
@@ -78,7 +77,7 @@ class DecisionEngineAPIManager(object):
 
     @property
     def status_endpoints(self):
-        return [notification_handler.NotificationHandler]
+        return []
 
     @property
     def notification_endpoints(self):