scottk/wlan-cloud-owprov
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-owprov.git synced 2025-11-02 03:27:51 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Saving State in put

Browse Source
This commit is contained in:
stephb9959
2022-02-09 11:50:24 -08:00
parent b6f0d40a42
commit 7f0b45312e
3 changed files with 3 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/AutoDiscovery.cpp
View File

@@ -27,27 +27,15 @@ namespace OpenWifi {
#define __DBG__ std::cout << __FILE__ << ": " << __LINE__ << std::endl;
void AutoDiscovery::run() {
Logger().information("Starting...");
Poco::AutoPtr<Poco::Notification> Note(Queue_.waitDequeueNotification());
Logger().information("Entering loop...");
while(Note && Running_) {
__DBG__
Logger().information("Waiting for device message...");
__DBG__
auto Msg = dynamic_cast<DiscoveryMessage *>(Note.get());
__DBG__
if(Msg!= nullptr) {
__DBG__
Logger().information("Message received...");
__DBG__
try {
__DBG__
Poco::JSON::Parser Parser;
auto Object = Parser.parse(Msg->Payload()).extract<Poco::JSON::Object::Ptr>();
__DBG__
if (Object->has(uCentralProtocol::PAYLOAD)) {
__DBG__
auto PayloadObj = Object->getObject(uCentralProtocol::PAYLOAD);
std::string ConnectedIP, SerialNumber, DeviceType;
if (PayloadObj->has(uCentralProtocol::CONNECTIONIP))
@@ -69,31 +57,20 @@ namespace OpenWifi {
DeviceType = PingMessage->get(uCentralProtocol::COMPATIBLE).toString();
}
}
__DBG__
if (!SerialNumber.empty()) {
__DBG__
StorageService()->InventoryDB().CreateFromConnection(SerialNumber, ConnectedIP, DeviceType);
__DBG__
}
__DBG__
}
} catch (const Poco::Exception &E) {
__DBG__
Logger().log(E);
__DBG__
} catch (...) {
}
} else {
__DBG__
Logger().information("No Message received...");
__DBG__
}
__DBG__
Note = Queue_.waitDequeueNotification();
__DBG__
}
__DBG__
Logger().information("Exiting...");
__DBG__
}
}

2
src/RESTAPI/RESTAPI_webSocketServer.cpp
View File

@@ -28,9 +28,7 @@ namespace OpenWifi {
Poco::Net::WebSocket WS(*Request, *Response);
Logger().information("WebSocket connection established.");
auto Id = MicroService::CreateUUID();
std::cout << __func__ << ":" << __LINE__ << std::endl;
new WebSocketClient(WS,Id,Logger());
std::cout << __func__ << ":" << __LINE__ << std::endl;
}
catch (...) {
std::cout << "Cannot create websocket client..." << std::endl;

15
src/storage/storage_inventory.cpp
View File

@@ -80,9 +80,7 @@ namespace OpenWifi {
const std::string &DeviceType) {
ProvObjects::InventoryTag ExistingDevice;
__DBG__
if(!GetRecord("serialNumber",SerialNumber,ExistingDevice)) {
__DBG__
ProvObjects::InventoryTag NewDevice;
uint64_t Now = std::time(nullptr);
@@ -91,33 +89,26 @@ namespace OpenWifi {
if(Tokens.count()==3) {
IP = Tokens[1];
}
__DBG__
NewDevice.info.id = MicroService::CreateUUID();
NewDevice.info.name = SerialNumber;
NewDevice.info.created = NewDevice.info.modified = Now;
NewDevice.info.notes.push_back(SecurityObjects::NoteInfo{.created=Now,.createdBy="*system",.note="Auto discovered"});
NewDevice.serialNumber = SerialNumber;
NewDevice.deviceType = DeviceType;
__DBG__
nlohmann::json StateDoc;
StateDoc["method"] = "auto-discovery";
StateDoc["date"] = std::time(nullptr);
NewDevice.state = to_string(StateDoc);
__DBG__
if(!IP.empty()) {
StorageService()->VenueDB().GetByIP(IP,NewDevice.venue);
if(NewDevice.venue.empty()) {
StorageService()->EntityDB().GetByIP(IP,NewDevice.entity);
}
}
__DBG__
if(CreateRecord(NewDevice)) {
__DBG__
SerialNumberCache()->AddSerialNumber(SerialNumber, DeviceType);
std::string FullUUID;
__DBG__
if(!NewDevice.entity.empty()) {
StorageService()->EntityDB().AddDevice("id",NewDevice.entity,NewDevice.info.id);
FullUUID = StorageService()->EntityDB().Prefix() + ":" + NewDevice.entity;
@@ -127,7 +118,6 @@ namespace OpenWifi {
FullUUID = StorageService()->VenueDB().Prefix() + ":" + NewDevice.venue;
}
__DBG__
if(!FullUUID.empty()) {
if(SDK::GW::Device::SetVenue(nullptr,NewDevice.serialNumber,FullUUID)) {
// std::cout << "Set GW done " << SerialNumber << std::endl;
@@ -136,23 +126,19 @@ namespace OpenWifi {
// std::cout << "Could not set GW " << SerialNumber << std::endl;
Logger().information(Poco::format("%s: could not set GW entity/venue property.", NewDevice.serialNumber));
}
__DBG__
}
Logger().information(Poco::format("Adding %s to inventory.",SerialNumber));
return true;
} else {
__DBG__
Logger().information(Poco::format("Could not add %s to inventory.",SerialNumber));
}
} else {
__DBG__
// Device already exists, do we need to modify anything?
bool modified=false;
if(ExistingDevice.deviceType != DeviceType) {
ExistingDevice.deviceType = DeviceType;
modified = true;
}
__DBG__
// if this device is being claimed, not it is claimed.
if(!ExistingDevice.state.empty()) {
@@ -161,7 +147,6 @@ namespace OpenWifi {
uint64_t Date = State["date"];
uint64_t Now = std::time(nullptr);
__DBG__
if((Now - Date)<(24*60*60)) {
State["method"] = "claimed";
State["date"] = std::time(nullptr);