diff --git a/common/cpp/include/asapo/common/networking.h b/common/cpp/include/asapo/common/networking.h
index 548372db34fd179d5a1ce78e67a8f88fea21312e..be3dfc31d6878dd0f6dc7bfecd6b1118819e4cdc 100644
--- a/common/cpp/include/asapo/common/networking.h
+++ b/common/cpp/include/asapo/common/networking.h
@@ -28,10 +28,10 @@ enum Opcode : uint8_t {
kOpcodeGetBufferData,
kOpcodeAuthorize,
kOpcodeTransferMetaData,
- kOpcodePersistStream,
kOpcodeDeleteStream,
kOpcodeGetMeta,
kOpcodeCount,
+ kOpcodePersistStream
};
inline std::string OpcodeToString(uint8_t code) {
@@ -44,8 +44,8 @@ inline std::string OpcodeToString(uint8_t code) {
case kOpcodeAuthorize:return "authorize";
case kOpcodeTransferMetaData:return "transfer metadata";
case kOpcodeDeleteStream:return "delete stream";
- case kOpcodePersistStream:return "persist stream";
case kOpcodeGetMeta:return "get meta";
+ case kOpcodePersistStream:return "persist stream";
default:return "unknown op";
}
}
diff --git a/discovery/src/asapo_discovery/protocols/protocol_test.go b/discovery/src/asapo_discovery/protocols/protocol_test.go
index fff6749cce93bf2e3f832e1eb9e938ac28d5d325..0a6e3adfe98d5a1064df01d3ba82339af27f4955 100644
--- a/discovery/src/asapo_discovery/protocols/protocol_test.go
+++ b/discovery/src/asapo_discovery/protocols/protocol_test.go
@@ -14,24 +14,22 @@ type protocolTest struct {
}
var protocolTests = []protocolTest{
-// consumer
+ // consumer
{"consumer", "v0.6", true, "current", "v0.6"},
{"consumer", "v0.5", true, "deprecates", "v0.5"},
{"consumer", "v0.4", true, "deprecates", "v0.4"},
- {"consumer", "v0.3", true, "deprecates", "v0.3"},
- {"consumer", "v0.2", true, "deprecates", "v0.2"},
- {"consumer", "v0.1", true, "deprecates", "v0.1"},
+ {"consumer", "v0.3", false, "deprecated", "v0.3"},
+ {"consumer", "v0.2", false, "deprecated", "v0.2"},
+ {"consumer", "v0.1", false, "deprecated", "v0.1"},
{"consumer", "v1000.2", false, "unknown", "unknown protocol"},
-
-
-// producer
+ // producer
{"producer", "v0.6", true, "current", "v0.6"},
{"producer", "v0.5", true, "deprecates", "v0.5"},
{"producer", "v0.4", true, "deprecates", "v0.4"},
{"producer", "v0.3", true, "deprecates", "v0.3"},
- {"producer", "v0.2", true, "deprecates", "v0.2"},
- {"producer", "v0.1", true, "deprecates", "v0.1"},
+ {"producer", "v0.2", false, "deprecated", "v0.2"},
+ {"producer", "v0.1", false, "deprecated", "v0.1"},
{"producer", "v1000.2", false, "unknown", "unknown protocol"},
}
diff --git a/discovery/src/asapo_discovery/server/get_version_test.go b/discovery/src/asapo_discovery/server/get_version_test.go
index d7555369e29cd24cfd1ef2a78c71944f109940b9..1dec9d205abb51fe784994f36bc3b3ce967c5815 100644
--- a/discovery/src/asapo_discovery/server/get_version_test.go
+++ b/discovery/src/asapo_discovery/server/get_version_test.go
@@ -19,31 +19,31 @@ var versionTests = []struct {
message string
}{
{"", versionInfo{
- SoftwareVersion: coreVer,
- ClientProtocol: protocols.ProtocolInfo{},
- ClientSupported: "",
+ SoftwareVersion: coreVer,
+ ClientProtocol: protocols.ProtocolInfo{},
+ ClientSupported: "",
}, http.StatusOK, "no client"},
{"?client=consumer", versionInfo{
SoftwareVersion: coreVer,
- ClientProtocol: protocols.ProtocolInfo{"", nil},
- ClientSupported: "no",
+ ClientProtocol: protocols.ProtocolInfo{"", nil},
+ ClientSupported: "no",
}, http.StatusOK, "consumer client, no protocol"},
{"?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",
+ ClientProtocol: protocols.ProtocolInfo{"v0.6 (current)",
+ map[string]string{"Authorizer": "v0.2", "Broker": "v0.6", "Data cache service": "v0.1", "Discovery": "v0.1", "File Transfer": "v0.2"}},
+ ClientSupported: "yes",
}, http.StatusOK, "consumer client"},
{"?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",
+ SoftwareVersion: coreVer,
+ ClientProtocol: protocols.ProtocolInfo{"v0.6 (current)", map[string]string{"Discovery": "v0.1", "Receiver": "v0.6"}},
+ ClientSupported: "yes",
}, http.StatusOK, "producer client"},
{"?client=producer&protocol=v1000.2", versionInfo{
- SoftwareVersion: coreVer,
- ClientProtocol: protocols.ProtocolInfo{"v1000.2 (unknown protocol)",nil},
- ClientSupported: "no",
+ SoftwareVersion: coreVer,
+ ClientProtocol: protocols.ProtocolInfo{"v1000.2 (unknown protocol)", nil},
+ ClientSupported: "no",
}, http.StatusOK, "producer client unknown"},
}
@@ -55,9 +55,9 @@ func TestVersionTests(t *testing.T) {
var info versionInfo
json.Unmarshal(w.Body.Bytes(), &info)
fmt.Println(w.Body.String())
- assert.Equal(t, test.result.ClientProtocol,info.ClientProtocol, test.message)
- if test.message!="no client" {
- assert.Equal(t, true,len(info.SupportedProtocols)>0, test.message)
+ assert.Equal(t, test.result.ClientProtocol, info.ClientProtocol, test.message)
+ if test.message != "no client" {
+ assert.Equal(t, true, len(info.SupportedProtocols) > 0, test.message)
}
}
}
diff --git a/producer/api/c/include/asapo/producer_c.h b/producer/api/c/include/asapo/producer_c.h
index 02f62eb1bbce1f491a8c3b88f2a5cebc587c40cf..34ca22bb40bd97ae883f6ad4b2919ef7ff1d9bca 100644
--- a/producer/api/c/include/asapo/producer_c.h
+++ b/producer/api/c/include/asapo/producer_c.h
@@ -29,10 +29,10 @@ enum AsapoOpcode {
kOpcodeGetBufferData,
kOpcodeAuthorize,
kOpcodeTransferMetaData,
- kOpcodePersistStream,
kOpcodeDeleteStream,
kOpcodeGetMeta,
- kOpcodeCount
+ kOpcodeCount,
+ kOpcodePersistStream
};
diff --git a/producer/api/cpp/src/producer_c_glue.cpp b/producer/api/cpp/src/producer_c_glue.cpp
index ba65c92268835301f25218dc6965554a458a60a8..f478eb184ec4eb1a7d0e1ac2fa81403e830bd3aa 100644
--- a/producer/api/cpp/src/producer_c_glue.cpp
+++ b/producer/api/cpp/src/producer_c_glue.cpp
@@ -24,10 +24,10 @@ extern "C" {
kOpcodeGetBufferData == asapo::Opcode::kOpcodeGetBufferData&&
kOpcodeAuthorize == asapo::Opcode::kOpcodeAuthorize&&
kOpcodeTransferMetaData == asapo::Opcode::kOpcodeTransferMetaData&&
- kOpcodePersistStream == asapo::Opcode::kOpcodePersistStream&&
kOpcodeDeleteStream == asapo::Opcode::kOpcodeDeleteStream&&
kOpcodeGetMeta == asapo::Opcode::kOpcodeGetMeta&&
- kOpcodeCount == asapo::Opcode::kOpcodeCount,
+ kOpcodeCount == asapo::Opcode::kOpcodeCount&&
+ kOpcodePersistStream == asapo::Opcode::kOpcodePersistStream,
"incompatible bit reps between c++ and c for asapo::OpCode");
static_assert(kTcp == asapo::RequestHandlerType:: kTcp&&
kFilesystem == asapo::RequestHandlerType:: kFilesystem,
diff --git a/receiver/src/request_handler/request_factory.cpp b/receiver/src/request_handler/request_factory.cpp
index 2b32c2992f556e8c309d54fa5cb349ef53e91c40..8d6a816cbaa1d5c673228151a4f34561c239e817 100644
--- a/receiver/src/request_handler/request_factory.cpp
+++ b/receiver/src/request_handler/request_factory.cpp
@@ -96,10 +96,6 @@ Error RequestFactory::AddHandlersToRequest(std::unique_ptr<Request>& request,
request->AddHandler(&request_handler_delete_stream_);
break;
}
- case Opcode::kOpcodePersistStream: {
- request->AddHandler(&request_handler_persist_stream_);
- break;
- }
case Opcode::kOpcodeLastStream: {
request->AddHandler(&request_handler_db_last_stream_);
break;
@@ -108,6 +104,10 @@ Error RequestFactory::AddHandlersToRequest(std::unique_ptr<Request>& request,
request->AddHandler(&request_handler_db_get_meta_);
break;
}
+ case Opcode::kOpcodePersistStream: {
+ request->AddHandler(&request_handler_persist_stream_);
+ break;
+ }
default:
return ReceiverErrorTemplates::kInvalidOpCode.Generate();
}
diff --git a/receiver/unittests/mock_receiver_config.cpp b/receiver/unittests/mock_receiver_config.cpp
index 64b531bacfa72705596f79b12f545fe291a91285..6ed9dada5d130a7c199f195b08acdbd53f2f6f1f 100644
--- a/receiver/unittests/mock_receiver_config.cpp
+++ b/receiver/unittests/mock_receiver_config.cpp
@@ -82,7 +82,7 @@ Error SetReceiverConfigWithError (const ReceiverConfig& config, std::string erro
config_string += "," + Key("AuthorizationServer", error_field) + "\"" + config.authorization_server + "\"";
config_string += "," + Key("LogLevel", error_field) + "\"" + log_level + "\"";
config_string += "," + Key("Tag", error_field) + "\"" + config.tag + "\"";
- config_string += "," + Key("MaxNumPersistedStreams", error_field) + "\"" + std::to_string(config.max_num_persisted_streams) + "\"";
+ config_string += "," + Key("MaxNumPersistedStreams", error_field) + std::to_string(config.max_num_persisted_streams);
config_string += "," + Key("Kafka", error_field) + "{";
config_string += Key("Enabled", error_field) + (config.kafka_config.enabled ? "true" : "false") ;
config_string += "}";