diff --git a/SAS/ResourceAssignment/ResourceAssignmentService/service.py b/SAS/ResourceAssignment/ResourceAssignmentService/service.py
index e59436997bc489c99a1da08e1ecae4018f2d72d3..6d5742076a8f86d233a443c96c6f9cc765f43b02 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentService/service.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentService/service.py
@@ -14,9 +14,9 @@ from lofar.common import dbcredentials
logger = logging.getLogger(__name__)
class RADBServiceMessageHandler(ServiceMessageHandler):
- def __init__(self, dbcreds: dbcredentials.Credentials, log_queries: bool=False):
+ def __init__(self, dbcreds: dbcredentials.Credentials):
super().__init__()
- self.radb = radb.RADatabase(dbcreds=dbcreds, log_queries=log_queries)
+ self.radb = radb.RADatabase(dbcreds=dbcreds)
def init_service_handler(self, service_name: str=DEFAULT_RADB_SERVICENAME):
super().init_service_handler(service_name)
@@ -399,7 +399,6 @@ def main():
description='runs the resourceassignment database service')
parser.add_option('-b', '--broker', dest='broker', type='string', default=DEFAULT_BROKER, help='Address of the qpid broker, default: %default')
parser.add_option("-e", "--exchange", dest="exchange", type="string", default=DEFAULT_BUSNAME, help="Name of the bus exchange on the broker, default: %default")
- parser.add_option('-q', '--log-queries', dest='log_queries', action='store_true', help='log all pqsl queries')
parser.add_option('-V', '--verbose', dest='verbose', action='store_true', help='verbose logging')
parser.add_option_group(dbcredentials.options_group(parser))
parser.set_defaults(dbcredentials="RADB")
@@ -414,7 +413,6 @@ def main():
with createService(exchange=options.exchange,
broker=options.broker,
- log_queries=options.log_queries,
dbcreds=dbcreds):
waitForInterrupt()
diff --git a/SAS/ResourceAssignment/ResourceAssignmentService/test/test_ra_service_and_rpc.py b/SAS/ResourceAssignment/ResourceAssignmentService/test/test_ra_service_and_rpc.py
index d4367721a751010a6e98dd1028826f52160289c9..d08b85918dce2db4550d34f52c6237fd0effb19c 100755
--- a/SAS/ResourceAssignment/ResourceAssignmentService/test/test_ra_service_and_rpc.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentService/test/test_ra_service_and_rpc.py
@@ -3,68 +3,74 @@
import unittest
import datetime
import logging
+
+logger = logging.getLogger(__name__)
+logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s', level=logging.INFO)
+
from lofar.messaging import TemporaryExchange
from lofar.sas.resourceassignment.resourceassignmentservice.service import createService
-from lofar.sas.resourceassignment.resourceassignmentservice.rpc import RARPC
+from lofar.sas.resourceassignment.resourceassignmentservice.rpc import RADBRPC
from unittest.mock import patch
-with TemporaryExchange(__name__) as tmp_exchange:
- logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s', level=logging.INFO)
- logger = logging.getLogger(__name__)
-
- # the system under test is the service and the rpc, not the RADatabase
- # so, patch (mock) the RADatabase class during these tests.
- # when the service instantiates an RADatabase it will get the mocked class.
- with patch('lofar.sas.resourceassignment.database.radb.RADatabase', autospec=True) as MockRADatabase:
- mock = MockRADatabase.return_value
- # modify the return values of the various RADatabase methods with pre-cooked answers
- mock.getTaskStatuses.return_value = [{'id': 1, 'name': 'opened'}, {'id': 2, 'name': 'scheduled'}]
- mock.getTaskTypes.return_value = [{'id': 0, 'name': 'OBSERVATION'}, {'id': 1, 'name': 'PIPELINE'}]
- mock.getResourceClaimStatuses.return_value = [{'id': 0, 'name': 'TENTATIVE'},{'id': 1, 'name': 'CLAIMED'},{'id': 2, 'name': 'CONFLICT'}]
- mock.getUnits.return_value = [{'units': 'rsp_channel_bit', 'id': 0},{'units': 'bytes', 'id': 1},{'units': 'rcu_board', 'id': 2},{'units': 'bits/second', 'id': 3},{'units': 'cores', 'id': 4}]
- mock.getResourceTypes.return_value = [{'unit_id': 0, 'id': 0, 'unit': 'rsp_channel_bit', 'name': 'rsp'},{'unit_id': 1, 'id': 1, 'unit': 'bytes', 'name': 'tbb'},{'unit_id': 2, 'id': 2, 'unit': 'rcu_board', 'name': 'rcu'},{'unit_id': 3, 'id': 3, 'unit': 'bits/second', 'name': 'bandwidth'},{'unit_id': 4, 'id': 4, 'unit': 'cores', 'name': 'processor'},{'unit_id': 1, 'id': 5, 'unit': 'bytes', 'name': 'storage'}]
- mock.getResourceGroupTypes.return_value = [{'id': 0, 'name': 'instrument'},{'id': 1, 'name': 'cluster'},{'id': 2, 'name': 'station_group'},{'id': 3, 'name': 'station'},{'id': 4, 'name': 'node_group'},{'id': 5, 'name': 'node'}]
- mock.getResources.return_value = [{'type_id': 0, 'type': 'rsp', 'id': 0, 'unit': 'rsp_channel_bit', 'name': 'rsp'},{'type_id': 1, 'type': 'tbb', 'id': 1, 'unit': 'bytes', 'name': 'tbb'},{'type_id': 2, 'type': 'rcu', 'id': 2, 'unit': 'rcu_board', 'name': 'rcu'},{'type_id': 3, 'type': 'bandwidth', 'id': 3, 'unit': 'bits/second', 'name': 'bandwidth'}]
- mock.getResourceGroups.return_value = [{'type_id': 0, 'type': 'instrument', 'id': 0, 'name': 'LOFAR'},{'type_id': 1, 'type': 'cluster', 'id': 1, 'name': 'CEP2'}]
- mock.getTasks.return_value = [{'status': 'prepared', 'type_id': 1, 'status_id': 200, 'specification_id': 1, 'starttime': datetime.datetime(2015, 11, 30, 12, 0), 'mom_id': -1, 'endtime': datetime.datetime(2015, 11, 30, 15, 0), 'type': 'PIPELINE', 'id': 5, 'otdb_id': -1}]
- mock.getTask.return_value = mock.getTasks.return_value[0]
- mock.getTask.side_effect = lambda x: mock.getTasks.return_value[0] if x == 5 else None
- mock.getResourceClaims.return_value = [{'username': 'paulus', 'status': 'CLAIMED', 'user_id': 1, 'task_id': 5, 'status_id': 1, 'resource_id': 1, 'session_id': 1, 'claim_size': 10, 'starttime': datetime.datetime(2015, 11, 30, 12, 0), 'endtime': datetime.datetime(2015, 11, 30, 12, 0), 'id': 5}]
-
- class Test1(unittest.TestCase):
- '''Test'''
-
- def test(self):
- '''basic test '''
- with RARPC(exchange=tmp_exchange.address, timeout=1) as rpc:
- self.assertEqual(mock.getTaskStatuses.return_value, rpc.getTaskStatuses())
- self.assertEqual(mock.getTaskTypes.return_value, rpc.getTaskTypes())
- self.assertEqual(mock.getResourceClaimStatuses.return_value, rpc.getResourceClaimStatuses())
- self.assertEqual(mock.getUnits.return_value, rpc.getUnits())
- self.assertEqual(mock.getResourceTypes.return_value, rpc.getResourceTypes())
- self.assertEqual(mock.getResourceGroupTypes.return_value, rpc.getResourceGroupTypes())
- self.assertEqual(mock.getResources.return_value, rpc.getResources())
- self.assertEqual(mock.getResourceGroups.return_value, rpc.getResourceGroups())
- self.assertEqual(mock.getTasks.return_value, rpc.getTasks())
- self.assertEqual(mock.getResourceClaims.return_value, rpc.getResourceClaims())
-
- #TODO: fix this test
- #self.assertEqual(None, rpc.getTask(1))
- #self.assertEqual(mock.getTask.return_value, rpc.getTask(5))
-
- # test non existing service method, should raise
- with self.assertRaises(Exception) as e:
- rpc.execute('foo')
-
- ## test method with wrong args
- #with self.assertRaises(TypeError) as cm:
- #rpc.rpc('GetTasks', timeout=1, fooarg='bar')
- #self.assertTrue('got an unexpected keyword argument \'fooarg\'' in str(cm.exception))
-
- # create and run the service
- with createService(exchange=tmp_exchange.address):
-
- # and run all tests
- unittest.main()
+
+class Test1(unittest.TestCase):
+ '''Test'''
+
+ def test(self):
+ '''basic test '''
+
+
+ with TemporaryExchange(__name__) as tmp_exchange:
+
+ # the system under test is the service and the rpc, not the RADatabase
+ # so, patch (mock) the RADatabase class during these tests.
+ # when the service instantiates an RADatabase it will get the mocked class.
+ with patch('lofar.sas.resourceassignment.database.radb.RADatabase', autospec=True) as MockRADatabase:
+ mock = MockRADatabase.return_value
+ # modify the return values of the various RADatabase methods with pre-cooked answers
+ mock.getTaskStatuses.return_value = [{'id': 1, 'name': 'opened'}, {'id': 2, 'name': 'scheduled'}]
+ mock.getTaskTypes.return_value = [{'id': 0, 'name': 'OBSERVATION'}, {'id': 1, 'name': 'PIPELINE'}]
+ mock.getResourceClaimStatuses.return_value = [{'id': 0, 'name': 'TENTATIVE'},{'id': 1, 'name': 'CLAIMED'},{'id': 2, 'name': 'CONFLICT'}]
+ mock.getUnits.return_value = [{'units': 'rsp_channel_bit', 'id': 0},{'units': 'bytes', 'id': 1},{'units': 'rcu_board', 'id': 2},{'units': 'bits/second', 'id': 3},{'units': 'cores', 'id': 4}]
+ mock.getResourceTypes.return_value = [{'unit_id': 0, 'id': 0, 'unit': 'rsp_channel_bit', 'name': 'rsp'},{'unit_id': 1, 'id': 1, 'unit': 'bytes', 'name': 'tbb'},{'unit_id': 2, 'id': 2, 'unit': 'rcu_board', 'name': 'rcu'},{'unit_id': 3, 'id': 3, 'unit': 'bits/second', 'name': 'bandwidth'},{'unit_id': 4, 'id': 4, 'unit': 'cores', 'name': 'processor'},{'unit_id': 1, 'id': 5, 'unit': 'bytes', 'name': 'storage'}]
+ mock.getResourceGroupTypes.return_value = [{'id': 0, 'name': 'instrument'},{'id': 1, 'name': 'cluster'},{'id': 2, 'name': 'station_group'},{'id': 3, 'name': 'station'},{'id': 4, 'name': 'node_group'},{'id': 5, 'name': 'node'}]
+ mock.getResources.return_value = [{'type_id': 0, 'type': 'rsp', 'id': 0, 'unit': 'rsp_channel_bit', 'name': 'rsp'},{'type_id': 1, 'type': 'tbb', 'id': 1, 'unit': 'bytes', 'name': 'tbb'},{'type_id': 2, 'type': 'rcu', 'id': 2, 'unit': 'rcu_board', 'name': 'rcu'},{'type_id': 3, 'type': 'bandwidth', 'id': 3, 'unit': 'bits/second', 'name': 'bandwidth'}]
+ mock.getResourceGroups.return_value = [{'type_id': 0, 'type': 'instrument', 'id': 0, 'name': 'LOFAR'},{'type_id': 1, 'type': 'cluster', 'id': 1, 'name': 'CEP2'}]
+ mock.getTasks.return_value = [{'status': 'prepared', 'type_id': 1, 'status_id': 200, 'specification_id': 1, 'starttime': datetime.datetime(2015, 11, 30, 12, 0), 'mom_id': -1, 'endtime': datetime.datetime(2015, 11, 30, 15, 0), 'type': 'PIPELINE', 'id': 5, 'otdb_id': -1}]
+ mock.getTask.return_value = mock.getTasks.return_value[0]
+ mock.getTask.side_effect = lambda x: mock.getTasks.return_value[0] if x == 5 else None
+ mock.getResourceClaims.return_value = [{'username': 'paulus', 'status': 'CLAIMED', 'user_id': 1, 'task_id': 5, 'status_id': 1, 'resource_id': 1, 'session_id': 1, 'claim_size': 10, 'starttime': datetime.datetime(2015, 11, 30, 12, 0), 'endtime': datetime.datetime(2015, 11, 30, 12, 0), 'id': 5}]
+
+ # create and run the service
+ with createService(exchange=tmp_exchange.address):
+ with RADBRPC.create(exchange=tmp_exchange.address, timeout=1) as rpc:
+ self.assertEqual(mock.getTaskStatuses.return_value, rpc.getTaskStatuses())
+ self.assertEqual(mock.getTaskTypes.return_value, rpc.getTaskTypes())
+ self.assertEqual(mock.getResourceClaimStatuses.return_value, rpc.getResourceClaimStatuses())
+ self.assertEqual(mock.getUnits.return_value, rpc.getUnits())
+ self.assertEqual(mock.getResourceTypes.return_value, rpc.getResourceTypes())
+ self.assertEqual(mock.getResourceGroupTypes.return_value, rpc.getResourceGroupTypes())
+ self.assertEqual(mock.getResources.return_value, rpc.getResources())
+ self.assertEqual(mock.getResourceGroups.return_value, rpc.getResourceGroups())
+ self.assertEqual(mock.getTasks.return_value, rpc.getTasks())
+ self.assertEqual(mock.getResourceClaims.return_value, rpc.getResourceClaims())
+
+ #TODO: fix this test
+ #self.assertEqual(None, rpc.getTask(1))
+ #self.assertEqual(mock.getTask.return_value, rpc.getTask(5))
+
+ # test non existing service method, should raise
+ with self.assertRaises(Exception) as e:
+ rpc.execute('foo')
+
+ ## test method with wrong args
+ #with self.assertRaises(TypeError) as cm:
+ #rpc.rpc('GetTasks', timeout=1, fooarg='bar')
+ #self.assertTrue('got an unexpected keyword argument \'fooarg\'' in str(cm.exception))
+
+
+if __name__ == '__main__':
+ # run all tests
+ unittest.main()