Task #8887: use defaults from otdb config

SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/propagator.py

@@ -37,7 +37,7 @@ from lofar.sas.resourceassignment.resourceassignmentservice.config import DEFAUL
 from lofar.sas.resourceassignment.resourceassignmentservice.config import DEFAULT_SERVICENAME as RADB_SERVICENAME
 
 from lofar.sas.resourceassignment.ratootdbtaskspecificationpropagator.otdbrpc import OTDBRPC
-from lofar.sas.otdb.config import DEFAULT_OTDB_SERVICE_BUSNAME, DEFAULT_DEFAULT_OTDB_SERVICENAME
+from lofar.sas.otdb.config import DEFAULT_OTDB_SERVICE_BUSNAME, DEFAULT_OTDB_SERVICENAME
 from lofar.sas.resourceassignment.ratootdbtaskspecificationpropagator.translator import RAtoOTDBTranslator
 
 logger = logging.getLogger(__name__)
@@ -48,8 +48,8 @@ class RAtoOTDBPropagator():
                  radb_busname=RADB_BUSNAME,
                  radb_servicename=RADB_SERVICENAME,
                  radb_broker=None,
-                 DEFAULT_OTDB_SERVICE_BUSNAME=DEFAULT_OTDB_SERVICE_BUSNAME,
-                 DEFAULT_OTDB_SERVICENAME=DEFAULT_OTDB_SERVICENAME,
+                 otdb_busname=DEFAULT_OTDB_SERVICE_BUSNAME,
+                 otdb_servicename=DEFAULT_OTDB_SERVICENAME,
                  otdb_broker=None,
                  broker=None):
         """
@@ -57,8 +57,8 @@ class RAtoOTDBPropagator():
         :param radb_busname: busname on which the radb service listens (default: lofar.ra.command)
         :param radb_servicename: servicename of the radb service (default: RADBService)
         :param radb_broker: valid Qpid broker host (default: None, which means localhost)
-        :param DEFAULT_OTDB_SERVICE_BUSNAME: busname on which the OTDB service listens (default: lofar.otdb.command)
-        :param DEFAULT_OTDB_SERVICENAME: servicename of the OTDB service (default: OTDBService)
+        :param otdb_busname: busname on which the OTDB service listens (default: lofar.otdb.command)
+        :param otdb_servicename: servicename of the OTDB service (default: OTDBService)
         :param otdb_broker: valid Qpid broker host (default: None, which means localhost)
         :param broker: if specified, overrules radb_broker and otdb_broker. Valid Qpid broker host (default: None, which means localhost)
         """
@@ -67,7 +67,7 @@ class RAtoOTDBPropagator():
             otdb_broker = broker
 
         self.radbrpc = RADBRPC(busname=radb_busname, servicename=radb_servicename, broker=radb_broker) ## , ForwardExceptions=True hardcoded in RPCWrapper right now
-        self.otdbrpc = OTDBRPC(busname=DEFAULT_OTDB_SERVICE_BUSNAME, servicename=DEFAULT_OTDB_SERVICENAME, broker=otdb_broker) ## , ForwardExceptions=True hardcoded in RPCWrapper right now
+        self.otdbrpc = OTDBRPC(busname=otdb_busname, servicename=otdb_servicename, broker=otdb_broker) ## , ForwardExceptions=True hardcoded in RPCWrapper right now
         self.translator = RAtoOTDBTranslator()
 
     def __enter__(self):

SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py

@@ -94,8 +94,8 @@ def main():
 
     from lofar.sas.resourceassignment.resourceassignmentservice.config import DEFAULT_BUSNAME as RADB_BUSNAME
     from lofar.sas.resourceassignment.resourceassignmentservice.config import DEFAULT_SERVICENAME as RADB_SERVICENAME
-    from lofar.sas.resourceassignment.ratootdbtaskspecificationpropagator.otdbrpc import DEFAULT_BUSNAME as OTDB_BUSNAME
-    from lofar.sas.resourceassignment.ratootdbtaskspecificationpropagator.otdbrpc import DEFAULT_SERVICENAME as OTDB_SERVICENAME
+    from lofar.sas.otdb.config import DEFAULT_OTDB_SERVICE_BUSNAME, DEFAULT_OTDB_SERVICENAME
+
 
     # Check the invocation arguments
     parser = OptionParser("%prog [options]",
@@ -105,8 +105,8 @@ def main():
     parser.add_option("--notification_subject", dest="notification_subject", type="string", default=RA_NOTIFICATION_PREFIX+'TaskUpdated', help="Subject of the published messages to listen for, default: %default")
     parser.add_option("--radb_busname", dest="radb_busname", type="string", default=RADB_BUSNAME, help="Name of the bus on which the RADB service listens, default: %default")
     parser.add_option("--radb_servicename", dest="radb_servicename", type="string", default=RADB_SERVICENAME, help="Name of the RADB service, default: %default")
-    parser.add_option("--otdb_busname", dest="otdb_busname", type="string", default=OTDB_BUSNAME, help="Name of the bus on which the OTDB service listens, default: %default")
-    parser.add_option("--otdb_servicename", dest="otdb_servicename", type="string", default=OTDB_SERVICENAME, help="Name of the OTDB service, default: %default")
+    parser.add_option("--otdb_busname", dest="otdb_busname", type="string", default=DEFAULT_OTDB_SERVICE_BUSNAME, help="Name of the bus on which the OTDB service listens, default: %default")
+    parser.add_option("--otdb_servicename", dest="otdb_servicename", type="string", default=DEFAULT_OTDB_SERVICENAME, help="Name of the OTDB service, default: %default")
     parser.add_option('-V', '--verbose', dest='verbose', action='store_true', help='verbose logging')
     (options, args) = parser.parse_args()