Task #8437: Moved otdbrpc to OTDB_Services, and fixed cmake dependencies and python imports

.gitattributes

@@ -4972,6 +4972,7 @@ SAS/OTDB_Services/TreeService.py -text
 SAS/OTDB_Services/TreeStatusEvents.ini -text
 SAS/OTDB_Services/TreeStatusEvents.py -text
 SAS/OTDB_Services/config.py -text
+SAS/OTDB_Services/otdbrpc.py -text
 SAS/OTDB_Services/test/CMakeLists.txt -text
 SAS/OTDB_Services/test/t_TreeService.py -text
 SAS/OTDB_Services/test/t_TreeService.run -text svneol=unset#application/x-shellscript
@@ -5017,7 +5018,6 @@ SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/bin/rotspservice.ini
 SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/CMakeLists.txt -text
 SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/__init__.py -text
 SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/config.py -text
-SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/otdbrpc.py -text
 SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/propagator.py -text
 SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py -text
 SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/translator.py -text

SAS/OTDB_Services/CMakeLists.txt

@@ -14,6 +14,7 @@ lofar_add_bin_scripts(
 
 set(_py_files
   config.py
+  otdbrpc.py
   OTDBBusListener.py
 )
 

SAS/ResourceAssignment/RATaskSpecifiedService/lib/RATaskSpecified.py

@@ -29,7 +29,7 @@ from lofar.messaging import FromBus, ToBus, EventMessage # RPC,
 from lofar.parameterset import PyParameterValue
 from lofar.sas.otdb.OTDBBusListener import OTDBBusListener
 from lofar.common.util import waitForInterrupt
-from lofar.sas.resourceassignment.ratootdbtaskspecificationpropagator.otdbrpc import OTDBRPC
+from lofar.sas.otdb.otdbrpc import OTDBRPC
 from lofar.sas.otdb.config import DEFAULT_OTDB_NOTIFICATION_BUSNAME, DEFAULT_OTDB_NOTIFICATION_SUBJECT
 from lofar.sas.resourceassignment.rataskspecified.config import DEFAULT_RA_TASK_SPECIFIED_NOTIFICATION_BUSNAME
 from lofar.sas.resourceassignment.rataskspecified.config import DEFAULT_RA_TASK_SPECIFIED_NOTIFICATION_SUBJECT

SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/CMakeLists.txt

 # $Id: CMakeLists.txt 30355 2014-11-04 13:46:05Z loose $
 
-lofar_package(RAtoOTDBTaskSpecificationPropagator 0.1 DEPENDS PyMessaging PyCommon pyparameterset)
+lofar_package(RAtoOTDBTaskSpecificationPropagator 0.1 DEPENDS PyMessaging PyCommon pyparameterset OTDB_Services)
 
 include(PythonInstall)
 set(USE_PYTHON_COMPILATION Off)

SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/CMakeLists.txt

@@ -6,6 +6,5 @@ python_install(
     translator.py
     config.py
     propagator.py
-    otdbrpc.py
     DESTINATION lofar/sas/resourceassignment/ratootdbtaskspecificationpropagator)
 

SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/propagator.py

@@ -36,7 +36,7 @@ from lofar.sas.resourceassignment.resourceassignmentservice.rpc import RARPC as
 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 OTDBRPC
+from lofar.sas.otdb.otdbrpc import OTDBRPC
 from lofar.sas.otdb.config import DEFAULT_OTDB_SERVICE_BUSNAME, DEFAULT_OTDB_SERVICENAME
 from lofar.sas.resourceassignment.ratootdbtaskspecificationpropagator.translator import RAtoOTDBTranslator
 

SAS/ResourceAssignment/ResourceAssigner/CMakeLists.txt

 # $Id: CMakeLists.txt 30355 2014-11-04 13:46:05Z loose $
 
-lofar_package(ResourceAssigner 0.1 DEPENDS PyMessaging PyCommon pyparameterset)
+lofar_package(ResourceAssigner 0.1 DEPENDS PyMessaging PyCommon pyparameterset OTDB_Services)
 
 include(PythonInstall)
 set(USE_PYTHON_COMPILATION Off)

SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py

@@ -40,7 +40,7 @@ from lofar.sas.resourceassignment.resourceassignmentservice.config import DEFAUL
 from lofar.sas.resourceassignment.resourceassignmentestimator.config import DEFAULT_BUSNAME as RE_BUSNAME
 from lofar.sas.resourceassignment.resourceassignmentestimator.config import DEFAULT_SERVICENAME as RE_SERVICENAME
 
-from lofar.sas.resourceassignment.ratootdbtaskspecificationpropagator.otdbrpc import OTDBRPC
+from lofar.sas.otdb.otdbrpc import OTDBRPC
 from lofar.sas.otdb.config import DEFAULT_OTDB_SERVICE_BUSNAME, DEFAULT_OTDB_SERVICENAME
 
 from lofar.sas.systemstatus.service.SSDBrpc import SSDBRPC