Task #8887: use mehtod adaptNameToEnvironment from lofar.messaging to adapt...

Task #8887: use mehtod adaptNameToEnvironment from lofar.messaging to adapt the queue/busnames to production or test environment. defaults to test

LCS/Messaging/python/messaging/__init__.py

@@ -30,8 +30,13 @@ from messagebus import *
 from RPC import *
 from Service import *
 import logging
+import os
 
 def setQpidLogLevel(qpidLogLevel):
     for name, logger in logging.Logger.manager.loggerDict.items():
         if name.startswith('qpid.') and isinstance(logger, logging.Logger):
             logger.setLevel(qpidLogLevel)
+
+def adaptNameToEnvironment(name):
+    if os.environ.get('LOFARENV', 'test') != 'PRODUCTION':
+        return 'test.%s' % name

SAS/MoM/MoMQueryService/config.py

 #!/usr/bin/python
 # $Id$
 
-DEFAULT_BUSNAME = 'lofar.ra.command'
+from lofar.messaging import adaptNameToEnvironment
+
+DEFAULT_BUSNAME = adaptNameToEnvironment('lofar.ra.command')
 DEFAULT_SERVICENAME = 'momqueryservice'

SAS/OTDB_Services/config.py

 #!/usr/bin/python
 # $Id$
 
-DEFAULT_OTDB_SERVICE_BUSNAME = 'lofar.otdb.command'
+from lofar.messaging import adaptNameToEnvironment
+
+DEFAULT_OTDB_SERVICE_BUSNAME = adaptNameToEnvironment('lofar.otdb.command')
 DEFAULT_OTDB_SERVICENAME = 'OTDBService'
 
-DEFAULT_OTDB_NOTIFICATION_BUSNAME='lofar.otdb.notification'
+DEFAULT_OTDB_NOTIFICATION_BUSNAME= adaptNameToEnvironment('lofar.otdb.notification')
 DEFAULT_OTDB_NOTIFICATION_SUBJECT='TaskStatus'

SAS/ResourceAssignment/RATaskSpecifiedService/lib/config.py

 #!/usr/bin/python
 # $Id$
 
-DEFAULT_RA_TASK_SPECIFIED_NOTIFICATION_BUSNAME='lofar.ra.notification'
+from lofar.messaging import adaptNameToEnvironment
+
+DEFAULT_RA_TASK_SPECIFIED_NOTIFICATION_BUSNAME=adaptNameToEnvironment('lofar.ra.notification')
 DEFAULT_RA_TASK_SPECIFIED_NOTIFICATION_SUBJECT='RA.TaskSpecified'

SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/config.py

 #!/usr/bin/python
 # $Id$
 
-#DEFAULT_BUSNAME = 'lofar.ra.command'
-#DEFAULT_SERVICENAME = 'RAtoORTBTaskSpecificationPropagationService'
+from lofar.messaging import adaptNameToEnvironment
+
 

SAS/ResourceAssignment/ResourceAssigner/lib/config.py

 #!/usr/bin/python
 # $Id$
 
-DEFAULT_BUSNAME = 'lofar.ra.command'
+from lofar.messaging import adaptNameToEnvironment
+
+DEFAULT_BUSNAME = adaptNameToEnvironment('lofar.ra.command')
 DEFAULT_SERVICENAME = 'RAService'

SAS/ResourceAssignment/ResourceAssignmentDatabase/config.py

 #!/usr/bin/python
 # $Id$
 
-DEFAULT_NOTIFICATION_BUSNAME = 'lofar.ra.notification'
+from lofar.messaging import adaptNameToEnvironment
+
+DEFAULT_NOTIFICATION_BUSNAME = adaptNameToEnvironment('lofar.ra.notification')
 DEFAULT_NOTIFICATION_PREFIX = 'RADB.'
 DEFAULT_NOTIFICATION_SUBJECTS=DEFAULT_NOTIFICATION_PREFIX+'*'

SAS/ResourceAssignment/ResourceAssignmentEstimator/config.py

 #!/usr/bin/python
 # $Id$
 
-DEFAULT_BUSNAME = 'lofar.ra.command'
+from lofar.messaging import adaptNameToEnvironment
+
+DEFAULT_BUSNAME = adaptNameToEnvironment('lofar.ra.command')
 DEFAULT_SERVICENAME = 'ResourceEstimation'
 

SAS/ResourceAssignment/ResourceAssignmentService/config.py

 #!/usr/bin/python
 # $Id$
 
-DEFAULT_BUSNAME = 'lofar.ra.command'
+from lofar.messaging import adaptNameToEnvironment
+
+DEFAULT_BUSNAME = adaptNameToEnvironment('lofar.ra.command')
 DEFAULT_SERVICENAME = 'RADBService'

SAS/ResourceAssignment/SystemStatusService/config.py

 #!/usr/bin/python
 # $Id$
 
-DEFAULT_SSDB_BUSNAME = 'lofar.ssdb.command'
+from lofar.messaging import adaptNameToEnvironment
+
+DEFAULT_SSDB_BUSNAME = adaptNameToEnvironment('lofar.ssdb.command')
 DEFAULT_SSDB_SERVICENAME = 'SSDBService'