From 983bd60232d0713ae37db7f160d7666445267cf4 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 27 Jan 2016 10:21:14 +0000
Subject: [PATCH] Task #8888: Renamed JobsToSchedule to RATaskSpecified
---
.gitattributes | 10 +++++-----
SAS/ResourceAssignment/Services/src/CMakeLists.txt | 6 +++---
.../Services/src/RABusListener.py | 10 +++++-----
.../src/{JobsToSchedule.py => RATaskSpecified.py} | 10 +++++-----
...obstoscheduleservice => rataskspecifiedservice} | 0
...eduleservice.ini => rataskspecifiedservice.ini} | 2 +-
.../Services/test/CMakeLists.txt | 2 +-
.../Services/test/tJobsToSchedule.sh | 2 --
...n_correlator => tRATaskSpecified.in_correlator} | 0
...rocessing => tRATaskSpecified.in_preprocessing} | 0
.../{tJobsToSchedule.py => tRATaskSpecified.py} | 14 +++++++-------
.../Services/test/tRATaskSpecified.sh | 2 ++
12 files changed, 29 insertions(+), 29 deletions(-)
rename SAS/ResourceAssignment/Services/src/{JobsToSchedule.py => RATaskSpecified.py} (96%)
rename SAS/ResourceAssignment/Services/src/{jobstoscheduleservice => rataskspecifiedservice} (100%)
rename SAS/ResourceAssignment/Services/src/{jobstoscheduleservice.ini => rataskspecifiedservice.ini} (57%)
delete mode 100755 SAS/ResourceAssignment/Services/test/tJobsToSchedule.sh
rename SAS/ResourceAssignment/Services/test/{tJobsToSchedule.in_correlator => tRATaskSpecified.in_correlator} (100%)
rename SAS/ResourceAssignment/Services/test/{tJobsToSchedule.in_preprocessing => tRATaskSpecified.in_preprocessing} (100%)
rename SAS/ResourceAssignment/Services/test/{tJobsToSchedule.py => tRATaskSpecified.py} (92%)
create mode 100755 SAS/ResourceAssignment/Services/test/tRATaskSpecified.sh
diff --git a/.gitattributes b/.gitattributes
index 540db8e8dc9..0e421ae8be8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5035,11 +5035,11 @@ SAS/ResourceAssignment/ResourceAssignmentEditor/test/CMakeLists.txt -text
SAS/ResourceAssignment/ResourceAssignmentEditor/test/test_webservice.py -text
SAS/ResourceAssignment/ResourceAssignmentEditor/test/test_webservice.run -text
SAS/ResourceAssignment/ResourceAssignmentEditor/test/test_webservice.sh -text
-SAS/ResourceAssignment/Services/src/jobstoscheduleservice -text
-SAS/ResourceAssignment/Services/src/jobstoscheduleservice.ini -text
-SAS/ResourceAssignment/Services/test/tJobsToSchedule.in_correlator -text
-SAS/ResourceAssignment/Services/test/tJobsToSchedule.in_preprocessing -text
-SAS/ResourceAssignment/Services/test/tJobsToSchedule.sh eol=lf
+SAS/ResourceAssignment/Services/src/rataskspecifiedservice -text
+SAS/ResourceAssignment/Services/src/rataskspecifiedservice.ini -text
+SAS/ResourceAssignment/Services/test/tRATaskSpecified.in_correlator -text
+SAS/ResourceAssignment/Services/test/tRATaskSpecified.in_preprocessing -text
+SAS/ResourceAssignment/Services/test/tRATaskSpecified.sh eol=lf
SAS/Scheduler/src/.default_settings.set -text
SAS/Scheduler/src/LOFAR_libScheduler.pro -text
SAS/Scheduler/src/conflictdialog.ui -text
diff --git a/SAS/ResourceAssignment/Services/src/CMakeLists.txt b/SAS/ResourceAssignment/Services/src/CMakeLists.txt
index a8b3483491c..69a3891eb85 100644
--- a/SAS/ResourceAssignment/Services/src/CMakeLists.txt
+++ b/SAS/ResourceAssignment/Services/src/CMakeLists.txt
@@ -1,16 +1,16 @@
# $Id$
lofar_add_bin_scripts(
- jobstoscheduleservice
+ rataskspecifiedservice
)
python_install(
- JobsToSchedule.py
+ RATaskSpecified.py
RABusListener.py
DESTINATION lofar/sas/resourceassignment
)
# supervisord config files
install(FILES
- jobstoscheduleservice.ini
+ rataskspecifiedservice.ini
DESTINATION etc/supervisord.d)
diff --git a/SAS/ResourceAssignment/Services/src/RABusListener.py b/SAS/ResourceAssignment/Services/src/RABusListener.py
index de6b2e5dd5a..5ee64887acc 100644
--- a/SAS/ResourceAssignment/Services/src/RABusListener.py
+++ b/SAS/ResourceAssignment/Services/src/RABusListener.py
@@ -36,11 +36,11 @@ from datetime import datetime
logger = logging.getLogger(__name__)
-class JobsToScheduleBusListener(AbstractBusListener):
+class RATaskSpecifiedBusListener(AbstractBusListener):
def __init__(self, busname='lofar.ra', subject='TaskSpecified', broker=None, **kwargs):
"""
- JobsToScheduleBusListener listens on the lofar ra message bus and calls (empty) on<SomeMessage> methods when such a message is received.
- Typical usage is to derive your own subclass from JobsToScheduleBusListener and implement the specific on<SomeMessage> methods that you are interested in.
+ RATaskSpecifiedBusListener listens on the lofar ra message bus and calls (empty) on<SomeMessage> methods when such a message is received.
+ Typical usage is to derive your own subclass from RATaskSpecifiedBusListener and implement the specific on<SomeMessage> methods that you are interested in.
:param address: valid Qpid address (default: lofar.otdb.status)
:param broker: valid Qpid broker host (default: None, which means localhost)
additional parameters in kwargs:
@@ -50,7 +50,7 @@ class JobsToScheduleBusListener(AbstractBusListener):
verbose= <bool> Output extra logging over stdout (default: False)
"""
address = "%s/%s" % (busname, subject)
- super(JobsToScheduleBusListener, self).__init__(address, broker, **kwargs)
+ super(RATaskSpecifiedBusListener, self).__init__(address, broker, **kwargs)
def _handleMessage(self, msg):
logger.debug("RABusListener.handleMessage: %s" %str(msg))
@@ -70,4 +70,4 @@ class JobsToScheduleBusListener(AbstractBusListener):
def onMessage(self, sasId, modificationTime, resourceIndicators):
pass
-__all__ = ["JobsToScheduleBusListener"]
+__all__ = ["RATaskSpecifiedBusListener"]
diff --git a/SAS/ResourceAssignment/Services/src/JobsToSchedule.py b/SAS/ResourceAssignment/Services/src/RATaskSpecified.py
similarity index 96%
rename from SAS/ResourceAssignment/Services/src/JobsToSchedule.py
rename to SAS/ResourceAssignment/Services/src/RATaskSpecified.py
index 16e0123313a..074b4047676 100755
--- a/SAS/ResourceAssignment/Services/src/JobsToSchedule.py
+++ b/SAS/ResourceAssignment/Services/src/RATaskSpecified.py
@@ -154,9 +154,9 @@ def resourceIndicatorsFromParset( parset ):
return subset
-class JobsToSchedule(OTDBBusListener):
+class RATaskSpecified(OTDBBusListener):
def __init__(self, servicename, otdb_busname=None, my_busname=None, **kwargs):
- super(JobsToSchedule, self).__init__(busname=otdb_busname, subject="TaskStatus", **kwargs)
+ super(RATaskSpecified, self).__init__(busname=otdb_busname, subject="TaskStatus", **kwargs)
self.parset_rpc = RPC(service="TaskSpecification", busname=otdb_busname)
self.send_bus = ToBus("%s/%s" % (my_busname, servicename))
@@ -165,10 +165,10 @@ class JobsToSchedule(OTDBBusListener):
self.parset_rpc.open()
self.send_bus.open()
- super(JobsToSchedule, self).start_listening(**kwargs)
+ super(RATaskSpecified, self).start_listening(**kwargs)
def stop_listening(self, **kwargs):
- super(JobsToSchedule, self).stop_listening(**kwargs)
+ super(RATaskSpecified, self).stop_listening(**kwargs)
self.send_bus.close()
self.parset_rpc.close()
@@ -240,6 +240,6 @@ if __name__ == "__main__":
parser.print_help()
sys.exit(1)
- with JobsToSchedule("TaskSpecified", otdb_busname=options.otdb_busname, my_busname=options.my_busname) as jts:
+ with RATaskSpecified("TaskSpecified", otdb_busname=options.otdb_busname, my_busname=options.my_busname) as jts:
waitForInterrupt()
diff --git a/SAS/ResourceAssignment/Services/src/jobstoscheduleservice b/SAS/ResourceAssignment/Services/src/rataskspecifiedservice
similarity index 100%
rename from SAS/ResourceAssignment/Services/src/jobstoscheduleservice
rename to SAS/ResourceAssignment/Services/src/rataskspecifiedservice
diff --git a/SAS/ResourceAssignment/Services/src/jobstoscheduleservice.ini b/SAS/ResourceAssignment/Services/src/rataskspecifiedservice.ini
similarity index 57%
rename from SAS/ResourceAssignment/Services/src/jobstoscheduleservice.ini
rename to SAS/ResourceAssignment/Services/src/rataskspecifiedservice.ini
index a96c85d0f85..1cdedd96397 100644
--- a/SAS/ResourceAssignment/Services/src/jobstoscheduleservice.ini
+++ b/SAS/ResourceAssignment/Services/src/rataskspecifiedservice.ini
@@ -1,5 +1,5 @@
[program:JobsToSchedule]
-command=/bin/bash -c 'source $LOFARROOT/lofarinit.sh;jobstoscheduleservice --otdb_busname=lofar.otdb --my_busname=lofar.ra'
+command=/bin/bash -c 'source $LOFARROOT/lofarinit.sh;rataskspecifiedservice --otdb_busname=lofar.otdb --my_busname=lofar.ra'
user=lofarsys
stopsignal=INT ; KeyboardInterrupt
stopasgroup=true
diff --git a/SAS/ResourceAssignment/Services/test/CMakeLists.txt b/SAS/ResourceAssignment/Services/test/CMakeLists.txt
index 84eb8da2074..2dccf9d7337 100644
--- a/SAS/ResourceAssignment/Services/test/CMakeLists.txt
+++ b/SAS/ResourceAssignment/Services/test/CMakeLists.txt
@@ -2,4 +2,4 @@
include(LofarCTest)
-lofar_add_test(tJobsToSchedule)
+lofar_add_test(tRATaskSpecified)
diff --git a/SAS/ResourceAssignment/Services/test/tJobsToSchedule.sh b/SAS/ResourceAssignment/Services/test/tJobsToSchedule.sh
deleted file mode 100755
index 26ff561e589..00000000000
--- a/SAS/ResourceAssignment/Services/test/tJobsToSchedule.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./runctest.sh tJobsToSchedule
diff --git a/SAS/ResourceAssignment/Services/test/tJobsToSchedule.in_correlator b/SAS/ResourceAssignment/Services/test/tRATaskSpecified.in_correlator
similarity index 100%
rename from SAS/ResourceAssignment/Services/test/tJobsToSchedule.in_correlator
rename to SAS/ResourceAssignment/Services/test/tRATaskSpecified.in_correlator
diff --git a/SAS/ResourceAssignment/Services/test/tJobsToSchedule.in_preprocessing b/SAS/ResourceAssignment/Services/test/tRATaskSpecified.in_preprocessing
similarity index 100%
rename from SAS/ResourceAssignment/Services/test/tJobsToSchedule.in_preprocessing
rename to SAS/ResourceAssignment/Services/test/tRATaskSpecified.in_preprocessing
diff --git a/SAS/ResourceAssignment/Services/test/tJobsToSchedule.py b/SAS/ResourceAssignment/Services/test/tRATaskSpecified.py
similarity index 92%
rename from SAS/ResourceAssignment/Services/test/tJobsToSchedule.py
rename to SAS/ResourceAssignment/Services/test/tRATaskSpecified.py
index f55d4975c6a..a4919e79f57 100644
--- a/SAS/ResourceAssignment/Services/test/tJobsToSchedule.py
+++ b/SAS/ResourceAssignment/Services/test/tRATaskSpecified.py
@@ -4,8 +4,8 @@
import sys, os
sys.path.insert(0, "{srcdir}/../src".format(**os.environ))
-from JobsToSchedule import *
-from RABusListener import JobsToScheduleBusListener
+from RATaskSpecified import *
+from RABusListener import RATaskSpecifiedBusListener
from lofar.parameterset import PyParameterSet
from lofar.messaging import EventMessage, Service
@@ -58,11 +58,11 @@ class TestResourceIndicators(unittest.TestCase):
"""
def test_preprocessing_pipeline(self):
- parset = parset_as_dict("tJobsToSchedule.in_preprocessing")
+ parset = parset_as_dict("tRATaskSpecified.in_preprocessing")
r = resourceIndicatorsFromParset(parset)
def test_correlator_observation(self):
- parset = parset_as_dict("tJobsToSchedule.in_correlator")
+ parset = parset_as_dict("tRATaskSpecified.in_correlator")
r = resourceIndicatorsFromParset(parset)
@@ -109,7 +109,7 @@ class TestService(unittest.TestCase):
# of our service
# ================================
- class Listener(JobsToScheduleBusListener):
+ class Listener(RATaskSpecifiedBusListener):
def __init__(self, **kwargs):
super(Listener, self).__init__(**kwargs)
@@ -146,7 +146,7 @@ class TestService(unittest.TestCase):
3 requires nothing
"""
- with JobsToSchedule("TaskSpecified", otdb_busname=self.busname, my_busname=self.busname) as jts:
+ with RATaskSpecified("TaskSpecified", otdb_busname=self.busname, my_busname=self.busname) as jts:
# Send fake status update
with ToBus(self.status_service) as tb:
msg = EventMessage(content={
@@ -177,7 +177,7 @@ class TestService(unittest.TestCase):
3 requires nothing
"""
- with JobsToSchedule("TaskSpecified", otdb_busname=self.busname, my_busname=self.busname) as jts:
+ with RATaskSpecified("TaskSpecified", otdb_busname=self.busname, my_busname=self.busname) as jts:
# Send fake status update
with ToBus(self.status_service) as tb:
msg = EventMessage(content={
diff --git a/SAS/ResourceAssignment/Services/test/tRATaskSpecified.sh b/SAS/ResourceAssignment/Services/test/tRATaskSpecified.sh
new file mode 100755
index 00000000000..e8f7135ea21
--- /dev/null
+++ b/SAS/ResourceAssignment/Services/test/tRATaskSpecified.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+./runctest.sh tRATaskSpecified
--
GitLab