From 348f36f8893b18ccf391bc9bc2ee6560a15e80df Mon Sep 17 00:00:00 2001
From: George Sedov <radist.morse@gmail.com>
Date: Thu, 11 Aug 2022 17:59:49 +0200
Subject: [PATCH] continue fixing the protocol version
---
discovery/src/asapo_discovery/server/get_version_test.go | 4 ++--
discovery/src/asapo_discovery/server/routes_test.go | 6 +++---
tests/automatic/broker/check_monitoring/check_linux.sh | 2 +-
tests/automatic/broker/get_last/check_linux.sh | 2 +-
tests/automatic/broker/get_last/check_windows.bat | 2 +-
tests/automatic/broker/get_meta/check_linux.sh | 2 +-
tests/automatic/broker/get_meta/check_windows.bat | 2 +-
tests/automatic/broker/get_next/check_linux.sh | 2 +-
tests/automatic/broker/get_next/check_windows.bat | 2 +-
tests/automatic/common_scripts/start_services.bat | 6 +++---
.../simple_chain_filegen_readdata_cache/check_linux.sh | 4 ++--
tests/automatic/full_chain/two_beamlines/check_linux.sh | 4 ++--
.../transfer_single_file_with_kafka/check_linux.sh | 4 ++--
13 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/discovery/src/asapo_discovery/server/get_version_test.go b/discovery/src/asapo_discovery/server/get_version_test.go
index 74c151623..d7555369e 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 b98a83a0d..30675c91c 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 d0b81c6ee..f48c9671c 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 f3cfc8b57..6f50ea116 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 dacb2771c..2148f3a4a 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 c1d9e4d45..75f3ca1da 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 0631edfae..885986a8a 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 bcef1d69d..840a0f12d 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 ba8760fa7..3ca4ab920 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 459fa99a0..32eab2fe6 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 8bab44a7d..f1969878d 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 f2fbb99e0..61271989b 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 6af384ac6..119354a5d 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
--
GitLab