scottk/wlan-cloud-ucentralgw
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-ucentralgw.git synced 2025-11-07 22:23:10 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

https://telecominfraproject.atlassian.net/browse/WIFI-11259

Browse Source 
Signed-off-by: stephb9959 <stephane.bourque@gmail.com>
This commit is contained in:
stephb9959
2022-10-21 23:10:11 -07:00
parent 8b73e4b232
commit 1c8ce086df
2 changed files with 2 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/RESTAPI/RESTAPI_device_commandHandler.cpp
View File

@@ -986,13 +986,12 @@ namespace OpenWifi {
return ReturnStatus(Poco::Net::HTTPResponse::HTTP_SERVICE_UNAVAILABLE);
}
#define DBG { std::cout << __LINE__ << std::endl; }
// #define DBG { std::cout << __LINE__ << std::endl; }
void RESTAPI_device_commandHandler::Telemetry(const std::string &CMD_UUID, uint64_t CMD_RPC, [[maybe_unused]] std::chrono::milliseconds timeout){
Logger_.information(fmt::format("TELEMETRY({},{}): TID={} user={} serial={}", CMD_UUID, CMD_RPC, TransactionId_, Requester(), SerialNumber_));
const auto &Obj = ParsedBody_;
DBG
if (Obj->has(RESTAPI::Protocol::SERIALNUMBER) &&
Obj->has(RESTAPI::Protocol::INTERVAL) &&
@@ -1004,34 +1003,27 @@ namespace OpenWifi {
return BadRequest(RESTAPI::Errors::SerialNumberMismatch);
}
DBG
std::stringstream oooss;
Obj->stringify(oooss);
// std::cout << "Payload:" << oooss.str() << std::endl;
DBG
std::uint64_t Lifetime = 60 * 60 ; // 1 hour
std::uint64_t Interval = 5;
bool KafkaOnly = false;
DBG
if(Obj->has("kafka")) {
KafkaOnly = Obj->get("kafka").toString()=="true";
}
DBG
auto StatusOnly = GetBoolParameter("statusOnly",false);
DBG
AssignIfPresent(Obj, RESTAPI::Protocol::INTERVAL, Interval);
AssignIfPresent(Obj, RESTAPI::Protocol::LIFETIME, Lifetime);
DBG
Poco::JSON::Object Answer;
auto IntSerialNumber = Utils::SerialNumberToInt(SerialNumber_);
DBG
if(!StatusOnly) {
if (KafkaOnly) {
if (Interval) {
@@ -1043,42 +1035,31 @@ namespace OpenWifi {
Answer.set("action", "Kafka telemetry stopped.");
}
} else {
DBG
if (Interval) {
DBG
AP_WS_Server()->SetWebSocketTelemetryReporting(CMD_RPC, IntSerialNumber, Interval,
Lifetime);
DBG
std::string EndPoint;
DBG
if (TelemetryStream()->CreateEndpoint(Utils::SerialNumberToInt(SerialNumber_), EndPoint, CMD_UUID)) {
Answer.set("action", "WebSocket telemetry started.");
Answer.set("serialNumber", SerialNumber_);
Answer.set("uuid", CMD_UUID);
Answer.set("uri", EndPoint);
DBG
} else {
DBG
return BadRequest(RESTAPI::Errors::InternalError);
}
DBG
} else {
Answer.set("action", "WebSocket telemetry stopped.");
AP_WS_Server()->StopWebSocketTelemetry(CMD_RPC,IntSerialNumber);
}
DBG
}
} else {
DBG
Answer.set("action", "Telemetry status only.");
}
bool TelemetryRunning;
DBG
std::uint64_t TelemetryWebSocketCount, TelemetryKafkaCount, TelemetryInterval,
TelemetryWebSocketTimer, TelemetryKafkaTimer, TelemetryWebSocketPackets,
TelemetryKafkaPackets;
DBG
AP_WS_Server()->GetTelemetryParameters(IntSerialNumber,TelemetryRunning,
TelemetryInterval,
TelemetryWebSocketTimer,
@@ -1087,9 +1068,7 @@ namespace OpenWifi {
TelemetryKafkaCount,
TelemetryWebSocketPackets,
TelemetryKafkaPackets);
DBG
Poco::JSON::Object TelemetryStatus;
DBG
TelemetryStatus.set("running", TelemetryRunning);
TelemetryStatus.set("interval", TelemetryInterval);
TelemetryStatus.set("websocketTimer", TelemetryWebSocketTimer);
@@ -1098,9 +1077,7 @@ namespace OpenWifi {
TelemetryStatus.set("kafkaClients", TelemetryKafkaCount);
TelemetryStatus.set("kafkaPackets", TelemetryKafkaPackets);
TelemetryStatus.set("websocketPackets", TelemetryWebSocketPackets);
DBG
Answer.set("status", TelemetryStatus);
DBG
return ReturnObject(Answer);
}
return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);