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

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

Browse Source 
Signed-off-by: stephb9959 <stephane.bourque@gmail.com>
This commit is contained in:
stephb9959
2022-08-10 14:56:59 -07:00
parent a8003a3f5f
commit 556f4bd9d1
12 changed files with 272 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/RESTAPI/RESTAPI_device_commandHandler.cpp
View File

@@ -914,7 +914,7 @@ namespace OpenWifi {
// std::cout << "I:" << Interval << " L:" << Lifetime << std::endl;
auto DeviceConnection = DeviceRegistry()->GetDeviceConnection(SerialNumber_);
if(DeviceConnection->WSConn_== nullptr) {
if(!DeviceRegistry()->Connected(SerialNumber_)) {
return BadRequest(RESTAPI::Errors::DeviceNotConnected);
}
@@ -922,19 +922,21 @@ namespace OpenWifi {
Poco::JSON::Object Answer;
auto IntSerialNumber = Utils::SerialNumberToInt(SerialNumber_);
if(!StatusOnly) {
if (KafkaOnly) {
if (Interval) {
DeviceConnection->WSConn_->SetKafkaTelemetryReporting(Interval, Lifetime);
DeviceRegistry()->SetKafkaTelemetryReporting(IntSerialNumber, Interval, Lifetime);
Answer.set("action", "Kafka telemetry started.");
Answer.set("uuid", NewUUID);
} else {
DeviceConnection->WSConn_->StopKafkaTelemetry();
DeviceRegistry()->StopKafkaTelemetry(IntSerialNumber);
Answer.set("action", "Kafka telemetry stopped.");
}
} else {
if (Interval) {
DeviceConnection->WSConn_->SetWebSocketTelemetryReporting(Interval,
DeviceRegistry()->SetWebSocketTelemetryReporting(IntSerialNumber, Interval,
Lifetime);
std::string EndPoint;
if (TelemetryStream()->CreateEndpoint(Utils::SerialNumberToInt(SerialNumber_), EndPoint, NewUUID)) {
@@ -947,7 +949,7 @@ namespace OpenWifi {
}
} else {
Answer.set("action", "WebSocket telemetry stopped.");
DeviceConnection->WSConn_->StopWebSocketTelemetry();
DeviceRegistry()->StopWebSocketTelemetry(IntSerialNumber);
}
}
} else {
@@ -958,7 +960,7 @@ namespace OpenWifi {
uint64_t TelemetryWebSocketCount, TelemetryKafkaCount, TelemetryInterval,
TelemetryWebSocketTimer, TelemetryKafkaTimer, TelemetryWebSocketPackets,
TelemetryKafkaPackets;
DeviceConnection->WSConn_->GetTelemetryParameters(TelemetryRunning,
DeviceRegistry()->GetTelemetryParameters(IntSerialNumber,TelemetryRunning,
TelemetryInterval,
TelemetryWebSocketTimer,
TelemetryKafkaTimer,
@@ -977,10 +979,6 @@ namespace OpenWifi {
TelemetryStatus.set("websocketPackets", TelemetryWebSocketPackets);
Answer.set("status", TelemetryStatus);
// std::ostringstream ooss;
// Answer.stringify(ooss);
// std::cout << "Telemetry status: " << ooss.str() << std::endl;
return ReturnObject(Answer);
}
return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);