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

Add automatic configuration creation on tag

Browse Source
This commit is contained in:
stephb9959
2022-03-11 09:07:39 -08:00
parent 6739cfbd64
commit 8134dfcd61
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/RESTAPI/RESTAPI_db_helpers.h
View File

@@ -444,6 +444,7 @@ namespace OpenWifi {
NewObject.location = LC.info.id; NewObject.location = LC.info.id;
AddMembership(StorageService()->EntityDB(), &ProvObjects::Entity::locations, AddMembership(StorageService()->EntityDB(), &ProvObjects::Entity::locations,
ParentEntity, LC.info.id); ParentEntity, LC.info.id);
Result["location"] = LC.info.id;
} }
} }
} else { } else {
@@ -470,6 +471,7 @@ namespace OpenWifi {
ProvObjects::CreateObjectInfo(R.UserInfo_.userinfo, DC.info); ProvObjects::CreateObjectInfo(R.UserInfo_.userinfo, DC.info);
if (StorageService()->ConfigurationDB().CreateRecord(DC)) { if (StorageService()->ConfigurationDB().CreateRecord(DC)) {
NewObject.deviceConfiguration = DC.info.id; NewObject.deviceConfiguration = DC.info.id;
Result["configuration"] = DC.info.id;
} }
} }
} else { } else {

11
src/RESTAPI/RESTAPI_inventory_handler.cpp
View File

@@ -421,11 +421,20 @@ namespace OpenWifi{
} }
std::string ErrorText; std::string ErrorText;
auto ObjectsCreated = CreateObjects(NewObject,*this,ErrorText); auto ObjectsCreated = CreateObjects(Existing,*this,ErrorText);
if(!ErrorText.empty()) { if(!ErrorText.empty()) {
return BadRequest(ErrorText); return BadRequest(ErrorText);
} }
if(!ObjectsCreated.empty()) {
auto it = ObjectsCreated.find("configuration");
if(it!=ObjectsCreated.end()) {
FromConfiguration="";
ToConfiguration=it->second;
Existing.deviceConfiguration=ToConfiguration;
}
}
if(StorageService()->InventoryDB().UpdateRecord("id", Existing.info.id, Existing)) { if(StorageService()->InventoryDB().UpdateRecord("id", Existing.info.id, Existing)) {
MoveUsage(StorageService()->PolicyDB(),DB_,FromPolicy,ToPolicy,Existing.info.id); MoveUsage(StorageService()->PolicyDB(),DB_,FromPolicy,ToPolicy,Existing.info.id);
MoveUsage(StorageService()->LocationDB(),DB_,FromLocation,ToLocation,Existing.info.id); MoveUsage(StorageService()->LocationDB(),DB_,FromLocation,ToLocation,Existing.info.id);