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

Addressing Venue mass update.

Browse Source
This commit is contained in:
stephb9959
2022-04-27 14:58:05 -07:00
parent b7b4fa5cbd
commit 4df53868f1
2 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Tasks/VenueConfigUpdater.h
View File

@@ -12,7 +12,7 @@
namespace OpenWifi {
static void GetRejectedLines(const Poco::JSON::Object::Ptr &Response, Types::StringVec & Warnings) {
[[maybe_unused]] static void GetRejectedLines(const Poco::JSON::Object::Ptr &Response, Types::StringVec & Warnings) {
try {
if(Response->has("results")) {
auto Results = Response->get("results").extract<Poco::JSON::Object::Ptr>();
@@ -36,45 +36,35 @@ namespace OpenWifi {
void run() final {
ProvObjects::InventoryTag Device;
ProvObjects::WebSocketNotification N;
N.content.type = "configuration_update";
started_=true;
if(StorageService()->InventoryDB().GetRecord("id",uuid_,Device)) {
N.content.title = "Venue Configuration Updater: " + venue_;
std::cout << "Starting push for " << uuid_ << std::endl;
std::cout << "Starting push for " << Device.serialNumber << std::endl;
Logger().debug(fmt::format("{}: Computing configuration.",Device.serialNumber));
auto DeviceConfig = std::make_shared<APConfig>(Device.serialNumber, Device.deviceType, Logger(), false);
auto Configuration = Poco::makeShared<Poco::JSON::Object>();
Poco::JSON::Object ErrorsObj, WarningsObj;
ProvObjects::InventoryConfigApplyResult Results;
if (DeviceConfig->Get(Configuration)) {
std::ostringstream OS;
Configuration->stringify(OS);
Results.appliedConfiguration = OS.str();
auto Response=Poco::makeShared<Poco::JSON::Object>();
Logger().debug(fmt::format("{}: Pushing configuration.",Device.serialNumber));
if (SDK::GW::Device::Configure(nullptr, Device.serialNumber, Configuration, Response)) {
Logger().debug(fmt::format("{}: Configuration pushed.",Device.serialNumber));
GetRejectedLines(Response, Results.warnings);
Results.errorCode = 0;
Logger().information(fmt::format("{}: Updated.", Device.serialNumber));
std::cout << Device.serialNumber << ": Updated" << std::endl;
updated_++;
N.content.success.push_back(Device.serialNumber);
} else {
Logger().information(fmt::format("{}: Not updated.", Device.serialNumber));
Results.errorCode = 1;
std::cout << Device.serialNumber << ": Failed" << std::endl;
failed_++;
N.content.warnings.push_back(Device.serialNumber);
}
} else {
Logger().debug(fmt::format("{}: Configuration is bad.",Device.serialNumber));
Results.errorCode = 1;
N.content.errors.push_back(Device.serialNumber);
bad_config_++;
std::cout << Device.serialNumber << ": Bad config" << std::endl;
}
}
done_ = true;
std::cout << "Done push for " << uuid_ << std::endl;
std::cout << "Done push for " << Device.serialNumber << std::endl;
}
uint64_t updated_=0, failed_=0, bad_config_=0;

16
src/sdks/SDK_gw.cpp
View File

@@ -176,24 +176,24 @@ namespace OpenWifi::SDK::GW {
return false;
}
bool Configure(RESTAPIHandler *client, const std::string &Mac, Poco::JSON::Object::Ptr & Configuration, Poco::JSON::Object::Ptr & Response) {
bool Configure(RESTAPIHandler *client, const std::string &SerialNumber, Poco::JSON::Object::Ptr & Configuration, Poco::JSON::Object::Ptr & Response) {
Poco::JSON::Object Body;
Poco::JSON::Parser P;
uint64_t Now = std::time(nullptr);
uint64_t now = OpenWifi::Now();
Configuration->set("uuid", Now);
Body.set("serialNumber", Mac);
Body.set("UUID", Now);
Configuration->set("uuid", now);
Body.set("serialNumber", SerialNumber);
Body.set("UUID", now);
Body.set("when",0);
Body.set("configuration", Configuration);
OpenWifi::OpenAPIRequestPost R(OpenWifi::uSERVICE_GATEWAY,
"/api/v1/device/" + Mac + "/configure",
"/api/v1/device/" + SerialNumber + "/configure",
{},
Body,
10000);
60000);
auto ResponseStatus = R.Do(Response, client ? client->UserInfo_.webtoken.access_token_ : "");
if(ResponseStatus == Poco::Net::HTTPResponse::HTTP_OK) {
@@ -201,9 +201,7 @@ namespace OpenWifi::SDK::GW {
Poco::JSON::Stringifier::stringify(Response,os);
return true;
}
return false;
}
}
}