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 fetching of the schema from git

Browse Source
This commit is contained in:
stephb9959
2021-09-30 08:51:32 -07:00
parent ac13bd09f5
commit e12edb2a53
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ConfigurationValidator.cpp
View File

@@ -2166,7 +2166,6 @@ namespace OpenWifi {
auto schema = json::parse(GitSchema); auto schema = json::parse(GitSchema);
Validator_->set_root_schema(schema); Validator_->set_root_schema(schema);
Daemon()->instance()->Log().information("Using uCentral validation schema from GIT."); Daemon()->instance()->Log().information("Using uCentral validation schema from GIT.");
std::cout << "GIT Schema" << std::endl;
} else { } else {
std::string FileName{ Daemon()->DataDir() + "/ucentral.schema.json" }; std::string FileName{ Daemon()->DataDir() + "/ucentral.schema.json" };
try { try {
@@ -2177,11 +2176,9 @@ namespace OpenWifi {
auto schema = json::parse(schema_file.str()); auto schema = json::parse(schema_file.str());
Validator_->set_root_schema(schema); Validator_->set_root_schema(schema);
Daemon()->instance()->Log().information("Using uCentral validation schema from local file."); Daemon()->instance()->Log().information("Using uCentral validation schema from local file.");
std::cout << "FILE Schema" << std::endl;
} catch (const Poco::Exception &E) { } catch (const Poco::Exception &E) {
Validator_->set_root_schema(DefaultUCentralSchema); Validator_->set_root_schema(DefaultUCentralSchema);
Daemon()->instance()->Log().information("Using uCentral validation from built-in default."); Daemon()->instance()->Log().information("Using uCentral validation from built-in default.");
std::cout << "DEFAULT Schema" << std::endl;
} }
} }
Initialized_ = Working_ = true; Initialized_ = Working_ = true;

2
test_scripts/curl/config_uuid_only.json
View File

@@ -1,4 +1,4 @@
{ {
"configuration" : "configuration" :
{ "uuid": 1 } { "uuid": "1" }
} }