From 4453f674e426903021b3fd925294998bd7b16604 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Mon, 6 Apr 2020 13:37:32 +0200
Subject: [PATCH] fix discovery service endpoint
---
consumer/api/cpp/src/server_data_broker.cpp | 2 +-
.../api/cpp/unittests/test_server_broker.cpp | 20 +++++++++----------
deploy/asapo_services/scripts/broker.json.tpl | 2 +-
.../asapo_services/scripts/receiver.json.tpl | 4 ++--
.../cpp/src/receiver_discovery_service.cpp | 2 +-
.../test_receiver_discovery_service.cpp | 2 +-
.../settings/broker_settings.json.tpl | 2 +-
tests/manual/maxwell/asapo_test/clean.sh | 20 +++++++++----------
8 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/consumer/api/cpp/src/server_data_broker.cpp b/consumer/api/cpp/src/server_data_broker.cpp
index f8de01a65..e7ea682be 100644
--- a/consumer/api/cpp/src/server_data_broker.cpp
+++ b/consumer/api/cpp/src/server_data_broker.cpp
@@ -153,7 +153,7 @@ Error ServerDataBroker::DiscoverService(const std::string& service_name, std::st
}
RequestInfo ri;
ri.host = endpoint_;
- ri.api = "/discovery/" + service_name;
+ ri.api = "/asapo-discovery/" + service_name;
RequestOutput output;
Error err;
err = ProcessRequest(&output, ri, nullptr);
diff --git a/consumer/api/cpp/unittests/test_server_broker.cpp b/consumer/api/cpp/unittests/test_server_broker.cpp
index 00e26b458..0a9e6e7c6 100644
--- a/consumer/api/cpp/unittests/test_server_broker.cpp
+++ b/consumer/api/cpp/unittests/test_server_broker.cpp
@@ -63,8 +63,8 @@ class ServerDataBrokerTests : public Test {
NiceMock<MockNetClient> mock_netclient;
FileInfo info;
std::string expected_server_uri = "test:8400";
- std::string expected_broker_uri = "broker:5005";
- std::string expected_fts_uri = "fts:5008";
+ std::string expected_broker_uri = "asapo-broker:5005";
+ std::string expected_fts_uri = "asapo-file-transfer:5008";
std::string expected_token = "token";
std::string expected_path = "/tmp/beamline/beamtime";
std::string expected_filename = "filename";
@@ -125,7 +125,7 @@ class ServerDataBrokerTests : public Test {
));
}
void MockGetServiceUri(std::string service, std::string result) {
- EXPECT_CALL(mock_http_client, Get_t(HasSubstr(expected_server_uri + "/discovery/" + service), _, _)).WillOnce(DoAll(
+ EXPECT_CALL(mock_http_client, Get_t(HasSubstr(expected_server_uri + "/asapo-discovery/" + service), _, _)).WillOnce(DoAll(
SetArgPointee<1>(HttpCode::OK),
SetArgPointee<2>(nullptr),
Return(result)));
@@ -134,7 +134,7 @@ class ServerDataBrokerTests : public Test {
void MockBeforeFTS(FileData* data);
void MockGetFTSUri() {
- MockGetServiceUri("fts", expected_fts_uri);
+ MockGetServiceUri("asapo-file-transfer", expected_fts_uri);
}
void ExpectFolderToken();
@@ -142,7 +142,7 @@ class ServerDataBrokerTests : public Test {
void ExpectRepeatedFileTransfer();
void MockGetBrokerUri() {
- MockGetServiceUri("broker", expected_broker_uri);
+ MockGetServiceUri("asapo-broker", expected_broker_uri);
}
void MockReadDataFromFile(int times = 1) {
if (times == 0) {
@@ -320,7 +320,7 @@ TEST_F(ServerDataBrokerTests, GetImageReturnsWrongResponseFromHttpClient) {
}
TEST_F(ServerDataBrokerTests, GetImageReturnsIfBrokerAddressNotFound) {
- EXPECT_CALL(mock_http_client, Get_t(HasSubstr(expected_server_uri + "/discovery/asapo-broker"), _,
+ EXPECT_CALL(mock_http_client, Get_t(HasSubstr(expected_server_uri + "/asapo-discovery/asapo-broker"), _,
_)).Times(AtLeast(2)).WillRepeatedly(DoAll(
SetArgPointee<1>(HttpCode::NotFound),
SetArgPointee<2>(nullptr),
@@ -333,7 +333,7 @@ TEST_F(ServerDataBrokerTests, GetImageReturnsIfBrokerAddressNotFound) {
}
TEST_F(ServerDataBrokerTests, GetImageReturnsIfBrokerUriEmpty) {
- EXPECT_CALL(mock_http_client, Get_t(HasSubstr(expected_server_uri + "/discovery/asapo-broker"), _,
+ EXPECT_CALL(mock_http_client, Get_t(HasSubstr(expected_server_uri + "/asapo-discovery/asapo-broker"), _,
_)).Times(AtLeast(2)).WillRepeatedly(DoAll(
SetArgPointee<1>(HttpCode::OK),
SetArgPointee<2>(nullptr),
@@ -353,7 +353,7 @@ TEST_F(ServerDataBrokerTests, GetDoNotCallBrokerUriIfAlreadyFound) {
data_broker->GetNext(&info, expected_group_id, nullptr);
Mock::VerifyAndClearExpectations(&mock_http_client);
- EXPECT_CALL(mock_http_client, Get_t(HasSubstr(expected_server_uri + "/discovery/asap-broker"), _, _)).Times(0);
+ EXPECT_CALL(mock_http_client, Get_t(HasSubstr(expected_server_uri + "/asapo-discovery/asap-broker"), _, _)).Times(0);
MockGet("error_response");
data_broker->GetNext(&info, expected_group_id, nullptr);
}
@@ -432,7 +432,7 @@ ACTION(AssignArg2) {
TEST_F(ServerDataBrokerTests, GetNextRetriesIfConnectionHttpClientErrorUntilTimeout) {
- EXPECT_CALL(mock_http_client, Get_t(HasSubstr(expected_server_uri + "/discovery/asapo-broker"), _,
+ EXPECT_CALL(mock_http_client, Get_t(HasSubstr(expected_server_uri + "/asapo-discovery/asapo-broker"), _,
_)).Times(AtLeast(2)).WillRepeatedly(DoAll(
SetArgPointee<1>(HttpCode::OK),
SetArgPointee<2>(nullptr),
@@ -1054,7 +1054,7 @@ void ServerDataBrokerTests::ExpectFolderToken() {
expected_beamtime_id
+ "\",\"Token\":\"" + expected_token + "\"}";
- EXPECT_CALL(mock_http_client, Post_t(HasSubstr(expected_server_uri + "/authorizer/folder"),
+ EXPECT_CALL(mock_http_client, Post_t(HasSubstr(expected_server_uri + "/asapo-authorizer/folder"),
expected_folder_query_string, _, _)).WillOnce(DoAll(
SetArgPointee<2>(HttpCode::OK),
SetArgPointee<3>(nullptr),
diff --git a/deploy/asapo_services/scripts/broker.json.tpl b/deploy/asapo_services/scripts/broker.json.tpl
index 531fdaa77..26aead08b 100644
--- a/deploy/asapo_services/scripts/broker.json.tpl
+++ b/deploy/asapo_services/scripts/broker.json.tpl
@@ -1,6 +1,6 @@
{
"DatabaseServer":"auto",
- "DiscoveryServer": "localhost:8400/discovery",
+ "DiscoveryServer": "localhost:8400/asapo-discovery",
"PerformanceDbServer":"localhost:8400/influxdb",
"PerformanceDbName": "asapo_brokers",
"Port":{{ env "NOMAD_PORT_broker" }},
diff --git a/deploy/asapo_services/scripts/receiver.json.tpl b/deploy/asapo_services/scripts/receiver.json.tpl
index 0120daebf..ace0671e8 100644
--- a/deploy/asapo_services/scripts/receiver.json.tpl
+++ b/deploy/asapo_services/scripts/receiver.json.tpl
@@ -3,8 +3,8 @@
"PerformanceDbServer":"localhost:8400/influxdb",
"PerformanceDbName": "asapo_receivers",
"DatabaseServer":"auto",
- "DiscoveryServer": "localhost:8400/discovery",
- "AuthorizationServer": "localhost:8400/authorizer",
+ "DiscoveryServer": "localhost:8400/asapo-discovery",
+ "AuthorizationServer": "localhost:8400/asapo-authorizer",
"AuthorizationInterval": 10000,
"ListenPort": {{ env "NOMAD_PORT_recv" }},
"DataServer": {
diff --git a/producer/api/cpp/src/receiver_discovery_service.cpp b/producer/api/cpp/src/receiver_discovery_service.cpp
index b3526bc36..1aa99fce9 100644
--- a/producer/api/cpp/src/receiver_discovery_service.cpp
+++ b/producer/api/cpp/src/receiver_discovery_service.cpp
@@ -9,7 +9,7 @@
namespace asapo {
-const std::string ReceiverDiscoveryService::kServiceEndpointSuffix = "/discovery/asapo-receiver";
+const std::string ReceiverDiscoveryService::kServiceEndpointSuffix = "/asapo-discovery/asapo-receiver";
ReceiverDiscoveryService::ReceiverDiscoveryService(std::string endpoint, uint64_t update_frequency_ms): httpclient__{DefaultHttpClient()},
log__{GetDefaultProducerLogger()},
diff --git a/producer/api/cpp/unittests/test_receiver_discovery_service.cpp b/producer/api/cpp/unittests/test_receiver_discovery_service.cpp
index 24ceeb87e..3f813ce51 100644
--- a/producer/api/cpp/unittests/test_receiver_discovery_service.cpp
+++ b/producer/api/cpp/unittests/test_receiver_discovery_service.cpp
@@ -48,7 +48,7 @@ class ReceiversStatusTests : public Test {
NiceMock<asapo::MockLogger> mock_logger;
NiceMock<MockHttpClient>* mock_http_client;
- std::string expected_endpoint{"endpoint/discovery/asapo-receiver"};
+ std::string expected_endpoint{"endpoint/asapo-discovery/asapo-receiver"};
ReceiverDiscoveryService status{"endpoint", 20};
void SetUp() override {
diff --git a/tests/automatic/settings/broker_settings.json.tpl b/tests/automatic/settings/broker_settings.json.tpl
index 56694d853..3edfc9b88 100644
--- a/tests/automatic/settings/broker_settings.json.tpl
+++ b/tests/automatic/settings/broker_settings.json.tpl
@@ -1,6 +1,6 @@
{
"DatabaseServer":"auto",
- "DiscoveryServer": "localhost:8400/discovery",
+ "DiscoveryServer": "localhost:8400/asapo-discovery",
"PerformanceDbServer": "localhost:8086",
"PerformanceDbName": "db_test",
"Port":{{ env "NOMAD_PORT_broker" }},
diff --git a/tests/manual/maxwell/asapo_test/clean.sh b/tests/manual/maxwell/asapo_test/clean.sh
index d2ad9ba86..83475c376 100755
--- a/tests/manual/maxwell/asapo_test/clean.sh
+++ b/tests/manual/maxwell/asapo_test/clean.sh
@@ -1,12 +1,12 @@
export asapo_host=`cat asapo_host`
-dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream
-dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream0
-dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream1
-dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream2
-dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream3
-dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream4
-dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream5
-dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream6
-dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream7
-dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream8
+dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/asapo-discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream
+dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/asapo-discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream0
+dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/asapo-discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream1
+dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/asapo-discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream2
+dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/asapo-discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream3
+dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/asapo-discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream4
+dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/asapo-discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream5
+dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/asapo-discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream6
+dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/asapo-discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream7
+dockerrun -v `pwd`:/tmp/yakubov mongo mongo --host `curl -s $asapo_host:8400/asapo-discovery/asapo-mongodb` --eval "db.dropDatabase()" asapo_test_stream8
--
GitLab