Merge pull request #25 in ASAPO/asapo from feature/save_to_beamtime_id to develop

* commit '27917ee2':
  add test with two beamlines

tests/automatic/full_chain/CMakeLists.txt

 add_subdirectory(simple_chain)
+add_subdirectory(two_beamlines)

tests/automatic/full_chain/two_beamlines/CMakeLists.txt

+set(TARGET_NAME full_chain_two_beamlines)
+
+################################
+# Testing
+################################
+prepare_asapo()
+add_script_test("${TARGET_NAME}" "$<TARGET_FILE:dummy-data-producer> $<TARGET_FILE:getnext_broker> $<TARGET_PROPERTY:asapo,EXENAME>" nomem)

tests/automatic/full_chain/two_beamlines/check_linux.sh

+#!/usr/bin/env bash
+
+set -e
+
+trap Cleanup EXIT
+
+beamtime_id1=asapo_test1
+token1=`$3 token -secret broker_secret.key $beamtime_id1`
+
+beamtime_id2=asapo_test2
+token2=`$3 token -secret broker_secret.key $beamtime_id2`
+
+monitor_database_name=db_test
+proxy_address=127.0.0.1:8400
+
+beamline1=test1
+beamline2=test2
+receiver_root_folder=/tmp/asapo/receiver/files
+receiver_folder1=${receiver_root_folder}/${beamline1}/${beamtime_id1}
+receiver_folder2=${receiver_root_folder}/${beamline2}/${beamtime_id2}
+
+Cleanup() {
+    echo cleanup
+    rm -rf ${receiver_root_folder}
+    nomad stop nginx
+    nomad stop receiver
+    nomad stop discovery
+    nomad stop broker
+    nomad stop authorizer
+#    kill $producerid
+    echo "db.dropDatabase()" | mongo ${beamtime_id1}
+    echo "db.dropDatabase()" | mongo ${beamtime_id2}
+    influx -execute "drop database ${monitor_database_name}"
+}
+
+influx -execute "create database ${monitor_database_name}"
+echo "db.${beamtime_id1}.insert({dummy:1})" | mongo ${beamtime_id1}
+echo "db.${beamtime_id2}.insert({dummy:1})" | mongo ${beamtime_id2}
+
+nomad run nginx.nmd
+nomad run authorizer.nmd
+nomad run receiver.nmd
+nomad run discovery.nmd
+nomad run broker.nmd
+
+sleep 1
+
+#producer
+mkdir -p ${receiver_folder1}
+mkdir -p ${receiver_folder2}
+$1 localhost:8400 ${beamtime_id1} 100 1000 4 0 100 &
+$1 localhost:8400 ${beamtime_id2} 100 900 4 0 100 &
+#producerid=`echo $!`
+
+
+$2 ${proxy_address} ${beamtime_id1} 2 $token1 | grep "Processed 1000 file(s)"
+$2 ${proxy_address} ${beamtime_id2} 2 $token2 | grep "Processed 900 file(s)"

tests/automatic/full_chain/two_beamlines/check_windows.bat

+SET mongo_exe="c:\Program Files\MongoDB\Server\3.6\bin\mongo.exe"
+SET beamtime_id1=asapo_test1
+SET beamline1=test1
+SET beamtime_id2=asapo_test2
+SET beamline2=test2
+
+SET receiver_root_folder=c:\tmp\asapo\receiver\files
+SET receiver_folder1="%receiver_root_folder%\%beamline1%\%beamtime_id1%"
+SET receiver_folder2="%receiver_root_folder%\%beamline2%\%beamtime_id2%"
+
+
+"%3" token -secret broker_secret.key %beamtime_id1% > token
+set /P token1=< token
+"%3" token -secret broker_secret.key %beamtime_id2% > token
+set /P token2=< token
+
+set proxy_address="127.0.0.1:8400"
+
+echo db.%beamtime_id1%.insert({dummy:1}) | %mongo_exe% %beamtime_id1%
+echo db.%beamtime_id2%.insert({dummy:1}) | %mongo_exe% %beamtime_id2%
+
+c:\opt\consul\nomad run receiver.nmd
+c:\opt\consul\nomad run authorizer.nmd
+c:\opt\consul\nomad run discovery.nmd
+c:\opt\consul\nomad run broker.nmd
+c:\opt\consul\nomad run nginx.nmd
+
+ping 1.0.0.0 -n 10 -w 100 > nul
+
+REM producer
+mkdir %receiver_folder1%
+mkdir %receiver_folder2%
+start /B "" "%1" %proxy_address% %beamtime_id1% 100 1000 4 0 100
+start /B "" "%1" %proxy_address% %beamtime_id2% 100 900 4 0 100
+ping 1.0.0.0 -n 1 -w 100 > nul
+
+REM worker
+"%2" %proxy_address% %beamtime_id1% 2 %token1% | findstr /c:"Processed 1000 file(s)"  || goto :error
+"%2" %proxy_address% %beamtime_id2% 2 %token2% | findstr /c:"Processed 900 file(s)"  || goto :error
+
+
+goto :clean
+
+:error
+call :clean
+exit /b 1
+
+:clean
+c:\opt\consul\nomad stop receiver
+c:\opt\consul\nomad stop discovery
+c:\opt\consul\nomad stop broker
+c:\opt\consul\nomad stop authorizer
+c:\opt\consul\nomad stop nginx
+rmdir /S /Q %receiver_root_folder%
+del /f token1
+del /f token2
+echo db.dropDatabase() | %mongo_exe% %beamtime_id1%
+echo db.dropDatabase() | %mongo_exe% %beamtime_id2%
+
+

tests/automatic/settings/authorizer_settings.json.tpl

 {
   "Port": {{ env "NOMAD_PORT_authorizer" }},
   "LogLevel":"debug",
-  "AlwaysAllowedBeamtimes":[{"BeamtimeId":"asapo_test","Beamline":"test"}]
+  "AlwaysAllowedBeamtimes":[{"BeamtimeId":"asapo_test","Beamline":"test"},
+  {"BeamtimeId":"asapo_test1","Beamline":"test1"},
+  {"BeamtimeId":"asapo_test2","Beamline":"test2"}]
 }