From e12edb2a537cf692f976d65e7af5cbd648cbf496 Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Thu, 30 Sep 2021 08:51:32 -0700 Subject: [PATCH] Adding fetching of the schema from git --- src/ConfigurationValidator.cpp | 3 --- test_scripts/curl/config_uuid_only.json | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/ConfigurationValidator.cpp b/src/ConfigurationValidator.cpp index a820e74..358484c 100644 --- a/src/ConfigurationValidator.cpp +++ b/src/ConfigurationValidator.cpp @@ -2166,7 +2166,6 @@ namespace OpenWifi { auto schema = json::parse(GitSchema); Validator_->set_root_schema(schema); Daemon()->instance()->Log().information("Using uCentral validation schema from GIT."); - std::cout << "GIT Schema" << std::endl; } else { std::string FileName{ Daemon()->DataDir() + "/ucentral.schema.json" }; try { @@ -2177,11 +2176,9 @@ namespace OpenWifi { auto schema = json::parse(schema_file.str()); Validator_->set_root_schema(schema); Daemon()->instance()->Log().information("Using uCentral validation schema from local file."); - std::cout << "FILE Schema" << std::endl; } catch (const Poco::Exception &E) { Validator_->set_root_schema(DefaultUCentralSchema); Daemon()->instance()->Log().information("Using uCentral validation from built-in default."); - std::cout << "DEFAULT Schema" << std::endl; } } Initialized_ = Working_ = true; diff --git a/test_scripts/curl/config_uuid_only.json b/test_scripts/curl/config_uuid_only.json index 65eda30..7dda00d 100644 --- a/test_scripts/curl/config_uuid_only.json +++ b/test_scripts/curl/config_uuid_only.json @@ -1,4 +1,4 @@ { "configuration" : - { "uuid": 1 } + { "uuid": "1" } }