SW-693: Swap ToBus/FromBus broker/options parameters to make overriding broker...

SW-693: Swap ToBus/FromBus broker/options parameters to make overriding broker easier (common) than overriding options (uncommon)

LCS/MessageBus/include/MessageBus/FromBus.h

@@ -45,7 +45,7 @@ namespace LOFAR {
 class FromBus
 {
 public:
-  FromBus(const std::string &address, const std::string &options="; {create: never}", const std::string &broker = "amqp:tcp:127.0.0.1:5672") ;
+  FromBus(const std::string &address, const std::string &broker = "amqp:tcp:127.0.0.1:5672", const std::string &options="; {create: never}");
   ~FromBus(void);
   bool addQueue(const std::string &address, const std::string &options="; {create: never}");
 

LCS/MessageBus/include/MessageBus/ToBus.h

@@ -43,7 +43,7 @@ namespace LOFAR {
 class ToBus
 {
 public:
-  ToBus(const std::string &address, const std::string &options="; {create: never}", const std::string &broker = "amqp:tcp:127.0.0.1:5672") ;
+  ToBus(const std::string &address,  const std::string &broker = "amqp:tcp:127.0.0.1:5672", const std::string &options="; {create: never}");
   ~ToBus(void);
 
   void send(LOFAR::Message &msg);

LCS/MessageBus/src/FromBus.cc

@@ -14,7 +14,7 @@
 using namespace qpid::messaging;
 
 namespace LOFAR {
-  FromBus::FromBus(const std::string &address, const std::string &options, const std::string &broker)
+  FromBus::FromBus(const std::string &address, const std::string &broker, const std::string &options)
   try:
     itsConnection(broker,"{reconnect:true}"),
     itsNrMissingACKs(0)

LCS/MessageBus/src/ToBus.cc

@@ -15,7 +15,7 @@ using namespace qpid::messaging;
 
 namespace LOFAR {
 
-  ToBus::ToBus(const std::string &address, const std::string &options, const std::string &broker) 
+  ToBus::ToBus(const std::string &address, const std::string &broker, const std::string &options) 
   try:
     itsConnection(broker,"{reconnect:true}")
   {

SAS/QPIDInfrastructure/bin/populateDB.sh

@@ -39,14 +39,6 @@ if $PROD; then
 
   MOM_SYSTEM=lcs023.control.lofar
   MOM_INGEST=lcs029.control.lofar
-
-  COBALT="`seq -f cbm%03.0f.control.lofar 1 8`"
-
-  CEP4="`seq -f cpu%02.0f.cep4.control.lofar 1 50`"
-  CEP4HEAD="head01.cep4.control.lofar head02.cep4.control.lofar"
-
-  DRAGNET="`seq -f drg%02.0f.control.lofar 1 23` dragproc.control.lofar"
-  DRAGNETHEAD="dragnet.control.lofar"
 else
   CCU=ccu199.control.lofar
   MCU=mcu199.control.lofar
@@ -55,67 +47,8 @@ else
 
   MOM_SYSTEM=lcs028.control.lofar
   MOM_INGEST=lcs028.control.lofar
-
-  COBALT="cbm009.control.lofar"
-
-  CEP4="`seq -f cpu%02.0f.cep4.control.lofar 1 50`"
-  CEP4HEAD="head01.cep4.control.lofar head02.cep4.control.lofar"
-
-  DRAGNET="`seq -f drg%02.0f.control.lofar 21 23` dragproc.control.lofar"
-  DRAGNETHEAD="dragproc.control.lofar"
 fi
 
-# -----------------------------------------
-#   Cobalt GPUProc -> MessageRouter
-# -----------------------------------------
-
-for fnode in $COBALT
-do
-    addtoQPIDDB.py --broker $fnode --queue ${PREFIX}lofar.task.feedback.dataproducts --federation $CCU
-    addtoQPIDDB.py --broker $fnode --queue ${PREFIX}lofar.task.feedback.processing --federation $CCU
-    addtoQPIDDB.py --broker $fnode --queue ${PREFIX}lofar.task.feedback.state --federation $CCU
-done
-
-
-# -----------------------------------------
-#   Cobalt OutputProc & Pipelines -> MessageRouter
-# -----------------------------------------
-
-for tnode in $CEP4HEAD
-do
-  # CEP4 -> CEP4HEAD
-  for fnode in $CEP4
-  do
-    addtoQPIDDB.py --broker $fnode --queue ${PREFIX}lofar.task.feedback.dataproducts --federation $tnode
-    addtoQPIDDB.py --broker $fnode --queue ${PREFIX}lofar.task.feedback.processing --federation $tnode
-    addtoQPIDDB.py --broker $fnode --queue ${PREFIX}lofar.task.feedback.state --federation $tnode
-  done
-
-  # CEP4HEAD -> CCU
-  addtoQPIDDB.py --broker $tnode --queue ${PREFIX}lofar.task.feedback.dataproducts --federation $CCU
-  addtoQPIDDB.py --broker $tnode --queue ${PREFIX}lofar.task.feedback.processing --federation $CCU
-  addtoQPIDDB.py --broker $tnode --queue ${PREFIX}lofar.task.feedback.state --federation $CCU
-done
-
-# -----------------------------------------
-#   DRAGNET GPUProc & OutputProc -> MessageRouter
-# -----------------------------------------
-
-for tnode in $DRAGNETHEAD
-do
-  # DRAGNET -> DRAGNETHEAD
-  for fnode in $DRAGNET
-  do
-    addtoQPIDDB.py --broker $fnode --queue ${PREFIX}lofar.task.feedback.dataproducts --federation $tnode
-    addtoQPIDDB.py --broker $fnode --queue ${PREFIX}lofar.task.feedback.processing --federation $tnode
-    addtoQPIDDB.py --broker $fnode --queue ${PREFIX}lofar.task.feedback.state --federation $tnode
-  done
-
-  # DRAGNETHEAD -> CCU
-  addtoQPIDDB.py --broker $tnode --queue ${PREFIX}lofar.task.feedback.dataproducts --federation $CCU
-  addtoQPIDDB.py --broker $tnode --queue ${PREFIX}lofar.task.feedback.processing --federation $CCU
-  addtoQPIDDB.py --broker $tnode --queue ${PREFIX}lofar.task.feedback.state --federation $CCU
-done
 
 # -----------------------------------------
 #   Cobalt DataTapping (piggy-backing)
@@ -128,22 +61,10 @@ addtoQPIDDB.py --broker $SCU --exchange ${PREFIX}lofar.datatap.notification  # n
 #   MessageRouter -> MoM
 # -----------------------------------------
 
-addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.feedback.dataproducts --federation $MOM_SYSTEM
-addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.feedback.processing --federation $MOM_SYSTEM
-addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.feedback.state --federation $MOM_SYSTEM
-
-# -----------------------------------------
-#   MessageRouter -> OTDB
-# -----------------------------------------
+#addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.feedback.dataproducts --federation $MOM_SYSTEM
+#addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.feedback.processing --federation $MOM_SYSTEM
+#addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.feedback.state --federation $MOM_SYSTEM
 
-addtoQPIDDB.py --broker $CCU --queue ${PREFIX}otdb.task.feedback.dataproducts --federation $MCU
-addtoQPIDDB.py --broker $CCU --queue ${PREFIX}otdb.task.feedback.processing --federation $MCU
-
-# -----------------------------------------
-#   MessageRouter -> MAC
-# -----------------------------------------
-
-addtoQPIDDB.py --broker $CCU --exchange ${PREFIX}mac.task.feedback.state
 
 # -----------------------------------------
 #   MACScheduler -> MessageRouter -> MoM
@@ -243,20 +164,3 @@ addtoQPIDDB.py --broker $SCU --bind --exchange ${PREFIX}lofar.lta.ingest.notific
 addtoQPIDDB.py --broker $SCU --queue ${PREFIX}lofar.lta.ingest.notification.for.ltastorageoverview
 addtoQPIDDB.py --broker $SCU --bind --exchange ${PREFIX}lofar.lta.ingest.notification --queue ${PREFIX}lofar.lta.ingest.notification.for.ltastorageoverview --routingkey LTAIngest.#
 
-
-# -----------------------------------------
-#   CEP4 cpu nodes
-# -----------------------------------------
-
-for head in head01.cep4.control.lofar
-do
-  for cpu in $CEP4
-  do
-    addtoQPIDDB.py --dynamic --broker $cpu --exchange ${PREFIX}lofar.otdb.command --federation $head
-    addtoQPIDDB.py --dynamic --broker $head --exchange ${PREFIX}lofar.otdb.command --federation $cpu
-  done
-
-  addtoQPIDDB.py --dynamic --broker $head --exchange ${PREFIX}lofar.otdb.command --federation $SCU
-  addtoQPIDDB.py --dynamic --broker $SCU   --exchange ${PREFIX}lofar.otdb.command --federation $head
-done
-