Merge "Removed status_topic config parameter"

watcher/decision_engine/manager.py

@@ -51,13 +51,6 @@ WATCHER_DECISION_ENGINE_OPTS = [
                help='The topic name used for '
                     'control events, this topic '
                     'used for RPC calls'),
-    cfg.StrOpt('status_topic',
-               default='watcher.decision.status',
-               help='The topic name used for '
-                    'status events; this topic '
-                    'is used so as to notify'
-                    'the others components '
-                    'of the system'),
     cfg.ListOpt('notification_topics',
                 default=['versioned_notifications', 'watcher_notifications'],
                 help='The topic names from which notification events '
@@ -79,7 +72,7 @@ CONF.register_group(decision_engine_opt_group)
 CONF.register_opts(WATCHER_DECISION_ENGINE_OPTS, decision_engine_opt_group)
 
 
-class DecisionEngineManager(service_manager.ServiceManagerBase):
+class DecisionEngineManager(service_manager.ServiceManager):
 
     @property
     def service_name(self):
@@ -97,10 +90,6 @@ class DecisionEngineManager(service_manager.ServiceManagerBase):
     def conductor_topic(self):
         return CONF.watcher_decision_engine.conductor_topic
 
-    @property
-    def status_topic(self):
-        return CONF.watcher_decision_engine.status_topic
-
     @property
     def notification_topics(self):
         return CONF.watcher_decision_engine.notification_topics
@@ -109,10 +98,6 @@ class DecisionEngineManager(service_manager.ServiceManagerBase):
     def conductor_endpoints(self):
         return [audit_endpoint.AuditEndpoint]
 
-    @property
-    def status_endpoints(self):
-        return []
-
     @property
     def notification_endpoints(self):
         return self.collector_manager.get_notification_endpoints()

watcher/decision_engine/rpcapi.py

@@ -21,6 +21,7 @@ from oslo_config import cfg
 
 from watcher.common import exception
 from watcher.common import service
+from watcher.common import service_manager
 from watcher.common import utils
 from watcher.decision_engine import manager
 
@@ -45,7 +46,7 @@ class DecisionEngineAPI(service.Service):
             context, 'trigger_audit', audit_uuid=audit_uuid)
 
 
-class DecisionEngineAPIManager(object):
+class DecisionEngineAPIManager(service_manager.ServiceManager):
 
     @property
     def service_name(self):
@@ -63,10 +64,6 @@ class DecisionEngineAPIManager(object):
     def conductor_topic(self):
         return CONF.watcher_decision_engine.conductor_topic
 
-    @property
-    def status_topic(self):
-        return CONF.watcher_decision_engine.status_topic
-
     @property
     def notification_topics(self):
         return []
@@ -75,10 +72,6 @@ class DecisionEngineAPIManager(object):
     def conductor_endpoints(self):
         return []
 
-    @property
-    def status_endpoints(self):
-        return []
-
     @property
     def notification_endpoints(self):
         return []