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

Adding locations for venue.

Browse Source
This commit is contained in:
stephb9959
2022-03-10 13:51:18 -08:00
parent a0491820f5
commit b68eddcd26
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/RESTAPI/RESTAPI_configurations_handler.cpp
View File

@@ -116,13 +116,17 @@ namespace OpenWifi{
return true;
}
#define __DBG__ std::cout << __LINE__ << std::endl;
void RESTAPI_configurations_handler::DoPost() {
__DBG__
auto UUID = GetBinding("uuid","");
if(UUID.empty()) {
return BadRequest(RESTAPI::Errors::MissingUUID);
}
std::string Arg;
__DBG__
if(HasParameter("validateOnly",Arg) && Arg=="true") {
auto Body = ParseStream();
if(!Body->has("configuration")) {
@@ -137,49 +141,64 @@ namespace OpenWifi{
return ReturnObject(Answer);
}
__DBG__
ProvObjects::DeviceConfiguration NewObject;
auto RawObject = ParseStream();
__DBG__
if (!NewObject.from_json(RawObject)) {
return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
}
__DBG__
if(!ProvObjects::CreateObjectInfo(RawObject,UserInfo_.userinfo,NewObject.info)) {
return BadRequest(RESTAPI::Errors::NameMustBeSet);
}
__DBG__
if(!NewObject.entity.empty() && !StorageService()->EntityDB().Exists("id",NewObject.entity)) {
return BadRequest(RESTAPI::Errors::EntityMustExist);
}
__DBG__
if(!NewObject.venue.empty() && !StorageService()->VenueDB().Exists("id",NewObject.venue)) {
return BadRequest(RESTAPI::Errors::VenueMustExist);
}
__DBG__
if(!NewObject.managementPolicy.empty() && !StorageService()->PolicyDB().Exists("id",NewObject.managementPolicy)) {
return BadRequest(RESTAPI::Errors::UnknownManagementPolicyUUID);
}
__DBG__
NewObject.inUse.clear();
if(NewObject.deviceTypes.empty() || !DeviceTypeCache()->AreAcceptableDeviceTypes(NewObject.deviceTypes, true)) {
return BadRequest(RESTAPI::Errors::InvalidDeviceTypes);
}
std::string Error;
__DBG__
if(!ValidateConfigBlock(NewObject,Error)) {
return BadRequest(RESTAPI::Errors::ConfigBlockInvalid + ", error: " + Error);
}
__DBG__
if(DB_.CreateRecord(NewObject)) {
__DBG__
MoveUsage(StorageService()->PolicyDB(),DB_,"",NewObject.managementPolicy,NewObject.info.id);
__DBG__
AddMembership(StorageService()->VenueDB(),&ProvObjects::Venue::configurations,NewObject.venue, NewObject.info.id);
__DBG__
AddMembership(StorageService()->EntityDB(),&ProvObjects::Entity::configurations,NewObject.entity, NewObject.info.id);
__DBG__
ConfigurationDB::RecordName AddedRecord;
DB_.GetRecord("id", NewObject.info.id, AddedRecord);
Poco::JSON::Object Answer;
AddedRecord.to_json(Answer);
__DBG__
return ReturnObject(Answer);
}
__DBG__
InternalError(RESTAPI::Errors::RecordNotCreated);
}

17
src/RESTAPI/RESTAPI_inventory_handler.cpp
View File

@@ -17,6 +17,8 @@
#include "SerialNumberCache.h"
#include "DeviceTypeCache.h"
#define __DBG__ std::cout << __LINE__ << std::endl;
namespace OpenWifi{
void GetRejectedLines(const Poco::JSON::Object::Ptr &Response, Types::StringVec & Warnings) {
@@ -36,27 +38,41 @@ namespace OpenWifi{
void RESTAPI_inventory_handler::DoGet() {
ProvObjects::InventoryTag Existing;
__DBG__
std::string SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER,"");
__DBG__
Logger().debug(Poco::format("%s: Retrieving inventory information.",SerialNumber));
__DBG__
if(SerialNumber.empty() || !DB_.GetRecord(RESTAPI::Protocol::SERIALNUMBER,SerialNumber,Existing)) {
return NotFound();
}
__DBG__
Logger().debug(Poco::format("%s,%s: Retrieving inventory information.", Existing.serialNumber, Existing.info.id ));
__DBG__
Poco::JSON::Object Answer;
std::string Arg;
__DBG__
if(HasParameter("config",Arg) && Arg=="true") {
__DBG__
bool Explain = (HasParameter("explain",Arg) && Arg == "true");
__DBG__
APConfig Device(SerialNumber,Existing.deviceType,Logger(), Explain);
__DBG__
Poco::JSON::Object::Ptr Configuration;
if(Device.Get(Configuration)) {
__DBG__
Answer.set("config", Configuration);
if(Explain)
__DBG__
Answer.set("explanation", Device.Explanation());
} else {
__DBG__
Answer.set("config","none");
__DBG__
}
__DBG__
return ReturnObject(Answer);
} else if(HasParameter("firmwareOptions", Arg) && Arg=="true") {
ProvObjects::FIRMWARE_UPGRADE_RULES Rules;
@@ -140,7 +156,6 @@ namespace OpenWifi{
return OK();
}
#define __DBG__ std::cout << __LINE__ << std::endl;
void RESTAPI_inventory_handler::DoPost() {
std::string SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER,"");