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

TMSS-557: split viewflow option into --viewflow_app and --viewflow_service....

TMSS-557: split viewflow option into --viewflow_app and --viewflow_service. Run tmss with only --viewflow_app via supervisor. Have a seperate viewflow service.
parent 7862d6dc
No related branches found
No related tags found
1 merge request!343Resolve TMSS-557 and TMSS-307
[program:tmss] [program:tmss]
command=/bin/bash -c 'source $LOFARROOT/lofarinit.sh;exec tmss_test_environment --schemas --LDAP_ID=TMSS_testenv_rest --DB_ID=TMSS_testenv_db' command=/bin/bash -c 'source $LOFARROOT/lofarinit.sh;exec tmss_test_environment --schemas --viewflow_app --LDAP_ID=TMSS_testenv_rest --DB_ID=TMSS_testenv_db'
priority=100 priority=100
user=lofarsys user=lofarsys
stopsignal=INT ; KeyboardInterrupt stopsignal=INT ; KeyboardInterrupt
......
...@@ -558,7 +558,8 @@ def main_test_environment(): ...@@ -558,7 +558,8 @@ def main_test_environment():
group.add_option('-m', '--eventmessages', dest='eventmessages', action='store_true', help='Send event messages over the messagebus for changes in the TMSS database (for (sub)tasks/scheduling_units etc).') group.add_option('-m', '--eventmessages', dest='eventmessages', action='store_true', help='Send event messages over the messagebus for changes in the TMSS database (for (sub)tasks/scheduling_units etc).')
group.add_option('-r', '--ra_test_environment', dest='ra_test_environment', action='store_true', help='start the Resource Assigner test environment which enables scheduling.') group.add_option('-r', '--ra_test_environment', dest='ra_test_environment', action='store_true', help='start the Resource Assigner test environment which enables scheduling.')
group.add_option('-S', '--scheduling', dest='scheduling', action='store_true', help='start the TMSS background scheduling services for dynamic scheduling of schedulingunits and subtask scheduling of chains of dependend subtasks.') group.add_option('-S', '--scheduling', dest='scheduling', action='store_true', help='start the TMSS background scheduling services for dynamic scheduling of schedulingunits and subtask scheduling of chains of dependend subtasks.')
group.add_option('-v', '--viewflow', dest='viewflow', action='store_true', help='Enable the viewflow app for workflows on top of TMSS') group.add_option('-v', '--viewflow_app', dest='viewflow_app', action='store_true', help='Enable the viewflow app for workflows on top of TMSS')
group.add_option('-V', '--viewflow_service', dest='viewflow_service', action='store_true', help='Enable the viewflow service. Implies --viewflow_app and --eventmessages')
group.add_option('-w', '--websockets', dest='websockets', action='store_true', help='Enable json updates pushed via websockets') group.add_option('-w', '--websockets', dest='websockets', action='store_true', help='Enable json updates pushed via websockets')
group.add_option('-f', '--feedbackservice', dest='feedbackservice', action='store_true', help='Enable feedbackservice to handle feedback from observations/pipelines which comes in via the (old qpid) otdb messagebus.') group.add_option('-f', '--feedbackservice', dest='feedbackservice', action='store_true', help='Enable feedbackservice to handle feedback from observations/pipelines which comes in via the (old qpid) otdb messagebus.')
group.add_option('--all', dest='all', action='store_true', help='Enable/Start all the services, upload schemas and testdata') group.add_option('--all', dest='all', action='store_true', help='Enable/Start all the services, upload schemas and testdata')
...@@ -591,13 +592,13 @@ def main_test_environment(): ...@@ -591,13 +592,13 @@ def main_test_environment():
populate_schemas=options.schemas or options.data or options.all, populate_schemas=options.schemas or options.data or options.all,
populate_test_data=options.data or options.all, populate_test_data=options.data or options.all,
start_ra_test_environment=options.ra_test_environment or options.all, start_ra_test_environment=options.ra_test_environment or options.all,
start_postgres_listener=options.eventmessages or options.scheduling or options.all, start_postgres_listener=options.eventmessages or options.scheduling or options.viewflow_service or options.all,
start_subtask_scheduler=options.scheduling or options.all, start_subtask_scheduler=options.scheduling or options.all,
start_dynamic_scheduler=options.scheduling or options.all, start_dynamic_scheduler=options.scheduling or options.all,
start_websocket=options.websockets or options.all, start_websocket=options.websockets or options.all,
start_feedback_service=options.feedbackservice or options.all, start_feedback_service=options.feedbackservice or options.all,
start_workflow_service=options.viewflow or options.all, enable_viewflow=options.viewflow_app or options.viewflow_service or options.all,
enable_viewflow=options.viewflow or options.all, start_workflow_service=options.viewflow_service or options.all,
ldap_dbcreds_id=options.LDAP_ID, db_dbcreds_id=options.DB_ID) as tmss_test_env: ldap_dbcreds_id=options.LDAP_ID, db_dbcreds_id=options.DB_ID) as tmss_test_env:
# print some nice info for the user to use the test servers... # print some nice info for the user to use the test servers...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment