SW-699: Remove notification subject override

QA/QA_Service/lib/qa_service.py

@@ -24,7 +24,6 @@ from optparse import OptionParser, OptionGroup
 from threading import Thread
 from lofar.common.util import waitForInterrupt
 from lofar.sas.otdb.OTDBBusListener import OTDBBusListener
-from lofar.sas.otdb.config import DEFAULT_OTDB_NOTIFICATION_SUBJECT
 from lofar.messaging.messagebus import ToBus
 from lofar.messaging.messages import EventMessage
 from lofar.messaging import DEFAULT_BROKER, DEFAULT_BUSNAME
@@ -43,8 +42,6 @@ class QAService(OTDBBusListener):
     '''
     def __init__(self,
                  busname=DEFAULT_BUSNAME,
-                 qa_notification_subject_prefix=DEFAULT_QA_NOTIFICATION_SUBJECT_PREFIX,
-                 otdb_notification_subject=DEFAULT_OTDB_NOTIFICATION_SUBJECT,
                  broker=DEFAULT_BROKER,
                  qa_base_dir = '/data/qa',
                  **kwargs):
@@ -57,11 +54,10 @@ class QAService(OTDBBusListener):
         :param broker: valid Qpid broker host (default: None, which means localhost)
         """
         super(QAService, self).__init__(busname=busname,
-                                        subject=otdb_notification_subject,
                                         broker=broker,
                                         **kwargs)
 
-        self._qa_notification_subject_prefix = qa_notification_subject_prefix
+        self._qa_notification_subject_prefix = DEFAULT_QA_NOTIFICATION_SUBJECT_PREFIX
         self._send_bus = ToBus(address=busname, broker=broker)
         self.qa_base_dir = qa_base_dir
         self._unfinished_otdb_id_map = {}
@@ -291,9 +287,6 @@ def main():
     group.add_option("--busname", dest="busname", type="string",
                       default=DEFAULT_BUSNAME,
                       help="Bus or queue where the OTDB notifications are published. [default: %default]")
-    group.add_option("--otdb_notification_subject", dest="otdb_notification_subject", type="string",
-                      default=DEFAULT_OTDB_NOTIFICATION_SUBJECT,
-                      help="Subject of OTDB notifications on otdb_notification_busname. [default: %default]")
     parser.add_option_group(group)
     (options, args) = parser.parse_args()
 
@@ -302,7 +295,6 @@ def main():
 
     #start the qa service
     with QAService(busname=options.busname,
-                   otdb_notification_subject=options.otdb_notification_subject,
                    broker=options.broker) as service:
         #loop and wait for messages or interrupt.
         waitForInterrupt()