Skip to content
Snippets Groups Projects
Commit 56f10f74 authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

SW-699: fixes/typos

parent 8974f9fe
No related branches found
No related tags found
No related merge requests found
...@@ -24,8 +24,7 @@ ...@@ -24,8 +24,7 @@
""" """
from lofar.messaging.RPC import RPC from lofar.messaging import DEFAULT_BROKER, DEFAULT_BUSNAME
from lofar.sas.otdb.config import DEFAULT_OTDB_SERVICE_BUSNAME
from lofar.sas.otdb.otdbrpc import OTDBRPC from lofar.sas.otdb.otdbrpc import OTDBRPC
if __name__ == "__main__": if __name__ == "__main__":
...@@ -38,19 +37,19 @@ if __name__ == "__main__": ...@@ -38,19 +37,19 @@ if __name__ == "__main__":
# Check the invocation arguments # Check the invocation arguments
parser = OptionParser("%prog -o obsid [options]") parser = OptionParser("%prog -o obsid [options]")
parser.add_option("-B", "--busname", dest="busname", type="string", default=DEFAULT_OTDB_SERVICE_BUSNAME, parser.add_option('-b', '--broker', dest = 'broker', type = 'string', default = DEFAULT_BROKER, help = 'Address of the broker, default: %default')
help="Busname on which OTDB commands are sent") parser.add_option('-e', '--exchange', dest = 'exchange', type = 'string', default = DEFAULT_BUSNAME, help = 'Name of the bus exchange on the broker, default: %s' % DEFAULT_BUSNAME)
parser.add_option("-o", "--obsid", dest="obsid", type="int", default=0, parser.add_option("-o", "--obsid", dest="obsid", type="int", default=0,
help="Observation/tree ID to get parset of") help="Observation/tree ID to get parset of")
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
if not options.busname or not options.obsid: if not options.exchange or not options.obsid:
parser.print_help() parser.print_help()
sys.exit(1) sys.exit(1)
with OTDBRPC(busname=options.busname) as otdbrpc: with OTDBRPC(exchange=options.exchange) as otdbrpc:
parset = otdbrpc.taskGetSpecification(otdb_id=options.obsid)["specification"] parset = otdbrpc.taskGetSpecification(otdb_id=options.obsid)["specification"]
for k,v in parset.items(): for key in sorted(parset.keys()):
print("%s = %s" % (k,v)) print("%s = %s" % (key,parset[key]))
#!/usr/bin/env python3 #!/usr/bin/env python3
import logging import logging
from lofar.messaging import DEFAULT_BROKER, DEFAULT_BUSNAME from lofar.messaging import DEFAULT_BROKER, DEFAULT_BUSNAME, DEFAULT_TIMEOUT
from lofar.messaging.rpc_service import RPC from lofar.messaging.rpc_service import RPC
from lofar.sas.otdb.config import DEFAULT_OTDB_SERVICENAME from lofar.sas.otdb.config import DEFAULT_OTDB_SERVICENAME
...@@ -20,10 +20,23 @@ class OTDBPRCException(Exception): ...@@ -20,10 +20,23 @@ class OTDBPRCException(Exception):
class OTDBRPC(): class OTDBRPC():
def __init__(self, busname=DEFAULT_BUSNAME, def __init__(self, exchange=DEFAULT_BUSNAME,
broker=DEFAULT_BROKER, broker=DEFAULT_BROKER,
timeout=120): timeout=DEFAULT_TIMEOUT):
self.rpc = RPC(busname, DEFAULT_OTDB_SERVICENAME, broker, timeout=timeout) self.rpc = RPC(DEFAULT_OTDB_SERVICENAME, exchange, broker, timeout=timeout)
def open(self):
self.rpc.open()
def close(self):
self.rpc.close()
def __enter__(self):
self.open()
return self
def __exit__(self, exc_type, exc_val, exc_tb):
self.close()
def taskGetIDs(self, otdb_id=None, mom_id=None): def taskGetIDs(self, otdb_id=None, mom_id=None):
if otdb_id: if otdb_id:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment