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

Adding tree import.

Browse Source
This commit is contained in:
stephb9959
2021-09-08 10:26:24 -07:00
parent 2ac9cd8ac1
commit 4bd3d8a38b
2 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/RESTAPI_inventory_handler.cpp
View File

@@ -225,13 +225,13 @@ namespace OpenWifi{
bool UnAssign=false; bool UnAssign=false;
if(HasParameter("unassign", Arg) && Arg=="true") { if(HasParameter("unassign", Arg) && Arg=="true") {
UnAssign=true; UnAssign=true;
if(!NewVenue.empty() && ExistingObject.venue!=NewVenue) { if(!ExistingObject.venue.empty()) {
Storage()->VenueDB().DeleteDevice("id",ExistingObject.venue,ExistingObject.info.id); Storage()->VenueDB().DeleteDevice("id",ExistingObject.venue,ExistingObject.info.id);
} } else if(!ExistingObject.entity.empty()) {
if(!NewEntity.empty() && ExistingObject.entity!=NewEntity) {
Storage()->EntityDB().DeleteDevice("id",ExistingObject.venue,ExistingObject.info.id); Storage()->EntityDB().DeleteDevice("id",ExistingObject.venue,ExistingObject.info.id);
} }
ExistingObject.venue.clear();
ExistingObject.entity.clear();
} }
AssignIfPresent(RawObject, "name", ExistingObject.info.name); AssignIfPresent(RawObject, "name", ExistingObject.info.name);
@@ -239,25 +239,22 @@ namespace OpenWifi{
ExistingObject.info.modified = std::time(nullptr); ExistingObject.info.modified = std::time(nullptr);
if(Storage()->InventoryDB().UpdateRecord("id", ExistingObject.info.id, ExistingObject)) { if(Storage()->InventoryDB().UpdateRecord("id", ExistingObject.info.id, ExistingObject)) {
if(UnAssign) { if(!UnAssign && !NewEntity.empty() && NewEntity!=ExistingObject.entity) {
if(!NewEntity.empty() && NewEntity!=ExistingObject.entity) { Storage()->EntityDB().DeleteDevice("id",ExistingObject.entity,ExistingObject.info.id);
Storage()->EntityDB().AddDevice("id",NewEntity,ExistingObject.info.id); Storage()->EntityDB().AddDevice("id",NewEntity,ExistingObject.info.id);
ExistingObject.entity = NewEntity; ExistingObject.entity = NewEntity;
ExistingObject.venue.clear(); ExistingObject.venue.clear();
} } else if(!UnAssign && !NewVenue.empty() && NewVenue!=ExistingObject.venue) {
Storage()->VenueDB().DeleteDevice("id",ExistingObject.venue,ExistingObject.info.id);
if(!NewVenue.empty() && NewVenue!=ExistingObject.venue) { Storage()->VenueDB().AddDevice("id",NewVenue,ExistingObject.info.id);
Storage()->VenueDB().AddDevice("id",NewVenue,ExistingObject.info.id); ExistingObject.entity.clear();
ExistingObject.venue = NewVenue; ExistingObject.venue = NewVenue;
ExistingObject.entity.clear();
}
Storage()->InventoryDB().UpdateRecord("id", ExistingObject.info.id, ExistingObject);
} }
Storage()->InventoryDB().UpdateRecord("id", ExistingObject.info.id, ExistingObject);
Storage()->InventoryDB().GetRecord("id", ExistingObject.info.id, ExistingObject); ProvObjects::InventoryTag NewObject;
Storage()->InventoryDB().GetRecord("id", ExistingObject.info.id, NewObject);
Poco::JSON::Object Answer; Poco::JSON::Object Answer;
ExistingObject.to_json(Answer); NewObject.to_json(Answer);
ReturnObject(Request, Answer, Response); ReturnObject(Request, Answer, Response);
return; return;
} }

11
test_scripts/curl/cli
View File

@@ -321,6 +321,16 @@ listconfigs() {
jq < ${result_file} jq < ${result_file}
} }
deviceconfig() {
gettag() {
curl ${FLAGS} "https://${OWPROV}/api/v1/inventory/$1?config=true" \
-H "Content-Type: application/json" \
-H "Authorization: Bearer ${token}" \
-H "accept: application/json" > ${result_file}
jq < ${result_file}
}
}
shopt -s nocasematch shopt -s nocasematch
case "$1" in case "$1" in
"login") login; help ; logout ;; "login") login; help ; logout ;;
@@ -332,6 +342,7 @@ case "$1" in
"entitycount") login; entitycount ; logout;; "entitycount") login; entitycount ; logout;;
"tree") login; tree ; logout;; "tree") login; tree ; logout;;
"importtree") login; importtree $2; logout;; "importtree") login; importtree $2; logout;;
"deviceconfig") login; deviceconfig $2; logout;;
"addtag") login; addtag $2 $3; logout;; "addtag") login; addtag $2 $3; logout;;
"unassigntag") login; unassigntag $2; logout;; "unassigntag") login; unassigntag $2; logout;;
"addunassignedtag") login; addunassignedtag $2 ; logout;; "addunassignedtag") login; addunassignedtag $2 ; logout;;