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 tags & rrm.

Browse Source
This commit is contained in:
stephb9959
2021-09-23 08:59:09 -07:00
parent 1e69e5a3a0
commit 6c8325aaaa
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build
View File

@@ -1 +1 @@
183 185

1
src/RESTAPI_configurations_handler.cpp
View File

@@ -207,6 +207,7 @@ namespace OpenWifi{
AssignIfPresent(Obj, "name", Existing.info.name); AssignIfPresent(Obj, "name", Existing.info.name);
AssignIfPresent(Obj,"description", Existing.info.description); AssignIfPresent(Obj,"description", Existing.info.description);
AssignIfPresent(Obj, "rrm", Existing.rrm);
NewConfig.info.modified = std::time(nullptr); NewConfig.info.modified = std::time(nullptr);
if(!NewConfig.variables.empty()) if(!NewConfig.variables.empty())

7
src/RESTAPI_entity_handler.cpp
View File

@@ -157,10 +157,9 @@ namespace OpenWifi{
Existing.info.notes.insert(Existing.info.notes.begin(),i); Existing.info.notes.insert(Existing.info.notes.begin(),i);
} }
if(!NewEntity.info.name.empty()) AssignIfPresent(RawObject, "rrm", Existing.rrm);
Existing.info.name = NewEntity.info.name; AssignIfPresent(RawObject, "name", Existing.info.name);
if(!NewEntity.info.description.empty()) AssignIfPresent(RawObject, "description", Existing.info.description);
Existing.info.description = NewEntity.info.description;
Existing.info.modified = std::time(nullptr); Existing.info.modified = std::time(nullptr);

1
src/RESTAPI_inventory_handler.cpp
View File

@@ -177,6 +177,7 @@ namespace OpenWifi{
AssignIfPresent(RawObject, "entity",NewEntity); AssignIfPresent(RawObject, "entity",NewEntity);
AssignIfPresent(RawObject, "location",NewLocation); AssignIfPresent(RawObject, "location",NewLocation);
AssignIfPresent(RawObject, "contact",NewContact); AssignIfPresent(RawObject, "contact",NewContact);
AssignIfPresent(RawObject, "rrm",Existing.rrm);
if(!NewEntity.empty() && !NewVenue.empty()) { if(!NewEntity.empty() && !NewVenue.empty()) {
BadRequest(RESTAPI::Errors::NotBoth); BadRequest(RESTAPI::Errors::NotBoth);

1
src/RESTAPI_venue_handler.cpp
View File

@@ -161,6 +161,7 @@ namespace OpenWifi{
AssignIfPresent(RawObject, "name", Existing.info.name); AssignIfPresent(RawObject, "name", Existing.info.name);
AssignIfPresent(RawObject, "description", Existing.info.description); AssignIfPresent(RawObject, "description", Existing.info.description);
AssignIfPresent(RawObject, "rrm",Existing.rrm);
std::string MoveEntity; std::string MoveEntity;
if(AssignIfPresent(RawObject, "entity", MoveEntity) && !Storage()->EntityDB().Exists("id",MoveEntity)) { if(AssignIfPresent(RawObject, "entity", MoveEntity) && !Storage()->EntityDB().Exists("id",MoveEntity)) {

2
test_scripts/curl/import_tree.json
View File

@@ -18,7 +18,7 @@
}, },
{ {
"type": "venue", "type": "venue",
"name": "Olymic Statium", "name": "Olympic Stadium",
"venues": [] "venues": []
} }
] ]