Digital_Voice_Modem_Project
/
dvmhost
mirror of https://github.com/DVMProject/dvmhost.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add APIs for managing the separate RID alias data; add Catch2 tests;

Browse Source
pull/121/head
Bryan Biedenkapp 1 month ago
parent 0e1d45716f
commit 5e684228f5
5 changed files with 269 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
src/fne/HostFNE.cpp
Unescape View File

@ -545,7 +545,7 @@ bool HostFNE::initializeRESTAPI()
// initialize network remote command
if (restApiEnable) {
m_RESTAPI = new fne_restapi::RESTAPI(restApiAddress, restApiPort, restApiPassword, restApiSSLKey, restApiSSLCert, restApiEnableSSL, this, restApiDebug);
m_RESTAPI->setLookups(m_ridLookup, m_tidLookup, m_peerListLookup, m_adjSiteMapLookup, m_cryptoLookup);
m_RESTAPI->setLookups(m_ridLookup, m_ridAliasLookup, m_tidLookup, m_peerListLookup, m_adjSiteMapLookup, m_cryptoLookup);
m_RESTAPI->setNetwork(m_network);
bool ret = m_RESTAPI->open();
if (!ret) {

127
src/fne/restapi/RESTAPI.cpp
Unescape View File

@ -515,6 +515,7 @@ RESTAPI::RESTAPI(const std::string& address, uint16_t port, const std::string& p
m_host(host),
m_network(nullptr),
m_ridLookup(nullptr),
m_ridAliasLookup(nullptr),
m_tidLookup(nullptr),
m_peerListLookup(nullptr),
m_adjSiteMapLookup(nullptr),
@ -568,11 +569,12 @@ RESTAPI::~RESTAPI()
/* Sets the instances of the Radio ID and Talkgroup ID lookup tables. */
void RESTAPI::setLookups(lookups::RadioIdLookup* ridLookup, lookups::TalkgroupRulesLookup* tidLookup,
void RESTAPI::setLookups(lookups::RadioIdLookup* ridLookup, lookups::RadioAliasLookup* ridAliasLookup, lookups::TalkgroupRulesLookup* tidLookup,
::lookups::PeerListLookup* peerListLookup, ::lookups::AdjSiteMapLookup* adjMapLookup,
CryptoContainer* cryptoLookup)
{
m_ridLookup = ridLookup;
m_ridAliasLookup = ridAliasLookup;
m_tidLookup = tidLookup;
m_peerListLookup = peerListLookup;
m_adjSiteMapLookup = adjMapLookup;
@ -666,6 +668,10 @@ void RESTAPI::initializeEndpoints()
m_dispatcher.match(FNE_PUT_RID_ADD).put(REST_API_BIND(RESTAPI::restAPI_PutRIDAdd, this));
m_dispatcher.match(FNE_PUT_RID_DELETE).put(REST_API_BIND(RESTAPI::restAPI_PutRIDDelete, this));
m_dispatcher.match(FNE_GET_RID_COMMIT).get(REST_API_BIND(RESTAPI::restAPI_GetRIDCommit, this));
m_dispatcher.match(FNE_GET_RID_ALIAS_QUERY).get(REST_API_BIND(RESTAPI::restAPI_GetRAQuery, this));
m_dispatcher.match(FNE_PUT_RID_ALIAS_ADD).put(REST_API_BIND(RESTAPI::restAPI_PutRAAdd, this));
m_dispatcher.match(FNE_PUT_RID_ALIAS_DELETE).put(REST_API_BIND(RESTAPI::restAPI_PutRADelete, this));
m_dispatcher.match(FNE_GET_RID_ALIAS_COMMIT).get(REST_API_BIND(RESTAPI::restAPI_GetRACommit, this));
m_dispatcher.match(FNE_GET_TGID_QUERY).get(REST_API_BIND(RESTAPI::restAPI_GetTGQuery, this));
m_dispatcher.match(FNE_PUT_TGID_ADD).put(REST_API_BIND(RESTAPI::restAPI_PutTGAdd, this));
@ -1504,6 +1510,125 @@ void RESTAPI::restAPI_GetRIDCommit(const HTTPPayload& request, HTTPPayload& repl
reply.payload(response);
}
/*
** Radio Alias Operations
*/
/* REST API endpoint; implements get radio alias query request. */
void RESTAPI::restAPI_GetRAQuery(const HTTPPayload& request, HTTPPayload& reply, const RequestMatch& match)
{
if (!validateAuth(request, reply)) {
return;
}
json::object response = json::object();
setResponseDefaultStatus(response);
json::array rids = json::array();
if (m_ridAliasLookup != nullptr) {
if (m_ridAliasLookup->table().size() > 0) {
for (auto entry : m_ridAliasLookup->table()) {
json::object ridObj = json::object();
uint32_t rid = entry.first;
ridObj["id"].set<uint32_t>(rid);
std::string alias = entry.second;
ridObj["alias"].set<std::string>(alias);
rids.push_back(json::value(ridObj));
}
}
}
response["rids"].set<json::array>(rids);
reply.payload(response);
}
/* REST API endpoint; implements put radio alias add request. */
void RESTAPI::restAPI_PutRAAdd(const HTTPPayload& request, HTTPPayload& reply, const RequestMatch& match)
{
if (!validateAuth(request, reply)) {
return;
}
json::object req = json::object();
if (!parseRequestBody(request, reply, req)) {
return;
}
errorPayload(reply, "OK", HTTPPayload::OK);
if (!req["rid"].is<uint32_t>()) {
errorPayload(reply, "rid was not a valid integer");
return;
}
if (!req["alias"].is<std::string>()) {
errorPayload(reply, "alias was not a valid string");
return;
}
uint32_t rid = req["rid"].get<uint32_t>();
std::string alias = req["alias"].get<std::string>();
LogInfoEx(LOG_REST, "request to add RID alias, rid = %u, alias= %s", rid, alias.c_str());
// The addEntry function will automatically update an existing entry, so no need to check for an exisitng one here
m_ridAliasLookup->addEntry(rid, alias);
}
/* REST API endpoint; implements put radio alias delete request. */
void RESTAPI::restAPI_PutRADelete(const HTTPPayload& request, HTTPPayload& reply, const RequestMatch& match)
{
if (!validateAuth(request, reply)) {
return;
}
json::object req = json::object();
if (!parseRequestBody(request, reply, req)) {
return;
}
errorPayload(reply, "OK", HTTPPayload::OK);
if (!req["rid"].is<uint32_t>()) {
errorPayload(reply, "rid was not a valid integer");
return;
}
uint32_t rid = req["rid"].get<uint32_t>();
std::string alias = m_ridAliasLookup->find(rid);
if (alias == "SYSTEM" || alias == "UNKNOWN") {
errorPayload(reply, "failed to find specified RID alias to delete");
return;
}
LogInfoEx(LOG_REST, "request to delete RID alias, rid = %u", rid);
m_ridAliasLookup->eraseEntry(rid);
}
/* REST API endpoint; implements put radio alias commit request. */
void RESTAPI::restAPI_GetRACommit(const HTTPPayload& request, HTTPPayload& reply, const RequestMatch& match)
{
if (!validateAuth(request, reply)) {
return;
}
json::object response = json::object();
setResponseDefaultStatus(response);
LogInfoEx(LOG_REST, "request to commit and save RID aliases");
m_ridAliasLookup->commit();
reply.payload(response);
}
/*
** Talkgroup Operations
*/

42
src/fne/restapi/RESTAPI.h
Unescape View File

@ -22,6 +22,7 @@
#include "common/restapi/http/SecureHTTPServer.h"
#include "common/lookups/AdjSiteMapLookup.h"
#include "common/lookups/RadioIdLookup.h"
#include "common/lookups/RadioAliasLookup.h"
#include "common/lookups/TalkgroupRulesLookup.h"
#include "common/lookups/PeerListLookup.h"
#include "common/Thread.h"
@ -70,14 +71,15 @@ namespace fne_restapi
~RESTAPI() override;
/**
* @brief Sets the instances of the Radio ID, Talkgroup ID and Peer List lookup tables.
* @brief Sets the instances of the Radio ID, Radio Alias, Talkgroup ID and Peer List lookup tables.
* @param ridLookup Radio ID Lookup Table Instance
* @param ridAliasLookup Radio Alias Lookup Table Instance
* @param tidLookup Talkgroup Rules Lookup Table Instance
* @param peerListLookup Peer List Lookup Table Instance
* @param adjPeerMapLookup Adjacent Site Map Lookup Table Instance
* @param cryptoLookup Crypto Container Instance
*/
void setLookups(::lookups::RadioIdLookup* ridLookup, ::lookups::TalkgroupRulesLookup* tidLookup,
void setLookups(::lookups::RadioIdLookup* ridLookup, ::lookups::RadioAliasLookup* ridAliasLookup, ::lookups::TalkgroupRulesLookup* tidLookup,
::lookups::PeerListLookup* peerListLookup, ::lookups::AdjSiteMapLookup* adjPeerMapLookup,
CryptoContainer* cryptoLookup);
/**
@ -117,7 +119,8 @@ namespace fne_restapi
network::TrafficNetwork* m_network;
::lookups::RadioIdLookup* m_ridLookup;
::lookups::TalkgroupRulesLookup* m_tidLookup;
::lookups::RadioAliasLookup *m_ridAliasLookup;
::lookups::TalkgroupRulesLookup *m_tidLookup;
::lookups::PeerListLookup* m_peerListLookup;
::lookups::AdjSiteMapLookup* m_adjSiteMapLookup;
CryptoContainer* m_cryptoLookup;
@ -281,6 +284,39 @@ namespace fne_restapi
*/
void restAPI_GetRIDCommit(const HTTPPayload& request, HTTPPayload& reply, const restapi::RequestMatch& match);
/*
** Radio Alias Operations
*/
/**
* @brief REST API endpoint; implements get radio alias query request.
* @param request HTTP request.
* @param reply HTTP reply.
* @param match HTTP request matcher.
*/
void restAPI_GetRAQuery(const HTTPPayload& request, HTTPPayload& reply, const restapi::RequestMatch& match);
/**
* @brief REST API endpoint; implements put radio alias add request.
* @param request HTTP request.
* @param reply HTTP reply.
* @param match HTTP request matcher.
*/
void restAPI_PutRAAdd(const HTTPPayload& request, HTTPPayload& reply, const restapi::RequestMatch& match);
/**
* @brief REST API endpoint; implements put radio alias delete request.
* @param request HTTP request.
* @param reply HTTP reply.
* @param match HTTP request matcher.
*/
void restAPI_PutRADelete(const HTTPPayload& request, HTTPPayload& reply, const restapi::RequestMatch& match);
/**
* @brief REST API endpoint; implements put radio alias commit request.
* @param request HTTP request.
* @param reply HTTP reply.
* @param match HTTP request matcher.
*/
void restAPI_GetRACommit(const HTTPPayload& request, HTTPPayload& reply, const restapi::RequestMatch& match);
/*
** Talkgroup ID Operations
*/

4
src/fne/restapi/RESTDefines.h
Unescape View File

@ -34,6 +34,10 @@
#define FNE_PUT_RID_ADD "/rid/add"
#define FNE_PUT_RID_DELETE "/rid/delete"
#define FNE_GET_RID_COMMIT "/rid/commit"
#define FNE_GET_RID_ALIAS_QUERY "/rid/alias/query"
#define FNE_PUT_RID_ALIAS_ADD "/rid/alias/add"
#define FNE_PUT_RID_ALIAS_DELETE "/rid/alias/delete"
#define FNE_GET_RID_ALIAS_COMMIT "/rid/alias/commit"
#define FNE_GET_TGID_QUERY "/tg/query"
#define FNE_PUT_TGID_ADD "/tg/add"

108
tests/fne/FNE_RESTAPI_Tests.cpp
Unescape View File

@ -9,6 +9,7 @@
#include <catch2/catch_test_macros.hpp>
#include "common/lookups/RadioAliasLookup.h"
#include "common/lookups/RadioIdLookup.h"
#include "common/lookups/AdjSiteMapLookup.h"
#include "common/lookups/PeerListLookup.h"
@ -63,6 +64,18 @@ namespace {
return "/tmp/dvm-fne-rest-rid-" + std::to_string(stamp) + ".csv";
}
/**
* @brief Reads the contents of a lookup file, returning an empty string if it does not exist.
* @param path The lookup file path.
* @returns std::string
*/
std::string readFileContents(const std::string& path)
{
std::ifstream file(path);
return std::string((std::istreambuf_iterator<char>(file)),
std::istreambuf_iterator<char>());
}
/**
* @brief Sends a REST API request to the specified endpoint with the given payload.
* @param port The port on which the REST API server is running.
@ -148,17 +161,19 @@ namespace {
* @brief Initializes a new instance of the ScopedRESTAPI class.
* @param port The port on which the REST API server will listen.
* @param ridLookup The Radio ID lookup instance.
* @param ridAliasLookup The Radio Alias lookup instance.
* @param tgLookup The Talkgroup Rules lookup instance.
* @param peerLookup The Peer List lookup instance.
* @param adjLookup The Adjacent Site Map lookup instance.
*/
ScopedRESTAPI(uint16_t port, lookups::RadioIdLookup* ridLookup = nullptr,
lookups::RadioAliasLookup* ridAliasLookup = nullptr,
lookups::TalkgroupRulesLookup* tgLookup = nullptr,
lookups::PeerListLookup* peerLookup = nullptr,
lookups::AdjSiteMapLookup* adjLookup = nullptr) :
api("127.0.0.1", port, TEST_PASSWORD, "", "", false, nullptr, false)
{
api.setLookups(ridLookup, tgLookup, peerLookup, adjLookup, nullptr);
api.setLookups(ridLookup, ridAliasLookup, tgLookup, peerLookup, adjLookup, nullptr);
REQUIRE(api.open());
}
/**
@ -175,6 +190,7 @@ TEST_CASE("FNE REST RID add and commit updates the persisted ACL", "[fne][restap
{
ScopedACLFile aclFile;
lookups::RadioIdLookup lookup(aclFile.path, 0U, true);
const std::string initialContents = readFileContents(aclFile.path);
const uint16_t port = reserveLoopbackPort();
ScopedRESTAPI server(port, &lookup);
@ -190,6 +206,7 @@ TEST_CASE("FNE REST RID add and commit updates the persisted ACL", "[fne][restap
add["allowedKIds"].set<json::array>(allowedKIds);
sendRequest(port, HTTP_PUT, FNE_PUT_RID_ADD, add);
CHECK(readFileContents(aclFile.path) == initialContents);
const lookups::RadioId added = lookup.find(TEST_RID);
REQUIRE_FALSE(added.radioDefault());
@ -200,6 +217,9 @@ TEST_CASE("FNE REST RID add and commit updates the persisted ACL", "[fne][restap
CHECK(added.allowedKIds() == std::vector<uint16_t> { 0x1234U, 0xABCDU });
sendRequest(port, HTTP_GET, FNE_GET_RID_COMMIT);
const std::string committedContents = readFileContents(aclFile.path);
CHECK(committedContents != initialContents);
CHECK(committedContents.find(std::to_string(TEST_RID)) != std::string::npos);
lookups::RadioIdLookup persisted(aclFile.path, 0U, true);
REQUIRE(persisted.read());
@ -215,6 +235,7 @@ TEST_CASE("FNE REST RID delete and commit removes the RID from the ACL", "[fne][
lookups::RadioIdLookup lookup(aclFile.path, 0U, true);
lookup.addEntry(TEST_RID, true, "radio to delete");
lookup.commit(true);
const std::string committedContents = readFileContents(aclFile.path);
const uint16_t port = reserveLoopbackPort();
ScopedRESTAPI server(port, &lookup);
@ -223,13 +244,55 @@ TEST_CASE("FNE REST RID delete and commit removes the RID from the ACL", "[fne][
remove["rid"] = json::value((double)TEST_RID);
sendRequest(port, HTTP_PUT, FNE_PUT_RID_DELETE, remove);
CHECK(lookup.find(TEST_RID).radioDefault());
CHECK(readFileContents(aclFile.path) == committedContents);
sendRequest(port, HTTP_GET, FNE_GET_RID_COMMIT);
const std::string contents = readFileContents(aclFile.path);
CHECK(contents != committedContents);
CHECK(contents.find(std::to_string(TEST_RID)) == std::string::npos);
}
TEST_CASE("FNE REST RID alias endpoints query, persist, and delete aliases", "[fne][restapi][rid][alias]")
{
ScopedACLFile aliasFile;
lookups::RadioAliasLookup lookup(aliasFile.path, 0U, true);
const std::string initialContents = readFileContents(aliasFile.path);
const uint16_t port = reserveLoopbackPort();
ScopedRESTAPI server(port, nullptr, &lookup);
json::object add = json::object();
add["rid"] = json::value((double)TEST_RID);
add["alias"].set<std::string>("REST test alias");
sendRequest(port, HTTP_PUT, FNE_PUT_RID_ALIAS_ADD, add);
std::ifstream savedACL(aclFile.path);
REQUIRE(savedACL.good());
const std::string contents((std::istreambuf_iterator<char>(savedACL)),
std::istreambuf_iterator<char>());
CHECK(lookup.find(TEST_RID) == "REST test alias");
CHECK(readFileContents(aliasFile.path) == initialContents);
json::object query = sendRequest(port, HTTP_GET, FNE_GET_RID_ALIAS_QUERY);
const json::array aliases = query["rids"].get<json::array>();
REQUIRE(aliases.size() == 1U);
json::object queriedAlias = aliases[0U].get<json::object>();
CHECK(queriedAlias["id"].get<uint32_t>() == TEST_RID);
CHECK(queriedAlias["alias"].get<std::string>() == "REST test alias");
sendRequest(port, HTTP_GET, FNE_GET_RID_ALIAS_COMMIT);
const std::string committedContents = readFileContents(aliasFile.path);
CHECK(committedContents != initialContents);
CHECK(committedContents.find(std::to_string(TEST_RID)) != std::string::npos);
lookups::RadioAliasLookup persisted(aliasFile.path, 0U, true);
REQUIRE(persisted.read());
CHECK(persisted.find(TEST_RID) == "REST test alias");
json::object remove = json::object();
remove["rid"] = json::value((double)TEST_RID);
sendRequest(port, HTTP_PUT, FNE_PUT_RID_ALIAS_DELETE, remove);
CHECK(lookup.find(TEST_RID) == "UNKNOWN");
CHECK(readFileContents(aliasFile.path) == committedContents);
sendRequest(port, HTTP_GET, FNE_GET_RID_ALIAS_COMMIT);
const std::string contents = readFileContents(aliasFile.path);
CHECK(contents != committedContents);
CHECK(contents.find(std::to_string(TEST_RID)) == std::string::npos);
}
@ -237,8 +300,9 @@ TEST_CASE("FNE REST peer endpoints query, persist, and delete ACL entries", "[fn
{
ScopedACLFile aclFile;
lookups::PeerListLookup lookup(aclFile.path, 0U, true, false);
const std::string initialContents = readFileContents(aclFile.path);
const uint16_t port = reserveLoopbackPort();
ScopedRESTAPI server(port, nullptr, nullptr, &lookup);
ScopedRESTAPI server(port, nullptr, nullptr, nullptr, &lookup);
json::object add = json::object();
add["peerId"] = json::value((double)9001U);
@ -249,6 +313,7 @@ TEST_CASE("FNE REST peer endpoints query, persist, and delete ACL entries", "[fn
add["canIssueInhibit"] = json::value(true);
add["hasCallPriority"] = json::value(true);
sendRequest(port, HTTP_PUT, FNE_PUT_PEER_ADD, add);
CHECK(readFileContents(aclFile.path) == initialContents);
const lookups::PeerId peer = lookup.find(9001U);
CHECK(peer.peerAlias() == "REST peer");
@ -263,6 +328,9 @@ TEST_CASE("FNE REST peer endpoints query, persist, and delete ACL entries", "[fn
CHECK(query["peers"].get<json::array>()[0U].get<json::object>()["peerPassword"].get<bool>());
sendRequest(port, HTTP_GET, FNE_GET_PEER_COMMIT);
const std::string committedContents = readFileContents(aclFile.path);
CHECK(committedContents != initialContents);
CHECK(committedContents.find("9001") != std::string::npos);
lookups::PeerListLookup persisted(aclFile.path, 0U, true, false);
REQUIRE(persisted.read());
CHECK(persisted.find(9001U).peerAlias() == "REST peer");
@ -270,7 +338,11 @@ TEST_CASE("FNE REST peer endpoints query, persist, and delete ACL entries", "[fn
json::object remove = json::object();
remove["peerId"] = json::value((double)9001U);
sendRequest(port, HTTP_PUT, FNE_PUT_PEER_DELETE, remove);
CHECK(readFileContents(aclFile.path) == committedContents);
sendRequest(port, HTTP_GET, FNE_GET_PEER_COMMIT);
const std::string deletedContents = readFileContents(aclFile.path);
CHECK(deletedContents != committedContents);
CHECK(deletedContents.find("9001") == std::string::npos);
CHECK(lookup.find(9001U).peerDefault());
}
@ -278,10 +350,12 @@ TEST_CASE("FNE REST talkgroup endpoints query, persist, and delete rules", "[fne
{
ScopedACLFile rulesFile;
lookups::TalkgroupRulesLookup lookup(rulesFile.path, 0U, true, false);
const std::string initialContents = readFileContents(rulesFile.path);
const uint16_t port = reserveLoopbackPort();
ScopedRESTAPI server(port, nullptr, &lookup);
ScopedRESTAPI server(port, nullptr, nullptr, &lookup);
sendRequest(port, HTTP_PUT, FNE_PUT_TGID_ADD, talkgroupPayload(3100U, 1U, "REST TG"));
CHECK(readFileContents(rulesFile.path) == initialContents);
const lookups::TalkgroupRuleGroupVoice added = lookup.find(3100U, 1U);
REQUIRE_FALSE(added.isInvalid());
CHECK(added.name() == "REST TG");
@ -290,6 +364,9 @@ TEST_CASE("FNE REST talkgroup endpoints query, persist, and delete rules", "[fne
json::object query = sendRequest(port, HTTP_GET, FNE_GET_TGID_QUERY);
REQUIRE(query["tgs"].get<json::array>().size() == 1U);
sendRequest(port, HTTP_GET, FNE_GET_TGID_COMMIT);
const std::string committedContents = readFileContents(rulesFile.path);
CHECK(committedContents != initialContents);
CHECK(committedContents.find("3100") != std::string::npos);
lookups::TalkgroupRulesLookup persisted(rulesFile.path, 0U, true, false);
REQUIRE(persisted.read());
@ -299,7 +376,11 @@ TEST_CASE("FNE REST talkgroup endpoints query, persist, and delete rules", "[fne
remove["tgid"] = json::value((double)3100U);
remove["slot"] = json::value((double)1U);
sendRequest(port, HTTP_PUT, FNE_PUT_TGID_DELETE, remove);
CHECK(readFileContents(rulesFile.path) == committedContents);
sendRequest(port, HTTP_GET, FNE_GET_TGID_COMMIT);
const std::string deletedContents = readFileContents(rulesFile.path);
CHECK(deletedContents != committedContents);
CHECK(deletedContents.find("3100") == std::string::npos);
CHECK(lookup.find(3100U, 1U).isInvalid());
}
@ -307,8 +388,9 @@ TEST_CASE("FNE REST adjacent-map endpoints query, persist, and delete entries",
{
ScopedACLFile mapFile;
lookups::AdjSiteMapLookup lookup(mapFile.path, 0U);
const std::string initialContents = readFileContents(mapFile.path);
const uint16_t port = reserveLoopbackPort();
ScopedRESTAPI server(port, nullptr, nullptr, nullptr, &lookup);
ScopedRESTAPI server(port, nullptr, nullptr, nullptr, nullptr, &lookup);
json::object add = json::object();
add["peerId"] = json::value((double)100U);
@ -317,11 +399,15 @@ TEST_CASE("FNE REST adjacent-map endpoints query, persist, and delete entries",
neighbors.push_back(json::value((double)102U));
add["neighbors"].set<json::array>(neighbors);
sendRequest(port, HTTP_PUT, FNE_PUT_ADJ_MAP_ADD, add);
CHECK(readFileContents(mapFile.path) == initialContents);
CHECK(lookup.find(100U).neighbors() == std::vector<uint32_t> { 101U, 102U });
json::object query = sendRequest(port, HTTP_GET, FNE_GET_ADJ_MAP_LIST);
REQUIRE(query["peers"].get<json::array>().size() == 1U);
sendRequest(port, HTTP_GET, FNE_GET_ADJ_MAP_COMMIT);
const std::string committedContents = readFileContents(mapFile.path);
CHECK(committedContents != initialContents);
CHECK(committedContents.find("100") != std::string::npos);
lookups::AdjSiteMapLookup persisted(mapFile.path, 0U);
REQUIRE(persisted.read());
@ -330,7 +416,11 @@ TEST_CASE("FNE REST adjacent-map endpoints query, persist, and delete entries",
json::object remove = json::object();
remove["peerId"] = json::value((double)100U);
sendRequest(port, HTTP_PUT, FNE_PUT_ADJ_MAP_DELETE, remove);
CHECK(readFileContents(mapFile.path) == committedContents);
sendRequest(port, HTTP_GET, FNE_GET_ADJ_MAP_COMMIT);
const std::string deletedContents = readFileContents(mapFile.path);
CHECK(deletedContents != committedContents);
CHECK(deletedContents.find("100") == std::string::npos);
CHECK(lookup.find(100U).neighbors().empty());
}
@ -350,7 +440,7 @@ TEST_CASE("FNE REST reload endpoints refresh their configured lookup tables", "[
peers.commit(true);
const uint16_t port = reserveLoopbackPort();
ScopedRESTAPI server(port, &rids, &tgs, &peers);
ScopedRESTAPI server(port, &rids, nullptr, &tgs, &peers);
sendRequest(port, HTTP_PUT, FNE_PUT_TGID_ADD, talkgroupPayload(3001U, 1U, "persisted TG"));
sendRequest(port, HTTP_GET, FNE_GET_TGID_COMMIT);

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.