From 58a06f56316c26e47849eb01f496232ca2f2ff1f Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 18 Mar 2016 12:58:46 +0000
Subject: [PATCH] Task #8887: removed obsolete config imports
---
.../RAtoOTDBTaskSpecificationPropagator/lib/config.py | 6 ------
.../RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py | 3 +--
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/config.py b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/config.py
index 31f0dc4b525..e72bb94ab08 100644
--- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/config.py
+++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/config.py
@@ -4,9 +4,3 @@
#DEFAULT_BUSNAME = 'lofar.ra.command'
#DEFAULT_SERVICENAME = 'RAtoORTBTaskSpecificationPropagationService'
-try:
- from lofar.sas.resourceassignment.resourceassigner.config import RA_NOTIFICATION_BUSNAME
- from lofar.sas.resourceassignment.resourceassigner.config import RA_NOTIFICATION_SUBJECTS
-except ImportError:
- RA_NOTIFICATION_BUSNAME='lofar.ra.notification'
- RA_NOTIFICATION_SUBJECTS='RA.*'
diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py
index 29f9d4faec6..af5d8286d2e 100755
--- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py
+++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/rotspservice.py
@@ -38,7 +38,6 @@ import lofar.sas.resourceassignment.resourceassignmentservice.rpc as rarpc ## RA
from lofar.sas.resourceassignment.database.radbbuslistener import RADBBusListener
from lofar.sas.resourceassignment.database.config import DEFAULT_NOTIFICATION_BUSNAME as RA_NOTIFICATION_BUSNAME
from lofar.sas.resourceassignment.database.config import DEFAULT_NOTIFICATION_SUBJECTS as RA_NOTIFICATION_SUBJECTS
-from lofar.sas.resourceassignment.resourceassigner.config import RA_NOTIFICATION_BUSNAME, RA_NOTIFICATION_SUBJECTS
from lofar.sas.resourceassignment.ratootdbtaskspecificationpropagator.propagator import RAtoOTDBPropagator
logger = logging.getLogger(__name__)
@@ -74,7 +73,7 @@ class RATaskStatusChangedListener(RADBBusListener):
self.onTaskScheduled(task['id'], task['otdb_id'], task['mom_id'])
elif new_task['status'] == 'conflict':
self.onTaskScheduled(task['id'], task['otdb_id'], task['mom_id'])
-
+
def onTaskScheduled(self, ra_id, otdb_id, mom_id):
logger.info('onTaskScheduled: ra_id=%s otdb_id=%s mom_id=%s' % (ra_id, otdb_id, mom_id))
--
GitLab