Task #9939: add QPID entries for DRAGNET. Fix symlink ccu099 -> ccu199

LCS/MessageBus/qpid/local/sbin/build_queues.sh

@@ -3,7 +3,7 @@
 # This script will set up the queues and routes needed for the LOFAR 
 # Production system
 # Run it as lofarsys on ccu001 or ccu099
-# Dependning on the system, it will set up the queues for prod or test
+# Depending on the system, it will set up the queues for prod or test
 #
 
 # Run this on CCU001, CCU002, or CCU099
@@ -19,37 +19,46 @@ if [ "$host" == "CCU001" ]; then
   ccu="CCU001.control.lofar"
   mcu="MCU001.control.lofar" 
   sas="SAS001.control.lofar"
-  cobalt_root="cbm00" 
+  cobalt_root="cbm001" 
   cobalt_start=1
   cobalt_end=8
   mom="LCS023.control.lofar"
   head="lhn001.cep2.lofar"
   node_start=1
   node_end=94
+  drg_head="dragnet.control.lofar"
+  drg_node_start=1
+  drg_node_end=23
 elif [ "$host" == "CCU002" ]; then
   # Host definitions: PRODUCTION READY TEST
   ccu="ccu002.control.lofar"
   mcu="mcu002.control.lofar" 
   sas="SAS099.control.lofar"
-  cobalt_root="cbm00" 
+  cobalt_root="cbm001" 
   cobalt_start=9
   cobalt_end=9
   mom="LCS028.control.lofar"
   head="locus102.cep2.lofar"
   node_start=98
   node_end=99
+  drg_head="dragproc.control.lofar"
+  drg_node_start=21
+  drg_node_end=23
 else
   # Host definitions: TEST
   ccu="CCU099.control.lofar"
   mcu="mcu099" # see /etc/hosts
   sas="sas099" # see /etc/hosts
-  cobalt_root="cbm00" 
+  cobalt_root="cbm009" 
   cobalt_start=9
   cobalt_end=9
   mom="LCS028.control.lofar"
   head="locus102.cep2.lofar"
   node_start=98
   node_end=99
+  drg_head="dragproc.control.lofar"
+  drg_node_start=1  # start=1,end=0 allows no drg nodes ...
+  drg_node_end=0    # ... and thus only the dragproc node
 fi
 
 if [ "$1" == "-h" ] || [ "$1" == "-?" ] || [ "$1" == "--help" ]; then
@@ -101,6 +110,10 @@ fed lofar.task.feedback.processing    $head    $ccu
 fed lofar.task.feedback.dataproducts  $head    $ccu
 fed lofar.task.feedback.state         $head    $ccu
 
+fed lofar.task.feedback.processing    $drg_head    $ccu
+fed lofar.task.feedback.dataproducts  $drg_head    $ccu
+fed lofar.task.feedback.state         $drg_head    $ccu
+
 fed otdb.task.feedback.processing     $ccu     $mcu
 fed otdb.task.feedback.dataproducts   $ccu     $mcu
 fed lofar.task.specification.system   $mcu     $ccu
@@ -109,7 +122,7 @@ fed mom.task.feedback.processing      $ccu     $mom
 fed mom.task.feedback.dataproducts    $ccu     $mom
 fed mom.task.feedback.state           $ccu     $mom
 fed mom.task.specification.system     $ccu     $mom
-  
+
 fed mom.command                       $sas     $mom
 fed mom.importxml                     $sas     $mom
 fed mom-otdb-adapter.importxml        $mom     $sas
@@ -121,3 +134,10 @@ do
     fed lofar.task.feedback.state         $NODE $head
 done
 
+for NODE in $(seq -f "drg%02g.control.lofar" $drg_node_start $drg_node_end) dragproc.control.lofar
+do
+    fed lofar.task.feedback.dataproducts  $NODE $head
+    fed lofar.task.feedback.processing    $NODE $head
+    fed lofar.task.feedback.state         $NODE $head
+done
+

LCS/MessageDaemons/src/MessageRouter.conf.ccu001

-MessageRouter.conf.ccu099
\ No newline at end of file
+MessageRouter.conf.ccu199
\ No newline at end of file

LCS/MessageDaemons/src/MessageRouter.conf.ccu199

@@ -12,4 +12,4 @@
 lofar.task.feedback.dataproducts:  otdb.task.feedback.dataproducts
 lofar.task.feedback.processing:    mom.task.feedback.processing, otdb.task.feedback.processing
 lofar.task.feedback.state:         mac.task.feedback.state
-lofar.task.specification.system:   mom.task.specification.system
+lofar.task.specification.system:   mom.task.specification.system, cobalt.task.specification.system

SAS/QPIDInfrastructure/bin/populateDB.sh

@@ -45,6 +45,9 @@ if $PROD; then
 
   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
@@ -59,6 +62,9 @@ else
 
   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
 
 # -----------------------------------------
@@ -93,6 +99,33 @@ do
   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)
+# -----------------------------------------
+
+addtoQPIDDB.py --broker $SCU --exchange ${PREFIX}lofar.datatap.command  # COBALT piggy-backing request-reply
+addtoQPIDDB.py --broker $SCU --exchange ${PREFIX}lofar.datatap.notification  # notification who has been granted COBALT piggy-backing
+
 # -----------------------------------------
 #   MessageRouter -> MoM
 # -----------------------------------------