From be426bc69f9a558438aa9afdf9cb01dc1d10b79a Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 7 Jun 2019 13:49:43 +0000
Subject: [PATCH] SW-699: adaptations to new rpc.py module
---
MAC/Services/src/observation_control_rpc.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/MAC/Services/src/observation_control_rpc.py b/MAC/Services/src/observation_control_rpc.py
index 48f3fecd75c..58fc05a1440 100644
--- a/MAC/Services/src/observation_control_rpc.py
+++ b/MAC/Services/src/observation_control_rpc.py
@@ -20,7 +20,7 @@
import logging
-from lofar.messaging.rpc_service import RPC, RPCContextManagerMixin
+from lofar.messaging.rpc import RPCClient, RPCClientContextManagerMixin
from lofar.mac.config import DEFAULT_OBSERVATION_CONTROL_SERVICE_NAME
''' Simple RPC client for Service ObservationControl2
@@ -29,10 +29,10 @@ from lofar.mac.config import DEFAULT_OBSERVATION_CONTROL_SERVICE_NAME
logger = logging.getLogger(__name__)
-class ObservationControlRPCClient(RPCContextManagerMixin):
- def __init__(self, rpc : RPC = RPC(service_name=DEFAULT_OBSERVATION_CONTROL_SERVICE_NAME)):
+class ObservationControlRPCClient(RPCClientContextManagerMixin):
+ def __init__(self, rpc_client : RPCClient = RPCClient(service_name=DEFAULT_OBSERVATION_CONTROL_SERVICE_NAME)):
super().__init__()
- self._rpc = rpc
+ self._rpc_client = rpc_client
def abort_observation(self, sas_id):
- return self._rpc.execute('AbortObservation', sas_id=sas_id)
+ return self._rpc_client.execute('AbortObservation', sas_id=sas_id)
--
GitLab