diff --git a/.gitattributes b/.gitattributes index afff48815dcb6bf51f5a10f3defd8d53d4d83f48..7ae7811fe0395ee421c872e5ae0b78b90a342afb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4974,10 +4974,10 @@ SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/bin/CMakeLists.txt -t SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/bin/rotspservice -text SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/bin/rotspservice.ini -text SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/CMakeLists.txt -text -SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/RABusListener.py -text SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/__init__.py -text SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/config.py -text SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/propagator.py -text +SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rabuslistener.py -text SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py -text SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/translator.py -text SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/test/CMakeLists.txt -text diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/CMakeLists.txt b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/CMakeLists.txt index b1a385c832b806474ed043396975f992dc594aa5..c72e156339a13a9b08ff1a780f700dc125b2d30b 100644 --- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/CMakeLists.txt +++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/CMakeLists.txt @@ -6,5 +6,6 @@ python_install( translator.py config.py propagator.py - DESTINATION lofar/sas/resourceassignment/RAtoOTDBTaskSpecificationPropagator) + rabuslistener.py + DESTINATION lofar/sas/resourceassignment/ratootdbtaskspecificationpropagator) diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/RABusListener.py b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rabuslistener.py similarity index 100% rename from SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/RABusListener.py rename to SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rabuslistener.py diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py index 76cf4add671df67606672e4966b3d48f9c60b77d..22e6dae10a61d69282eed127116ca7a644e327fd 100755 --- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py +++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py @@ -32,13 +32,13 @@ import logging from datetime import datetime import time -from lofar.sas.resourceassignment.RAtoOTDBTaskSpecificationPropagator.RABusListener import RATaskScheduledBusListener +from lofar.sas.resourceassignment.ratootdbtaskspecificationpropagator.RABusListener import RATaskScheduledBusListener from lofar.messaging.RPC import RPC, RPCException import lofar.sas.resourceassignment.resourceassignmentservice.rpc as rarpc ## RA DB from lofar.sas.resourceassignment.resourceassigner.config import DEFAULT_BUSNAME, DEFAULT_SERVICENAME from lofar.sas.resourceassignment.resourceassigner.config import RATASKSCHEDULED_NOTIFICATION_BUSNAME, RATASKSCHEDULED_NOTIFICATIONNAME -from lofar.sas.resourceassignment.RAtoOTDBTaskSpecificationPropagator.propagator import RAtoOTDBPropagator +from lofar.sas.resourceassignment.ratootdbtaskspecificationpropagator.propagator import RAtoOTDBPropagator logger = logging.getLogger(__name__)