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

Adding Venue/Entity self-discovery and device tracking.

Browse Source
This commit is contained in:
stephb9959
2021-09-29 18:50:35 -07:00
parent eb5cd73d17
commit 41a1c01ef5
5 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build
View File

@@ -1 +1 @@
231 233

2
src/AutoDiscovery.cpp
View File

@@ -58,7 +58,7 @@ namespace OpenWifi {
} }
} }
if(!SerialNumber.empty()) { if(!SerialNumber.empty()) {
std::cout << "SerialNUmber: " << SerialNumber << " CID: " << ConnectedIP << " DeviceType: " << DeviceType << std::endl; // std::cout << "SerialNUmber: " << SerialNumber << " CID: " << ConnectedIP << " DeviceType: " << DeviceType << std::endl;
Storage()->InventoryDB().CreateFromInventory(SerialNumber,ConnectedIP,DeviceType); Storage()->InventoryDB().CreateFromInventory(SerialNumber,ConnectedIP,DeviceType);
} }
} }

2
src/orm.h
View File

@@ -407,8 +407,6 @@ namespace ORM {
(Where.empty() ? "" : " where " + Where) + (Where.empty() ? "" : " where " + Where) +
ComputeRange(Offset, HowMany) ; ComputeRange(Offset, HowMany) ;
// std::cout << "GetRecords: " << St << std::endl;
Select << St , Select << St ,
Poco::Data::Keywords::into(RL); Poco::Data::Keywords::into(RL);

19
src/storage_inventory.cpp
View File

@@ -73,22 +73,19 @@ namespace OpenWifi {
NewDevice.info.notes.push_back(SecurityObjects::NoteInfo{.created=Now,.createdBy="*system",.note="Auto discovered"}); NewDevice.info.notes.push_back(SecurityObjects::NoteInfo{.created=Now,.createdBy="*system",.note="Auto discovered"});
NewDevice.serialNumber = SerialNumber; NewDevice.serialNumber = SerialNumber;
NewDevice.deviceType = DeviceType; NewDevice.deviceType = DeviceType;
std::string UUID;
if(!IP.empty()) { if(!IP.empty()) {
Storage()->VenueDB().GetByIP(IP,UUID); Storage()->VenueDB().GetByIP(IP,NewDevice.venue);
if(!UUID.empty()) { if(NewDevice.venue.empty()) {
NewDevice.venue = UUID; Storage()->EntityDB().GetByIP(IP,NewDevice.entity);
} else {
Storage()->EntityDB().GetByIP(IP,UUID);
NewDevice.entity = UUID;
} }
} }
if(CreateRecord(NewDevice)) { if(CreateRecord(NewDevice)) {
std::cout << "Added " << SerialNumber << " to DB with IP=" << IP << " and UUID=" << UUID << std::endl; if(!NewDevice.entity.empty())
if(!IP.empty()) { Storage()->EntityDB().AddDevice("id",NewDevice.entity,NewDevice.info.id);
Logger().information(Poco::format("Adding %s to inventory.",SerialNumber)); else if(!NewDevice.venue.empty())
} Storage()->VenueDB().AddDevice("id",NewDevice.venue,NewDevice.info.id);
Logger().information(Poco::format("Adding %s to inventory.",SerialNumber));
return true; return true;
} else { } else {
Logger().information(Poco::format("Could not add %s to inventory.",SerialNumber)); Logger().information(Poco::format("Could not add %s to inventory.",SerialNumber));

2
src/storage_venue.cpp
View File

@@ -87,8 +87,6 @@ namespace OpenWifi {
}; };
Iterate(Function); Iterate(Function);
uuid=UUID; uuid=UUID;
if(!uuid.empty())
std::cout << "Found venue: " << uuid << std::endl;
} catch (const Poco::Exception &E) { } catch (const Poco::Exception &E) {
Logger().log(E); Logger().log(E);
} }