SW-699: Use default bus

MAC/Services/src/observation_control_rpc.py

@@ -21,7 +21,8 @@
 
 import logging
 from lofar.messaging.RPC import RPCWrapper
-from lofar.mac.config import DEFAULT_OBSERVATION_CONTROL_BUS_NAME, DEFAULT_OBSERVATION_CONTROL_SERVICE_NAME
+from lofar.messaging import DEFAULT_BROKER, DEFAULT_BUSNAME
+from lofar.mac.config import DEFAULT_OBSERVATION_CONTROL_SERVICE_NAME
 
 ''' Simple RPC client for Service ObservationControl2
 '''
@@ -31,9 +32,9 @@ logger = logging.getLogger(__name__)
 
 class ObservationControlRPCClient(RPCWrapper):
     def __init__(self,
-                 busname=DEFAULT_OBSERVATION_CONTROL_BUS_NAME,
+                 busname=DEFAULT_BUSNAME,
                  servicename=DEFAULT_OBSERVATION_CONTROL_SERVICE_NAME,
-                 broker=None,
+                 broker=DEFAULT_BROKER,
                  timeout=120):
         super(ObservationControlRPCClient, self).__init__(busname, servicename, broker, timeout=timeout)