From 5f11a265e8e901f958ee0cb2d1dc5145fdeaea05 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 4 May 2016 10:03:01 +0000
Subject: [PATCH] Task #9078: Updated QPID infra, moved to
SAS/QPIDInfrastructure
---
.gitattributes | 34 +++++++++----------
CMake/LofarPackageList.cmake | 2 +-
.../qpid/local/sbin/build_queues.sh | 4 +--
SAS/CMakeLists.txt | 1 +
.../QPIDInfrastructure/CMakeLists.txt | 0
.../QPIDInfrastructure/README | 0
.../QPIDInfrastructure/bin/CMakeLists.txt | 0
.../QPIDInfrastructure/bin/addtoQPIDDB.py | 0
.../bin/compareQPIDwithDB.py | 0
.../bin/configQPIDfromDB.py | 2 ++
.../bin/gatherfrombrokers.sh | 0
.../QPIDInfrastructure/bin/populateDB.sh | 8 ++---
.../QPIDInfrastructure/bin/qpidinfra_dump.sql | 0
.../QPIDInfrastructure/bin/route_to_struct.py | 0
.../QPIDInfrastructure/lib/CMakeLists.txt | 0
.../QPIDInfrastructure/lib/QPIDDB.py | 0
.../QPIDInfrastructure/lib/__init__.py | 0
.../QPIDInfrastructure/lib/psqlQPIDDB.py | 0
.../QPIDInfrastructure/sql/CMakeLists.txt | 0
.../QPIDInfrastructure/sql/qpidinfradb.sql | 0
.../test/test_qpid_database.sh | 0
SAS/ResourceAssignment/CMakeLists.txt | 1 -
22 files changed, 27 insertions(+), 25 deletions(-)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/CMakeLists.txt (100%)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/README (100%)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/bin/CMakeLists.txt (100%)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/bin/addtoQPIDDB.py (100%)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/bin/compareQPIDwithDB.py (100%)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/bin/configQPIDfromDB.py (77%)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/bin/gatherfrombrokers.sh (100%)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/bin/populateDB.sh (93%)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/bin/qpidinfra_dump.sql (100%)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/bin/route_to_struct.py (100%)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/lib/CMakeLists.txt (100%)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/lib/QPIDDB.py (100%)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/lib/__init__.py (100%)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/lib/psqlQPIDDB.py (100%)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/sql/CMakeLists.txt (100%)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/sql/qpidinfradb.sql (100%)
rename SAS/{ResourceAssignment => }/QPIDInfrastructure/test/test_qpid_database.sh (100%)
diff --git a/.gitattributes b/.gitattributes
index 985f3647b9e..47fd2c6b749 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4965,29 +4965,29 @@ SAS/OTDB_Services/test/t_TreeStatusEvents.py -text
SAS/OTDB_Services/test/t_TreeStatusEvents.run -text svneol=unset#application/x-shellscript
SAS/OTDB_Services/test/t_TreeStatusEvents.sh -text svneol=unset#application/x-shellscript
SAS/OTDB_Services/test/unittest_db.dump.gz -text svneol=unset#application/x-gzip
+SAS/QPIDInfrastructure/CMakeLists.txt -text
+SAS/QPIDInfrastructure/README -text
+SAS/QPIDInfrastructure/bin/CMakeLists.txt -text
+SAS/QPIDInfrastructure/bin/addtoQPIDDB.py -text
+SAS/QPIDInfrastructure/bin/compareQPIDwithDB.py -text
+SAS/QPIDInfrastructure/bin/configQPIDfromDB.py -text
+SAS/QPIDInfrastructure/bin/gatherfrombrokers.sh -text
+SAS/QPIDInfrastructure/bin/populateDB.sh -text
+SAS/QPIDInfrastructure/bin/qpidinfra_dump.sql -text
+SAS/QPIDInfrastructure/bin/route_to_struct.py -text
+SAS/QPIDInfrastructure/lib/CMakeLists.txt -text
+SAS/QPIDInfrastructure/lib/QPIDDB.py -text
+SAS/QPIDInfrastructure/lib/__init__.py -text
+SAS/QPIDInfrastructure/lib/psqlQPIDDB.py -text
+SAS/QPIDInfrastructure/sql/CMakeLists.txt -text
+SAS/QPIDInfrastructure/sql/qpidinfradb.sql -text
+SAS/QPIDInfrastructure/test/test_qpid_database.sh -text
SAS/ResourceAssignment/CMakeLists.txt -text
SAS/ResourceAssignment/OTDBtoRATaskStatusPropagator/CMakeLists.txt -text
SAS/ResourceAssignment/OTDBtoRATaskStatusPropagator/__init__.py -text
SAS/ResourceAssignment/OTDBtoRATaskStatusPropagator/otdbtorataskstatuspropagator -text
SAS/ResourceAssignment/OTDBtoRATaskStatusPropagator/otdbtorataskstatuspropagator.ini -text
SAS/ResourceAssignment/OTDBtoRATaskStatusPropagator/propagator.py -text
-SAS/ResourceAssignment/QPIDInfrastructure/CMakeLists.txt -text
-SAS/ResourceAssignment/QPIDInfrastructure/README -text
-SAS/ResourceAssignment/QPIDInfrastructure/bin/CMakeLists.txt -text
-SAS/ResourceAssignment/QPIDInfrastructure/bin/addtoQPIDDB.py -text
-SAS/ResourceAssignment/QPIDInfrastructure/bin/compareQPIDwithDB.py -text
-SAS/ResourceAssignment/QPIDInfrastructure/bin/configQPIDfromDB.py -text
-SAS/ResourceAssignment/QPIDInfrastructure/bin/gatherfrombrokers.sh -text
-SAS/ResourceAssignment/QPIDInfrastructure/bin/populateDB.sh -text
-SAS/ResourceAssignment/QPIDInfrastructure/bin/qpidinfra_dump.sql -text
-SAS/ResourceAssignment/QPIDInfrastructure/bin/route_to_struct.py -text
-SAS/ResourceAssignment/QPIDInfrastructure/lib/CMakeLists.txt -text
-SAS/ResourceAssignment/QPIDInfrastructure/lib/QPIDDB.py -text
-SAS/ResourceAssignment/QPIDInfrastructure/lib/__init__.py -text
-SAS/ResourceAssignment/QPIDInfrastructure/lib/psqlQPIDDB.py -text
-SAS/ResourceAssignment/QPIDInfrastructure/sql/CMakeLists.txt -text
-SAS/ResourceAssignment/QPIDInfrastructure/sql/qpidinfradb.sql -text
-SAS/ResourceAssignment/QPIDInfrastructure/test/test_qpid_database.sh -text
SAS/ResourceAssignment/RATaskSpecifiedService/bin/CMakeLists.txt -text
SAS/ResourceAssignment/RATaskSpecifiedService/bin/rataskspecifiedservice -text
SAS/ResourceAssignment/RATaskSpecifiedService/bin/rataskspecifiedservice.ini -text
diff --git a/CMake/LofarPackageList.cmake b/CMake/LofarPackageList.cmake
index de24f9cf9fe..5939efc2a0c 100644
--- a/CMake/LofarPackageList.cmake
+++ b/CMake/LofarPackageList.cmake
@@ -146,7 +146,7 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
set(MoMQueryService_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/MoM/MoMQueryService)
set(jOTDB3_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB/jOTDB3)
set(OTB-Java_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB/OTB)
- set(QPIDInfrastructure_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/ResourceAssignment/QPIDInfrastructure)
+ set(QPIDInfrastructure_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/QPIDInfrastructure)
set(RATaskSpecifiedService_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/ResourceAssignment/RATaskSpecifiedService)
set(RAtoOTDBTaskSpecificationPropagator_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator)
set(ResourceAssigner_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/ResourceAssignment/ResourceAssigner)
diff --git a/LCS/MessageBus/qpid/local/sbin/build_queues.sh b/LCS/MessageBus/qpid/local/sbin/build_queues.sh
index e41d83e0ada..43e828982d9 100644
--- a/LCS/MessageBus/qpid/local/sbin/build_queues.sh
+++ b/LCS/MessageBus/qpid/local/sbin/build_queues.sh
@@ -18,7 +18,7 @@ if [ "$host" == "CCU001" ]; then
ccu="CCU001.control.lofar"
mcu="MCU001.control.lofar"
sas="SAS001.control.lofar"
- cobalt_root="cbt00"
+ cobalt_root="cbm00"
cobalt_start=1
cobalt_end=8
mom="LCS023.control.lofar"
@@ -30,7 +30,7 @@ else
ccu="CCU099.control.lofar"
mcu="mcu099" # see /etc/hosts
sas="sas099" # see /etc/hosts
- cobalt_root="cbt00"
+ cobalt_root="cbm00"
cobalt_start=9
cobalt_end=9
mom="LCS028.control.lofar"
diff --git a/SAS/CMakeLists.txt b/SAS/CMakeLists.txt
index 9a6b79312d5..a328b52f5d3 100644
--- a/SAS/CMakeLists.txt
+++ b/SAS/CMakeLists.txt
@@ -3,6 +3,7 @@
lofar_add_package(OTDB)
lofar_add_package(OTB)
lofar_add_package(OTDB_SQL OTDB/sql)
+lofar_add_package(QPIDInfrastructure)
lofar_add_package(Scheduler)
lofar_add_package(SAS_Feedback Feedback_Service)
lofar_add_package(CleanupTool)
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/CMakeLists.txt b/SAS/QPIDInfrastructure/CMakeLists.txt
similarity index 100%
rename from SAS/ResourceAssignment/QPIDInfrastructure/CMakeLists.txt
rename to SAS/QPIDInfrastructure/CMakeLists.txt
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/README b/SAS/QPIDInfrastructure/README
similarity index 100%
rename from SAS/ResourceAssignment/QPIDInfrastructure/README
rename to SAS/QPIDInfrastructure/README
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/bin/CMakeLists.txt b/SAS/QPIDInfrastructure/bin/CMakeLists.txt
similarity index 100%
rename from SAS/ResourceAssignment/QPIDInfrastructure/bin/CMakeLists.txt
rename to SAS/QPIDInfrastructure/bin/CMakeLists.txt
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/bin/addtoQPIDDB.py b/SAS/QPIDInfrastructure/bin/addtoQPIDDB.py
similarity index 100%
rename from SAS/ResourceAssignment/QPIDInfrastructure/bin/addtoQPIDDB.py
rename to SAS/QPIDInfrastructure/bin/addtoQPIDDB.py
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/bin/compareQPIDwithDB.py b/SAS/QPIDInfrastructure/bin/compareQPIDwithDB.py
similarity index 100%
rename from SAS/ResourceAssignment/QPIDInfrastructure/bin/compareQPIDwithDB.py
rename to SAS/QPIDInfrastructure/bin/compareQPIDwithDB.py
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/bin/configQPIDfromDB.py b/SAS/QPIDInfrastructure/bin/configQPIDfromDB.py
similarity index 77%
rename from SAS/ResourceAssignment/QPIDInfrastructure/bin/configQPIDfromDB.py
rename to SAS/QPIDInfrastructure/bin/configQPIDfromDB.py
index 362eb0d56ef..38d1ffbc8d9 100755
--- a/SAS/ResourceAssignment/QPIDInfrastructure/bin/configQPIDfromDB.py
+++ b/SAS/QPIDInfrastructure/bin/configQPIDfromDB.py
@@ -10,9 +10,11 @@ def qpidconfig_add_topic(settings):
print ("qpid-config -b %s add exchange topic %s --durable" %(settings['hostname'],settings['exchangename']))
def qpidroute_add(settings):
+ print ("qpid-route -d route del %s %s %s \'%s\' " %(settings['tohost'],settings['fromhost'],settings['exchangename'],settings['routingkey']))
print ("qpid-route -d route add %s %s %s \'%s\' " %(settings['tohost'],settings['fromhost'],settings['exchangename'],settings['routingkey']))
def qpidQroute_add(settings):
+ print ("qpid-route -d queue del %s %s '%s' '%s'" %(settings['tohost'],settings['fromhost'],settings['exchangename'],settings['queuename']))
print ("qpid-route -d queue add %s %s '%s' '%s'" %(settings['tohost'],settings['fromhost'],settings['exchangename'],settings['queuename']))
dbcreds = dbcredentials.DBCredentials().get("qpidinfra")
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/bin/gatherfrombrokers.sh b/SAS/QPIDInfrastructure/bin/gatherfrombrokers.sh
similarity index 100%
rename from SAS/ResourceAssignment/QPIDInfrastructure/bin/gatherfrombrokers.sh
rename to SAS/QPIDInfrastructure/bin/gatherfrombrokers.sh
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/bin/populateDB.sh b/SAS/QPIDInfrastructure/bin/populateDB.sh
similarity index 93%
rename from SAS/ResourceAssignment/QPIDInfrastructure/bin/populateDB.sh
rename to SAS/QPIDInfrastructure/bin/populateDB.sh
index 22dbb7746a2..e24f0454a77 100755
--- a/SAS/ResourceAssignment/QPIDInfrastructure/bin/populateDB.sh
+++ b/SAS/QPIDInfrastructure/bin/populateDB.sh
@@ -99,9 +99,9 @@ done
# MessageRouter -> MoM
# -----------------------------------------
-addtoQPIDDB.py --broker $CCU --queue mom.task.feedback.dataproducts --federation $MOM_USER
-addtoQPIDDB.py --broker $CCU --queue mom.task.feedback.processing --federation $MOM_USER
-addtoQPIDDB.py --broker $CCU --queue mom.task.feedback.state --federation $MOM_USER
+addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.feedback.dataproducts --federation $MOM_USER
+addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.feedback.processing --federation $MOM_USER
+addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.feedback.state --federation $MOM_USER
# -----------------------------------------
# MessageRouter -> OTDB
@@ -121,7 +121,7 @@ addtoQPIDDB.py --broker $CCU --exchange ${PREFIX}mac.task.feedback.state
# -----------------------------------------
addtoQPIDDB.py --broker $MCU --queue ${PREFIX}lofar.task.specification.system --federation $CCU
-addtoQPIDDB.py --broker $CCU --queue mom.task.specification.system --federation $MOM_USER
+addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.specification.system --federation $MOM_USER
# -----------------------------------------
# MoM <-> MoM-OTDB-Adapter
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/bin/qpidinfra_dump.sql b/SAS/QPIDInfrastructure/bin/qpidinfra_dump.sql
similarity index 100%
rename from SAS/ResourceAssignment/QPIDInfrastructure/bin/qpidinfra_dump.sql
rename to SAS/QPIDInfrastructure/bin/qpidinfra_dump.sql
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/bin/route_to_struct.py b/SAS/QPIDInfrastructure/bin/route_to_struct.py
similarity index 100%
rename from SAS/ResourceAssignment/QPIDInfrastructure/bin/route_to_struct.py
rename to SAS/QPIDInfrastructure/bin/route_to_struct.py
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/lib/CMakeLists.txt b/SAS/QPIDInfrastructure/lib/CMakeLists.txt
similarity index 100%
rename from SAS/ResourceAssignment/QPIDInfrastructure/lib/CMakeLists.txt
rename to SAS/QPIDInfrastructure/lib/CMakeLists.txt
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/lib/QPIDDB.py b/SAS/QPIDInfrastructure/lib/QPIDDB.py
similarity index 100%
rename from SAS/ResourceAssignment/QPIDInfrastructure/lib/QPIDDB.py
rename to SAS/QPIDInfrastructure/lib/QPIDDB.py
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/lib/__init__.py b/SAS/QPIDInfrastructure/lib/__init__.py
similarity index 100%
rename from SAS/ResourceAssignment/QPIDInfrastructure/lib/__init__.py
rename to SAS/QPIDInfrastructure/lib/__init__.py
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/lib/psqlQPIDDB.py b/SAS/QPIDInfrastructure/lib/psqlQPIDDB.py
similarity index 100%
rename from SAS/ResourceAssignment/QPIDInfrastructure/lib/psqlQPIDDB.py
rename to SAS/QPIDInfrastructure/lib/psqlQPIDDB.py
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/sql/CMakeLists.txt b/SAS/QPIDInfrastructure/sql/CMakeLists.txt
similarity index 100%
rename from SAS/ResourceAssignment/QPIDInfrastructure/sql/CMakeLists.txt
rename to SAS/QPIDInfrastructure/sql/CMakeLists.txt
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/sql/qpidinfradb.sql b/SAS/QPIDInfrastructure/sql/qpidinfradb.sql
similarity index 100%
rename from SAS/ResourceAssignment/QPIDInfrastructure/sql/qpidinfradb.sql
rename to SAS/QPIDInfrastructure/sql/qpidinfradb.sql
diff --git a/SAS/ResourceAssignment/QPIDInfrastructure/test/test_qpid_database.sh b/SAS/QPIDInfrastructure/test/test_qpid_database.sh
similarity index 100%
rename from SAS/ResourceAssignment/QPIDInfrastructure/test/test_qpid_database.sh
rename to SAS/QPIDInfrastructure/test/test_qpid_database.sh
diff --git a/SAS/ResourceAssignment/CMakeLists.txt b/SAS/ResourceAssignment/CMakeLists.txt
index 6a61bf2d933..92b15a3a3f9 100644
--- a/SAS/ResourceAssignment/CMakeLists.txt
+++ b/SAS/ResourceAssignment/CMakeLists.txt
@@ -1,6 +1,5 @@
# $Id: CMakeLists.txt 32401 2015-09-03 13:41:57Z klijn $
-lofar_add_package(QPIDInfrastructure)
lofar_add_package(RATaskSpecifiedService)
lofar_add_package(RAtoOTDBTaskSpecificationPropagator)
lofar_add_package(ResourceAssigner)
--
GitLab