SW-1013: removed obsolete imports

MAC/Services/TBB/TBBServer/lib/tbbservice.py

@@ -37,7 +37,6 @@ from lofar.mac.tbbservice.config import *
 from lofar.common.lcu_utils import *
 from lofar.common.cep4_utils import *
 from lofar.common.subprocess_utils import communicate_returning_strings
-from lofar.sas.otdb.otdbrpc import OTDBRPC
 from lofar.mac.tbb.tbb_load_firmware import load_tbb_firmware
 from lofar.mac.tbb.tbb_freeze import freeze_tbb
 from lofar.mac.tbb.tbb_release_recording import release_tbb

MAC/Services/src/pipelinecontrol/pipelinecontrol

@@ -21,7 +21,7 @@
 # $Id: JobsToSchedule.py 33364 2016-01-21 21:21:12Z mol $
 
 import logging
-from lofar.mac.PipelineControl import PipelineControl, PipelineControlTMSS, PipelineControlServiceHandler
+from lofar.mac.PipelineControl import PipelineControlTMSS, PipelineControlServiceHandler
 from lofar.messaging import RPCService, DEFAULT_BROKER, DEFAULT_BUSNAME
 from lofar.common.util import waitForInterrupt
 import lofar.mac.config as config
@@ -52,13 +52,11 @@ if __name__ == "__main__":
     from lofar.sas.tmss.client.tmss_http_rest_client import TMSSsession
     TMSSsession.check_connection_and_exit_on_error(options.tmss_client_credentials_id)
 
-    # todo: Do we want to run OTDB and TMSS in parallel?
-    with PipelineControl(exchange=options.exchange, broker=options.broker) as pipelineControl:
-        with PipelineControlTMSS(exchange=options.exchange, broker=options.broker,
-                                 handler_kwargs={'tmss_client_credentials_id': options.tmss_client_credentials_id}) as pipelineControlTMSS:
-            with RPCService(service_name=config.DEFAULT_PIPELINE_CONTROL_SERVICE_NAME,
-                    handler_type=PipelineControlServiceHandler,
-                    broker=options.broker,
-                    exchange=options.exchange):
-                waitForInterrupt()
+    with PipelineControlTMSS(exchange=options.exchange, broker=options.broker,
+                             handler_kwargs={'tmss_client_credentials_id': options.tmss_client_credentials_id}) as pipelineControlTMSS:
+        with RPCService(service_name=config.DEFAULT_PIPELINE_CONTROL_SERVICE_NAME,
+                handler_type=PipelineControlServiceHandler,
+                broker=options.broker,
+                exchange=options.exchange):
+            waitForInterrupt()