diff --git a/discovery/src/asapo_discovery/server/get_version_test.go b/discovery/src/asapo_discovery/server/get_version_test.go
index 74c1516234b8ba5bbf94256118a174901174c8ee..d7555369e29cd24cfd1ef2a78c71944f109940b9 100644
--- a/discovery/src/asapo_discovery/server/get_version_test.go
+++ b/discovery/src/asapo_discovery/server/get_version_test.go
@@ -29,13 +29,13 @@ var versionTests = []struct {
ClientSupported: "no",
}, http.StatusOK, "consumer client, no protocol"},
- {"?client=consumer&protocol=v0.1", versionInfo{
+ {"?client=consumer&protocol=v0.6", versionInfo{
SoftwareVersion: coreVer,
ClientProtocol: protocols.ProtocolInfo{"v0.1 (deprecates at 2022-06-01 00:00:00 +0000 UTC)",
map[string]string{"Authorizer":"v0.1", "Broker":"v0.1", "Data cache service":"v0.1", "Discovery":"v0.1", "File Transfer":"v0.1"}},
ClientSupported: "yes",
}, http.StatusOK, "consumer client"},
- {"?client=producer&protocol=v0.1", versionInfo{
+ {"?client=producer&protocol=v0.6", versionInfo{
SoftwareVersion: coreVer,
ClientProtocol: protocols.ProtocolInfo{"v0.1 (deprecates at 2022-06-01 00:00:00 +0000 UTC)",map[string]string{"Discovery":"v0.1", "Receiver":"v0.1"}},
ClientSupported: "yes",
diff --git a/discovery/src/asapo_discovery/server/routes_test.go b/discovery/src/asapo_discovery/server/routes_test.go
index b98a83a0d7d1688e88c66d3c785ef0a4f12d7d76..30675c91c13661cdc953361014b7cf5ff4fa6fd7 100644
--- a/discovery/src/asapo_discovery/server/routes_test.go
+++ b/discovery/src/asapo_discovery/server/routes_test.go
@@ -68,7 +68,7 @@ message string
var receiverTests = []requestTest {
{"/" + version.GetDiscoveryApiVersion()+"/asapo-receiver",http.StatusBadRequest,"protocol missing"},
{"/" + version.GetDiscoveryApiVersion()+"/asapo-receiver?protocol=v1000.2",http.StatusUnsupportedMediaType,"wrong protocol"},
- {"/" + version.GetDiscoveryApiVersion()+"/asapo-receiver?protocol=v0.2",http.StatusOK,"ok"},
+ {"/" + version.GetDiscoveryApiVersion()+"/asapo-receiver?protocol=v0.6",http.StatusOK,"ok"},
}
func (suite *GetServicesTestSuite) TestGetReceivers() {
@@ -94,7 +94,7 @@ func (suite *GetServicesTestSuite) TestGetReceivers() {
var brokerTests = []requestTest {
{"/" + version.GetDiscoveryApiVersion()+"/asapo-broker",http.StatusBadRequest,"protocol missing"},
{"/" + version.GetDiscoveryApiVersion()+"/asapo-broker?protocol=v1000.2",http.StatusUnsupportedMediaType,"wrong protocol"},
- {"/" + version.GetDiscoveryApiVersion()+"/asapo-broker?protocol=v0.2",http.StatusOK,"ok"},
+ {"/" + version.GetDiscoveryApiVersion()+"/asapo-broker?protocol=v0.6",http.StatusOK,"ok"},
}
func (suite *GetServicesTestSuite) TestGetBroker() {
for _,test:= range brokerTests {
@@ -131,7 +131,7 @@ func (suite *GetServicesTestSuite) TestGetFts() {
logger.MockLog.On("WithFields", mock.Anything)
logger.MockLog.On("Debug", mock.MatchedBy(containsMatcher("request")))
- w := doRequest("/" + version.GetDiscoveryApiVersion()+"/asapo-file-transfer?protocol=v0.1")
+ w := doRequest("/" + version.GetDiscoveryApiVersion()+"/asapo-file-transfer?protocol=v0.6")
suite.Equal(http.StatusOK, w.Code, "code ok")
suite.Equal(w.Body.String(), "ip_fts", "result")
diff --git a/tests/automatic/broker/check_monitoring/check_linux.sh b/tests/automatic/broker/check_monitoring/check_linux.sh
index d0b81c6ee5bfeaaf635fa83be46c8238ba98a7e2..f48c9671cfcb6d83f9677f5aea9c921d45fbe6c9 100644
--- a/tests/automatic/broker/check_monitoring/check_linux.sh
+++ b/tests/automatic/broker/check_monitoring/check_linux.sh
@@ -17,7 +17,7 @@ Cleanup() {
token=$BT_DATA_TOKEN
-broker=`curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.3`
+broker=`curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.6`
echo found broker at $broker
groupid=`curl -d '' --silent $broker/v0.2/creategroup`
diff --git a/tests/automatic/broker/get_last/check_linux.sh b/tests/automatic/broker/get_last/check_linux.sh
index f3cfc8b57ad4ffc548d82a90a618c686e30a03d8..6f50ea116a40be683a75de25dfc07d3d5f0b7b4e 100644
--- a/tests/automatic/broker/get_last/check_linux.sh
+++ b/tests/automatic/broker/get_last/check_linux.sh
@@ -17,7 +17,7 @@ echo "db.data_${stream}.insert({"_id":1})" | mongo ${database_name}
token=$BT_DATA_TOKEN
-broker=`curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.3`
+broker=`curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.6`
echo found broker at $broker
groupid=`curl -d '' --silent $broker/v0.2/creategroup`
diff --git a/tests/automatic/broker/get_last/check_windows.bat b/tests/automatic/broker/get_last/check_windows.bat
index dacb2771c01cd7bd51af8e337ed1598a792fc70f..2148f3a4abe96aa30071d731562a46fcbc9252f9 100644
--- a/tests/automatic/broker/get_last/check_windows.bat
+++ b/tests/automatic/broker/get_last/check_windows.bat
@@ -6,7 +6,7 @@ echo db.data_default.insert({"_id":2}) | %mongo_exe% %database_name% || goto :e
set token=%BT_DATA_TOKEN%
-curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.3 > broker
+curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.6 > broker
set /P broker=< broker
C:\Curl\curl.exe -d '' --silent %broker%/v0.2/creategroup > groupid
diff --git a/tests/automatic/broker/get_meta/check_linux.sh b/tests/automatic/broker/get_meta/check_linux.sh
index c1d9e4d45302696d854bf333747a1945f3c1f4d1..75f3ca1daf27faa0d438502af10de9cb01b4de1d 100644
--- a/tests/automatic/broker/get_meta/check_linux.sh
+++ b/tests/automatic/broker/get_meta/check_linux.sh
@@ -16,7 +16,7 @@ echo 'db.meta.insert({"_id":"st_test","meta":{"data":"test_st"}})' | mongo ${dat
token=$BT_TEST_TOKEN
-broker=`curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.3`
+broker=`curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.6`
echo found broker at $broker
diff --git a/tests/automatic/broker/get_meta/check_windows.bat b/tests/automatic/broker/get_meta/check_windows.bat
index 0631edfaec38a1bd5057408d94cd274826d3b378..885986a8adc6dfa29227e83443ab2b305f0d814f 100644
--- a/tests/automatic/broker/get_meta/check_windows.bat
+++ b/tests/automatic/broker/get_meta/check_windows.bat
@@ -4,7 +4,7 @@ SET mongo_exe="c:\Program Files\MongoDB\Server\4.2\bin\mongo.exe"
echo db.meta.insert({"_id":"bt","meta":{"data":"test_bt"}}) | %mongo_exe% %database_name% || goto :error
echo db.meta.insert({"_id":"st_test","meta":{"data":"test_st"}}) | %mongo_exe% %database_name% || goto :error
-curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.3 > broker
+curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.6 > broker
set /P broker=< broker
set token=%BT_DATA_TOKEN%
diff --git a/tests/automatic/broker/get_next/check_linux.sh b/tests/automatic/broker/get_next/check_linux.sh
index bcef1d69dbff830086679c027c77828f680dc117..840a0f12d7583792b841b8954309b553daacae3f 100644
--- a/tests/automatic/broker/get_next/check_linux.sh
+++ b/tests/automatic/broker/get_next/check_linux.sh
@@ -17,7 +17,7 @@ echo "db.data_${stream}.insert({"_id":1})" | mongo ${database_name}
token=$BT_DATA_TOKEN
-broker=`curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.3`
+broker=`curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.6`
echo found broker at $broker
diff --git a/tests/automatic/broker/get_next/check_windows.bat b/tests/automatic/broker/get_next/check_windows.bat
index ba8760fa73377ce49e913da2a9f09f683871d393..3ca4ab9208c931a14631a614fdd593518c807613 100644
--- a/tests/automatic/broker/get_next/check_windows.bat
+++ b/tests/automatic/broker/get_next/check_windows.bat
@@ -6,7 +6,7 @@ echo db.data_default.insert({"_id":2}) | %mongo_exe% %database_name% || goto :e
set token=%BT_DATA_TOKEN%
-curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.3 > broker
+curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.6 > broker
set /P broker=< broker
diff --git a/tests/automatic/common_scripts/start_services.bat b/tests/automatic/common_scripts/start_services.bat
index 459fa99a075ae4bc19e2a6cf155524330576be90..32eab2fe62e2cfd8b8a49b8e5b84c4f6d0fea00d 100644
--- a/tests/automatic/common_scripts/start_services.bat
+++ b/tests/automatic/common_scripts/start_services.bat
@@ -21,9 +21,9 @@ if %started% EQU 0 (
set started=1
ping 192.0.2.1 -n 1 -w 3000 > nul
)
-curl --silent --fail 127.0.0.1:8400/asapo-discovery/v0.1/asapo-receiver?protocol=v0.1 --stderr - | findstr 127.0.0.1 || goto :repeat
-curl --silent --fail 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.1 --stderr - | findstr 127.0.0.1 || goto :repeat
-curl --silent --fail 127.0.0.1:8400/asapo-discovery/v0.1/asapo-file-transfer?protocol=v0.1 --stderr - | findstr 127.0.0.1 || goto :repeat
+curl --silent --fail 127.0.0.1:8400/asapo-discovery/v0.1/asapo-receiver?protocol=v0.6 --stderr - | findstr 127.0.0.1 || goto :repeat
+curl --silent --fail 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.6 --stderr - | findstr 127.0.0.1 || goto :repeat
+curl --silent --fail 127.0.0.1:8400/asapo-discovery/v0.1/asapo-file-transfer?protocol=v0.6 --stderr - | findstr 127.0.0.1 || goto :repeat
echo services ready
diff --git a/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh
index 8bab44a7dbcffb73650feb0a9443c74d94d7e369..f1969878d26e6c52eabf0debe2a1fb6c42f22d1e 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh
@@ -34,7 +34,7 @@ Cleanup() {
while true
do
sleep 1
- curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-receiver?protocol=v0.1 --stderr - | grep 127.0.0.1 || continue
+ curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-receiver?protocol=v0.6 --stderr - | grep 127.0.0.1 || continue
echo recevier started
break
done
@@ -65,7 +65,7 @@ if [[ $network_type == "fabric" ]]; then
while true
do
sleep 1
- curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-receiver?protocol=v0.1 --stderr - | grep 127.0.0.1 || continue
+ curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-receiver?protocol=v0.6 --stderr - | grep 127.0.0.1 || continue
echo recevier started
break
done
diff --git a/tests/automatic/full_chain/two_beamlines/check_linux.sh b/tests/automatic/full_chain/two_beamlines/check_linux.sh
index f2fbb99e0c030d7c7a304a0920d79976614ee460..61271989b8d81888f246bd7b2758f3dc9c3160f9 100644
--- a/tests/automatic/full_chain/two_beamlines/check_linux.sh
+++ b/tests/automatic/full_chain/two_beamlines/check_linux.sh
@@ -35,7 +35,7 @@ Cleanup() {
while true
do
sleep 1
- curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-receiver?protocol=v0.1 --stderr - | grep 127.0.0.1 || continue
+ curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-receiver?protocol=v0.6 --stderr - | grep 127.0.0.1 || continue
echo recevier started
break
done
@@ -64,7 +64,7 @@ if [[ $network_type == "fabric" ]]; then
while true
do
sleep 1
- curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-receiver?protocol=v0.1 --stderr - | grep 127.0.0.1 || continue
+ curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-receiver?protocol=v0.6 --stderr - | grep 127.0.0.1 || continue
echo recevier started
break
done
diff --git a/tests/automatic/producer_receiver/transfer_single_file_with_kafka/check_linux.sh b/tests/automatic/producer_receiver/transfer_single_file_with_kafka/check_linux.sh
index 6af384ac67285ab62fff4094197c7bea4bcdf572..119354a5d92c13145ecd225061d586b5cd88a77c 100644
--- a/tests/automatic/producer_receiver/transfer_single_file_with_kafka/check_linux.sh
+++ b/tests/automatic/producer_receiver/transfer_single_file_with_kafka/check_linux.sh
@@ -21,7 +21,7 @@ Cleanup() {
while true
do
sleep 1
- curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-receiver?protocol=v0.1 --stderr - | grep 127.0.0.1 || continue
+ curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-receiver?protocol=v0.6 --stderr - | grep 127.0.0.1 || continue
echo recevier started
break
done
@@ -53,7 +53,7 @@ nomad run -var receiver_kafka_metadata_broker_list="${BOOTSTRAP}" receiver_kafka
while true
do
sleep 1
- curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-receiver?protocol=v0.1 --stderr - | grep 127.0.0.1 || continue
+ curl --silent 127.0.0.1:8400/asapo-discovery/v0.1/asapo-receiver?protocol=v0.6 --stderr - | grep 127.0.0.1 || continue
echo recevier started
break
done