// Acceptor.
boost::asio::local::stream_protocol::acceptor
acceptor(io_service_.get_io_service());
- EXPECT_NO_THROW(acceptor.open());
+ EXPECT_NO_THROW_LOG(acceptor.open());
boost::asio::local::stream_protocol::endpoint
endpoint(unixSocketFilePath());
- EXPECT_NO_THROW(acceptor.bind(endpoint));
- EXPECT_NO_THROW(acceptor.listen());
+ EXPECT_NO_THROW_LOG(acceptor.bind(endpoint));
+ EXPECT_NO_THROW_LOG(acceptor.listen());
boost::asio::local::stream_protocol::socket
socket(io_service_.get_io_service());
// Close socket.
if (socket.is_open()) {
- EXPECT_NO_THROW(socket.close());
+ EXPECT_NO_THROW_LOG(socket.close());
}
EXPECT_FALSE(timeout);
// Try configGet.
ConstElementPtr reflected;
- EXPECT_NO_THROW(reflected = ucs->configGet("foo"));
+ EXPECT_NO_THROW_LOG(reflected = ucs->configGet("foo"));
ASSERT_TRUE(reflected);
ASSERT_EQ(Element::map, reflected->getType());
ConstElementPtr command = reflected->get("received");
ConstElementPtr json = Element::fromJSON("{ \"bar\": 1 }");
ConstElementPtr reflected;
- EXPECT_NO_THROW(reflected = ucs->configTest(json, "foo"));
+ EXPECT_NO_THROW_LOG(reflected = ucs->configTest(json, "foo"));
ASSERT_TRUE(reflected);
ASSERT_EQ(Element::map, reflected->getType());
ConstElementPtr command = reflected->get("received");
ConstElementPtr json = Element::fromJSON("{ \"bar\": 1 }");
ConstElementPtr reflected;
- EXPECT_NO_THROW(reflected = ucs->configSet(json, "foo"));
+ EXPECT_NO_THROW_LOG(reflected = ucs->configSet(json, "foo"));
ASSERT_TRUE(reflected);
ASSERT_EQ(Element::map, reflected->getType());
ConstElementPtr command = reflected->get("received");
// Try configGet.
ConstElementPtr reflected;
- EXPECT_NO_THROW(reflected = hcs->configGet("foo"));
+ EXPECT_NO_THROW_LOG(reflected = hcs->configGet("foo"));
stop();
// Check result.
// Try configGet.
ConstElementPtr reflected;
- EXPECT_NO_THROW(reflected = hcs->configGet("ca"));
+ EXPECT_NO_THROW_LOG(reflected = hcs->configGet("ca"));
stop();
// Check result.
// Try configTest.
ConstElementPtr reflected;
- EXPECT_NO_THROW(reflected = hcs->configTest(json, "foo"));
+ EXPECT_NO_THROW_LOG(reflected = hcs->configTest(json, "foo"));
stop();
// Check result.
// Try configTest.
ConstElementPtr reflected;
- EXPECT_NO_THROW(reflected = hcs->configTest(json, "ca"));
+ EXPECT_NO_THROW_LOG(reflected = hcs->configTest(json, "ca"));
stop();
// Check result.
// Try configSet.
ConstElementPtr reflected;
- EXPECT_NO_THROW(reflected = hcs->configSet(json, "foo"));
+ EXPECT_NO_THROW_LOG(reflected = hcs->configSet(json, "foo"));
stop();
// Check result.
// Try configSet.
ConstElementPtr reflected;
- EXPECT_NO_THROW(reflected = hcs->configSet(json, "ca"));
+ EXPECT_NO_THROW_LOG(reflected = hcs->configSet(json, "ca"));
stop();
// Check result.
EXPECT_TRUE(context);
// Verify that the manager can be destructed without error.
- EXPECT_NO_THROW(cfg_mgr.reset());
+ EXPECT_NO_THROW_LOG(cfg_mgr.reset());
}
// Tests if getContext can be retrieved.
CfgServerPtr server4(new CfgServer("model4", socket4));
// Ok, now set the server for D2
- EXPECT_NO_THROW(ctx.getCfgServersMap()->insert(make_pair("d2", server1)));
+ EXPECT_NO_THROW_LOG(ctx.getCfgServersMap()->insert(make_pair("d2", server1)));
// Now check the values returned
EXPECT_EQ(1, ctx.getCfgServersMap()->size());
EXPECT_THROW(ctx.getCfgServersMap()->at("dhcp4"), std::out_of_range);
// Now set the v6 server and sanity check again
- EXPECT_NO_THROW(ctx.getCfgServersMap()->insert(make_pair("dhcp6", server2)));
+ EXPECT_NO_THROW_LOG(ctx.getCfgServersMap()->insert(make_pair("dhcp6", server2)));
// Should be possible to retrieve two servers
EXPECT_EQ(2, ctx.getCfgServersMap()->size());
EXPECT_EQ(server2, ctx.getCfgServersMap()->at("dhcp6"));
// Finally, set all servers.
- EXPECT_NO_THROW(ctx.getCfgServersMap()->insert(make_pair("dhcp4", server3)));
- EXPECT_NO_THROW(ctx.getCfgServersMap()->insert(make_pair("ca", server4)));
+ EXPECT_NO_THROW_LOG(ctx.getCfgServersMap()->insert(make_pair("dhcp4", server3)));
+ EXPECT_NO_THROW_LOG(ctx.getCfgServersMap()->insert(make_pair("ca", server4)));
EXPECT_EQ(4, ctx.getCfgServersMap()->size());
ASSERT_NO_THROW_LOG(ctx.getCfgServersMap()->at("dhcp4"));
ASSERT_NO_THROW_LOG(ctx.getCfgServersMap()->at("ca"));
TEST(NetconfParser, badSocketType) {
ConstElementPtr json;
ParserContext parser;
- EXPECT_NO_THROW(json = parser.parseString(NETCONF_CONFIGS[10],
+ EXPECT_NO_THROW_LOG(json = parser.parseString(NETCONF_CONFIGS[10],
ParserContext::PARSER_JSON));
ConstElementPtr answer;
NakedNetconfCfgMgr cfg_mgr;
- EXPECT_NO_THROW(answer = cfg_mgr.parse(json, false));
+ EXPECT_NO_THROW_LOG(answer = cfg_mgr.parse(json, false));
int rcode = 0;
string expected =
"\"Unknown control socket type: tcp 'tcp' (<string>:5:32)\"";
isc::netconf::ParserContext parser;
ConstElementPtr json = parser.parseString(config, ParserContext::PARSER_SUB_NETCONF);
- EXPECT_NO_THROW(answer_ = cfg_mgr_.parse(json, false));
+ EXPECT_NO_THROW_LOG(answer_ = cfg_mgr_.parse(json, false));
EXPECT_TRUE(checkAnswer(expected_answer));
}
EXPECT_TRUE(checkVerbose(false));
// Verify that standard options can be parsed without error.
- EXPECT_NO_THROW(parseArgs(argc, argv));
+ EXPECT_NO_THROW_LOG(parseArgs(argc, argv));
// Verify that verbose flag is true.
EXPECT_TRUE(checkVerbose(true));
// Record start time, and invoke run().
ptime start = microsec_clock::universal_time();
- EXPECT_NO_THROW(run());
+ EXPECT_NO_THROW_LOG(run());
// Record stop time.
ptime stop = microsec_clock::universal_time();
void clearYang(NakedNetconfAgentPtr agent) {
if (agent && (agent->startup_sess_)) {
string xpath = "/kea-dhcp4-server:config";
- EXPECT_NO_THROW(agent->startup_sess_->deleteItem(xpath));
- EXPECT_NO_THROW(agent->startup_sess_->applyChanges());
+ EXPECT_NO_THROW_LOG(agent->startup_sess_->deleteItem(xpath));
+ EXPECT_NO_THROW_LOG(agent->startup_sess_->applyChanges());
}
}
// Acceptor.
boost::asio::local::stream_protocol::acceptor
acceptor(io_service_->get_io_service());
- EXPECT_NO_THROW(acceptor.open());
+ EXPECT_NO_THROW_LOG(acceptor.open());
boost::asio::local::stream_protocol::endpoint
endpoint(unixSocketFilePath());
boost::asio::socket_base::reuse_address option(true);
acceptor.set_option(option);
- EXPECT_NO_THROW(acceptor.bind(endpoint));
- EXPECT_NO_THROW(acceptor.listen());
+ EXPECT_NO_THROW_LOG(acceptor.bind(endpoint));
+ EXPECT_NO_THROW_LOG(acceptor.listen());
boost::asio::local::stream_protocol::socket
socket(io_service_->get_io_service());
rbuf.resize(received);
requests_.push_back(rbuf);
ConstElementPtr json;
- EXPECT_NO_THROW(json = Element::fromJSON(rbuf));
+ EXPECT_NO_THROW_LOG(json = Element::fromJSON(rbuf));
EXPECT_TRUE(json);
string command;
ConstElementPtr config;
if (json) {
ConstElementPtr arg;
- EXPECT_NO_THROW(command = parseCommand(arg, json));
+ EXPECT_NO_THROW_LOG(command = parseCommand(arg, json));
if (command == "config-get") {
config = Element::fromJSON("{ \"comment\": \"empty\" }");
}
// Close socket and acceptor.
if (socket.is_open()) {
- EXPECT_NO_THROW(socket.close());
+ EXPECT_NO_THROW_LOG(socket.close());
}
- EXPECT_NO_THROW(acceptor.close());
+ EXPECT_NO_THROW_LOG(acceptor.close());
// Removed the socket file so it can be called again immediately.
removeUnixSocketFile();
// Verifies that the initSysrepo method opens sysrepo connection and sessions.
TEST_F(NetconfAgentTest, initSysrepo) {
- EXPECT_NO_THROW(agent_->initSysrepo());
+ EXPECT_NO_THROW_LOG(agent_->initSysrepo());
EXPECT_TRUE(agent_->startup_sess_);
EXPECT_TRUE(agent_->running_sess_);
EXPECT_EQ(0, agent_->subscriptions_.size());
ASSERT_EQ(1, YANG_REVISIONS.count("kea-dhcp6-server"));
// kea-dhcp[46]-server should be available.
- EXPECT_NO_THROW(agent_->initSysrepo());
+ EXPECT_NO_THROW_LOG(agent_->initSysrepo());
EXPECT_EQ(1, agent_->modules_.count("kea-dhcp4-server"));
EXPECT_EQ(1, agent_->modules_.count("kea-dhcp6-server"));
EXPECT_TRUE(agent_->checkModule("kea-dhcp4-server"));
ASSERT_EQ(1, YANG_REVISIONS.count("kea-dhcp6-server"));
// kea-dhcp[46]-server should be available.
- EXPECT_NO_THROW(agent_->initSysrepo());
+ EXPECT_NO_THROW_LOG(agent_->initSysrepo());
EXPECT_EQ(1, agent_->modules_.count("kea-dhcp4-server"));
EXPECT_EQ(1, agent_->modules_.count("kea-dhcp6-server"));
};
SubscribeOptions const options(SubscribeOptions::Default | SubscribeOptions::DoneOnly);
optional<Subscription> subscription;
- EXPECT_NO_THROW(subscription = agent_->running_sess_->onModuleChange(KEA_DHCP4_SERVER, cb,
+ EXPECT_NO_THROW_LOG(subscription = agent_->running_sess_->onModuleChange(KEA_DHCP4_SERVER, cb,
std::nullopt, 0, options));
thread_.reset(new thread([this]() { io_service_->run(); }));
{ "/kea-dhcp4-server:config/subnet4[id='2']/subnet",
"10.0.2.0/24", LeafBaseType::String, true }
});
- EXPECT_NO_THROW(repr.set(tree1, *agent_->running_sess_));
+ EXPECT_NO_THROW_LOG(repr.set(tree1, *agent_->running_sess_));
// Check that the debug output was correct.
addString("NETCONF_CONFIG_CHANGED_DETAIL YANG configuration changed: created: "
};
SubscribeOptions const options(SubscribeOptions::Default | SubscribeOptions::DoneOnly);
optional<Subscription> subscription;
- EXPECT_NO_THROW(subscription = agent_->running_sess_->onModuleChange(KEA_DHCP4_SERVER, cb,
+ EXPECT_NO_THROW_LOG(subscription = agent_->running_sess_->onModuleChange(KEA_DHCP4_SERVER, cb,
std::nullopt, 0, options));
thread_.reset(new thread([this]() { io_service_->run(); }));
// Change configuration (subnet #1 moved to #10).
string xpath = "/kea-dhcp4-server:config/subnet4[id='1']";
- EXPECT_NO_THROW(agent_->running_sess_->deleteItem(xpath));
+ EXPECT_NO_THROW_LOG(agent_->running_sess_->deleteItem(xpath));
const YRTree tree1 = YangRepr::buildTreeFromVector({
{ "/kea-dhcp4-server:config/subnet4[id='10']/id",
"10", LeafBaseType::Uint32, false },
{ "/kea-dhcp4-server:config/subnet4[id='2']/subnet",
"10.0.2.0/24", LeafBaseType::String, true }
});
- EXPECT_NO_THROW(repr.set(tree1, *agent_->running_sess_));
+ EXPECT_NO_THROW_LOG(repr.set(tree1, *agent_->running_sess_));
// Check that the debug output was correct.
addString(
NetconfConfigPtr ctx(new NetconfConfig());
ElementPtr json;
ParserContext parser_context;
- EXPECT_NO_THROW(json =
+ EXPECT_NO_THROW_LOG(json =
parser_context.parseString(config, ParserContext::PARSER_NETCONF));
ASSERT_TRUE(json);
ASSERT_EQ(Element::map, json->getType());
NetconfSimpleParser::setAllDefaults(json);
NetconfSimpleParser::deriveParameters(json);
NetconfSimpleParser parser;
- EXPECT_NO_THROW(parser.parse(ctx, json, false));
+ EXPECT_NO_THROW_LOG(parser.parse(ctx, json, false));
// Get service pair.
CfgServersMapPtr servers_map = ctx->getCfgServersMap();
waitReady();
// Try keaConfig.
- EXPECT_NO_THROW(agent_->keaConfig(service_pair));
+ EXPECT_NO_THROW_LOG(agent_->keaConfig(service_pair));
// Wait server to be stopped.
waitStopped();
NetconfConfigPtr ctx(new NetconfConfig());
ElementPtr json;
ParserContext parser_context;
- EXPECT_NO_THROW(json =
+ EXPECT_NO_THROW_LOG(json =
parser_context.parseString(config, ParserContext::PARSER_NETCONF));
ASSERT_TRUE(json);
ASSERT_EQ(Element::map, json->getType());
NetconfSimpleParser::setAllDefaults(json);
NetconfSimpleParser::deriveParameters(json);
NetconfSimpleParser parser;
- EXPECT_NO_THROW(parser.parse(ctx, json, false));
+ EXPECT_NO_THROW_LOG(parser.parse(ctx, json, false));
// Get service pair.
CfgServersMapPtr servers_map = ctx->getCfgServersMap();
waitReady();
// Try yangConfig.
- EXPECT_NO_THROW(agent_->yangConfig(service_pair));
+ EXPECT_NO_THROW_LOG(agent_->yangConfig(service_pair));
// Wait server to be stopped.
waitStopped();
NetconfConfigPtr ctx(new NetconfConfig());
ElementPtr json;
ParserContext parser_context;
- EXPECT_NO_THROW(json =
+ EXPECT_NO_THROW_LOG(json =
parser_context.parseString(config, ParserContext::PARSER_NETCONF));
ASSERT_TRUE(json);
ASSERT_EQ(Element::map, json->getType());
NetconfSimpleParser::setAllDefaults(json);
NetconfSimpleParser::deriveParameters(json);
NetconfSimpleParser parser;
- EXPECT_NO_THROW(parser.parse(ctx, json, false));
+ EXPECT_NO_THROW_LOG(parser.parse(ctx, json, false));
// Get service pair.
CfgServersMapPtr servers_map = ctx->getCfgServersMap();
EXPECT_EQ(0, agent_->subscriptions_.size());
ASSERT_NO_THROW_LOG(agent_->initSysrepo());
EXPECT_EQ(0, agent_->subscriptions_.size());
- EXPECT_NO_THROW(agent_->subscribeConfig(service_pair));
+ EXPECT_NO_THROW_LOG(agent_->subscribeConfig(service_pair));
EXPECT_EQ(1, agent_->subscriptions_.size());
/// Unsubscribe.
- EXPECT_NO_THROW(agent_->subscriptions_.clear());
+ EXPECT_NO_THROW_LOG(agent_->subscriptions_.clear());
}
// Verifies that the update method works as expected: apply new YANG configuration
NetconfConfigPtr ctx(new NetconfConfig());
ElementPtr json;
ParserContext parser_context;
- EXPECT_NO_THROW(json =
+ EXPECT_NO_THROW_LOG(json =
parser_context.parseString(config, ParserContext::PARSER_NETCONF));
ASSERT_TRUE(json);
ASSERT_EQ(Element::map, json->getType());
NetconfSimpleParser::setAllDefaults(json);
NetconfSimpleParser::deriveParameters(json);
NetconfSimpleParser parser;
- EXPECT_NO_THROW(parser.parse(ctx, json, false));
+ EXPECT_NO_THROW_LOG(parser.parse(ctx, json, false));
// Get service pair.
CfgServersMapPtr servers_map = ctx->getCfgServersMap();
// Subscribe YANG changes.
EXPECT_EQ(0, agent_->subscriptions_.size());
- EXPECT_NO_THROW(agent_->subscribeConfig(service_pair));
+ EXPECT_NO_THROW_LOG(agent_->subscribeConfig(service_pair));
EXPECT_EQ(1, agent_->subscriptions_.size());
// Launch server.
{ "/kea-dhcp4-server:config/subnet4[id='2']/subnet",
"10.0.2.0/24", LeafBaseType::String, true }
});
- EXPECT_NO_THROW(repr.set(tree1, *agent_->running_sess_));
+ EXPECT_NO_THROW_LOG(repr.set(tree1, *agent_->running_sess_));
// Wait server to be stopped.
waitStopped();
NetconfConfigPtr ctx(new NetconfConfig());
ElementPtr json;
ParserContext parser_context;
- EXPECT_NO_THROW(json =
+ EXPECT_NO_THROW_LOG(json =
parser_context.parseString(config, ParserContext::PARSER_NETCONF));
ASSERT_TRUE(json);
ASSERT_EQ(Element::map, json->getType());
NetconfSimpleParser::setAllDefaults(json);
NetconfSimpleParser::deriveParameters(json);
NetconfSimpleParser parser;
- EXPECT_NO_THROW(parser.parse(ctx, json, false));
+ EXPECT_NO_THROW_LOG(parser.parse(ctx, json, false));
// Get service pair.
CfgServersMapPtr servers_map = ctx->getCfgServersMap();
// Subscribe YANG changes.
EXPECT_EQ(0, agent_->subscriptions_.size());
- EXPECT_NO_THROW(agent_->subscribeConfig(service_pair));
+ EXPECT_NO_THROW_LOG(agent_->subscribeConfig(service_pair));
EXPECT_EQ(1, agent_->subscriptions_.size());
// Launch server twice.
{ "/kea-dhcp4-server:config/subnet4[id='2']/subnet",
"10.0.2.0/24", LeafBaseType::String, true }
});
- EXPECT_NO_THROW(repr.set(tree1, *agent_->running_sess_));
+ EXPECT_NO_THROW_LOG(repr.set(tree1, *agent_->running_sess_));
// Wait servers to be stopped.
waitStopped();
NetconfConfigPtr ctx(new NetconfConfig());
ElementPtr json;
ParserContext parser_context;
- EXPECT_NO_THROW(json =
+ EXPECT_NO_THROW_LOG(json =
parser_context.parseString(config, ParserContext::PARSER_NETCONF));
ASSERT_TRUE(json);
ASSERT_EQ(Element::map, json->getType());
NetconfSimpleParser::setAllDefaults(json);
NetconfSimpleParser::deriveParameters(json);
NetconfSimpleParser parser;
- EXPECT_NO_THROW(parser.parse(ctx, json, false));
+ EXPECT_NO_THROW_LOG(parser.parse(ctx, json, false));
// Get service pair.
CfgServersMapPtr servers_map = ctx->getCfgServersMap();
// Subscribe YANG changes.
EXPECT_EQ(0, agent_->subscriptions_.size());
- EXPECT_NO_THROW(agent_->subscribeConfig(service_pair));
+ EXPECT_NO_THROW_LOG(agent_->subscribeConfig(service_pair));
EXPECT_EQ(1, agent_->subscriptions_.size());
// Change configuration (add invalid user context).
/// @param compare whether to compare the output with legacy JSON parser
void testParser(const std::string& txt, ParserContext::ParserType parser_type,
bool compare = true) {
- SCOPED_TRACE("\n=== tested config ===\n" + txt + "=====================");
+ SCOPED_TRACE("\n* Tested config: \n---\n" + txt + "\n---");
ConstElementPtr test_json;
ASSERT_NO_THROW_LOG({
cout << "Parsing file " << fname << "(" << decommented << ")" << endl;
- EXPECT_NO_THROW(json = Element::fromJSONFile(decommented, true));
+ EXPECT_NO_THROW_LOG(json = Element::fromJSONFile(decommented, true));
reference_json = moveComments(json);
// remove the temporary file
- EXPECT_NO_THROW(::remove(decommented.c_str()));
+ EXPECT_NO_THROW_LOG(::remove(decommented.c_str()));
- EXPECT_NO_THROW(
+ EXPECT_NO_THROW_LOG(
try {
ParserContext ctx;
test_json = ctx.parseFile(fname, ParserContext::PARSER_NETCONF);
void testError(const std::string& txt,
ParserContext::ParserType parser_type,
const std::string& msg) {
- SCOPED_TRACE("\n=== tested config ===\n" + txt + "=====================");
-
+ SCOPED_TRACE("\n* Tested config: \n---\n" + txt + "\n---");
ParserContext ctx;
EXPECT_THROW_MSG(ctx.parseString(txt, parser_type), ParseError, msg);
void loadFile(const string& fname, ElementPtr list) {
ParserContext ctx;
ElementPtr json;
- EXPECT_NO_THROW(json = ctx.parseFile(fname, ParserContext::PARSER_NETCONF));
+ EXPECT_NO_THROW_LOG(json = ctx.parseFile(fname, ParserContext::PARSER_NETCONF));
ASSERT_TRUE(json);
list->add(json);
}
sample_fname += "/simple-dhcp6.json";
ParserContext ctx;
ElementPtr sample_json;
- EXPECT_NO_THROW(sample_json =
+ EXPECT_NO_THROW_LOG(sample_json =
ctx.parseFile(sample_fname, ParserContext::PARSER_NETCONF));
ASSERT_TRUE(sample_json);
string decommented = decommentJSONfile(fname);
- EXPECT_NO_THROW(json = Element::fromJSONFile(decommented, true));
+ EXPECT_NO_THROW_LOG(json = Element::fromJSONFile(decommented, true));
reference_json = moveComments(json);
// remove the temporary file
- EXPECT_NO_THROW(::remove(decommented.c_str()));
+ EXPECT_NO_THROW_LOG(::remove(decommented.c_str()));
string before = json->str();
if (v6) {
ElementPtr json;
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
- EXPECT_NO_THROW(AdaptorHost::quoteIdentifier(json));
+ EXPECT_NO_THROW_LOG(AdaptorHost::quoteIdentifier(json));
EXPECT_TRUE(copied->equals(*json));
}
ElementPtr json;
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
- EXPECT_NO_THROW(AdaptorHost::quoteIdentifier(json));
+ EXPECT_NO_THROW_LOG(AdaptorHost::quoteIdentifier(json));
EXPECT_TRUE(copied->equals(*json));
}
ElementPtr json;
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
- EXPECT_NO_THROW(AdaptorHost::quoteIdentifier(json));
+ EXPECT_NO_THROW_LOG(AdaptorHost::quoteIdentifier(json));
EXPECT_FALSE(copied->equals(*json));
ConstElementPtr id = json->get("flex-id");
ASSERT_TRUE(id);
ElementPtr json;
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
- EXPECT_NO_THROW(AdaptorHost::quoteIdentifier(json));
+ EXPECT_NO_THROW_LOG(AdaptorHost::quoteIdentifier(json));
EXPECT_FALSE(copied->equals(*json));
ConstElementPtr id = json->get("flex-id");
ASSERT_TRUE(id);
ElementPtr json;
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
- EXPECT_NO_THROW(AdaptorHost::quoteIdentifier(json));
+ EXPECT_NO_THROW_LOG(AdaptorHost::quoteIdentifier(json));
EXPECT_FALSE(copied->equals(*json));
ConstElementPtr id = json->get("flex-id");
ASSERT_TRUE(id);
ElementPtr json;
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
- EXPECT_NO_THROW(AdaptorHost::quoteIdentifier(json));
+ EXPECT_NO_THROW_LOG(AdaptorHost::quoteIdentifier(json));
EXPECT_FALSE(copied->equals(*json));
ConstElementPtr id = json->get("flex-id");
ASSERT_TRUE(id);
ElementPtr json;
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
- EXPECT_NO_THROW(AdaptorOption::setSpace(json, "foo"));
+ EXPECT_NO_THROW_LOG(AdaptorOption::setSpace(json, "foo"));
EXPECT_FALSE(copied->equals(*json));
ConstElementPtr space = json->get("space");
ASSERT_TRUE(space);
ElementPtr json;
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
- EXPECT_NO_THROW(AdaptorOption::setSpace(json, "foo"));
+ EXPECT_NO_THROW_LOG(AdaptorOption::setSpace(json, "foo"));
EXPECT_TRUE(copied->equals(*json));
}
"}";
ConstElementPtr json;
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
- EXPECT_NO_THROW(AdaptorOption::checkType(json));
+ EXPECT_NO_THROW_LOG(AdaptorOption::checkType(json));
}
// Verifies that checkType does not accept an option without type.
"}";
ConstElementPtr json;
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
- EXPECT_NO_THROW(AdaptorOption::checkCode(json));
+ EXPECT_NO_THROW_LOG(AdaptorOption::checkCode(json));
}
// Verifies that checkCode does not accept an option without code.
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
OptionCodes codes = { { "bar@foo", 123 } };
- EXPECT_NO_THROW(AdaptorOption::setCode(json, codes));
+ EXPECT_NO_THROW_LOG(AdaptorOption::setCode(json, codes));
EXPECT_FALSE(copied->equals(*json));
ConstElementPtr code = json->get("code");
ASSERT_TRUE(code);
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
OptionCodes codes;
- EXPECT_NO_THROW(AdaptorOption::setCode(json, codes));
+ EXPECT_NO_THROW_LOG(AdaptorOption::setCode(json, codes));
EXPECT_TRUE(copied->equals(*json));
}
ElementPtr json;
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
- EXPECT_NO_THROW(AdaptorPool::canonizePool(json));
+ EXPECT_NO_THROW_LOG(AdaptorPool::canonizePool(json));
EXPECT_TRUE(copied->equals(*json));
}
ElementPtr json;
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
- EXPECT_NO_THROW(AdaptorPool::canonizePool(json));
+ EXPECT_NO_THROW_LOG(AdaptorPool::canonizePool(json));
EXPECT_TRUE(copied->equals(*json));
}
ElementPtr json;
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
- EXPECT_NO_THROW(AdaptorPool::canonizePool(json));
+ EXPECT_NO_THROW_LOG(AdaptorPool::canonizePool(json));
EXPECT_FALSE(copied->equals(*json));
ConstElementPtr pool = json->get("pool");
ASSERT_TRUE(pool);
ElementPtr json;
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
- EXPECT_NO_THROW(AdaptorPool::canonizePool(json));
+ EXPECT_NO_THROW_LOG(AdaptorPool::canonizePool(json));
EXPECT_FALSE(copied->equals(*json));
ConstElementPtr pool = json->get("pool");
ASSERT_TRUE(pool);
ElementPtr json;
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
- EXPECT_NO_THROW(AdaptorPool::canonizePool(json));
+ EXPECT_NO_THROW_LOG(AdaptorPool::canonizePool(json));
EXPECT_FALSE(copied->equals(*json));
ConstElementPtr pool = json->get("pool");
ASSERT_TRUE(pool);
ConstElementPtr pools = json->get("pools");
// This should be no-op for kea-dhcp4-server and kea-dhcp6-server models
- EXPECT_NO_THROW(AdaptorPool::fromSubnet(KEA_DHCP4_SERVER, json, pools));
+ EXPECT_NO_THROW_LOG(AdaptorPool::fromSubnet(KEA_DHCP4_SERVER, json, pools));
EXPECT_TRUE(copied->equals(*json));
// The model is checked first.
- EXPECT_NO_THROW(AdaptorPool::fromSubnet(KEA_DHCP6_SERVER, json, pools));
+ EXPECT_NO_THROW_LOG(AdaptorPool::fromSubnet(KEA_DHCP6_SERVER, json, pools));
EXPECT_TRUE(copied->equals(*json));
// Check that the model name is actually checked.
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
ConstElementPtr pools = json->get("pools");
- EXPECT_NO_THROW(AdaptorPool::fromSubnet(IETF_DHCPV6_SERVER, json, pools));
+ EXPECT_NO_THROW_LOG(AdaptorPool::fromSubnet(IETF_DHCPV6_SERVER, json, pools));
EXPECT_FALSE(copied->equals(*json));
pools = json->get("pools");
ASSERT_TRUE(pools);
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
ConstElementPtr pools = json->get("pools");
- EXPECT_NO_THROW(AdaptorPool::toSubnet(KEA_DHCP4_SERVER, json, pools));
+ EXPECT_NO_THROW_LOG(AdaptorPool::toSubnet(KEA_DHCP4_SERVER, json, pools));
EXPECT_TRUE(copied->equals(*json));
// The model is checked first.
- EXPECT_NO_THROW(AdaptorPool::toSubnet(KEA_DHCP6_SERVER, json, pools));
+ EXPECT_NO_THROW_LOG(AdaptorPool::toSubnet(KEA_DHCP6_SERVER, json, pools));
EXPECT_TRUE(copied->equals(*json));
// Model name is not free: an error is raised if it is not expected.
EXPECT_THROW(AdaptorPool::toSubnet("keatest-module", json, pools),
ASSERT_NO_THROW_LOG(json = Element::fromJSON(config));
ConstElementPtr copied = copy(json);
ConstElementPtr pools = json->get("pools");
- EXPECT_NO_THROW(AdaptorPool::toSubnet(IETF_DHCPV6_SERVER, json, pools));
+ EXPECT_NO_THROW_LOG(AdaptorPool::toSubnet(IETF_DHCPV6_SERVER, json, pools));
EXPECT_FALSE(copied->equals(*json));
// Check timers.
ConstElementPtr timer = json->get("valid-lifetime");
"}\n";
ConstElementPtr json = Element::fromJSON(config);
- EXPECT_NO_THROW(Adaptor::fromParent("param1", json, json->get("list")));
- EXPECT_NO_THROW(Adaptor::fromParent("param2", json, json->get("list")));
- EXPECT_NO_THROW(Adaptor::fromParent("param3", json, json->get("list")));
+ EXPECT_NO_THROW_LOG(Adaptor::fromParent("param1", json, json->get("list")));
+ EXPECT_NO_THROW_LOG(Adaptor::fromParent("param2", json, json->get("list")));
+ EXPECT_NO_THROW_LOG(Adaptor::fromParent("param3", json, json->get("list")));
string expected = "{\n"
" \"param1\": 123,\n"
"}\n";
ElementPtr json = Element::fromJSON(config);
- EXPECT_NO_THROW(Adaptor::toParent("param1", json, json->get("list")));
+ EXPECT_NO_THROW_LOG(Adaptor::toParent("param1", json, json->get("list")));
EXPECT_TRUE(json->equals(*Element::fromJSON(config)));
string expected = "{\n"
" ]\n"
"}\n";
- EXPECT_NO_THROW(Adaptor::toParent("param2",json, json->get("list")));
+ EXPECT_NO_THROW_LOG(Adaptor::toParent("param2",json, json->get("list")));
EXPECT_TRUE(json->equals(*Element::fromJSON(expected)));
// param[345] have different values so it should throw.
// Get the client class list and check if it is empty.
const string& xpath = "/kea-dhcp4-server:config";
ConstElementPtr classes;
- EXPECT_NO_THROW(classes = t_obj_->getClasses(xpath));
+ EXPECT_NO_THROW_LOG(classes = t_obj_->getClasses(xpath));
EXPECT_FALSE(classes);
}
const string& xclass = xpath + "/client-class[name='foo']";
const string& xtest = xclass + "/test";
string const v_test("not member('ALL')");
- EXPECT_NO_THROW(sess_->setItem(xtest, v_test));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xtest, v_test));
sess_->applyChanges();
// Get the client class.
ConstElementPtr cclass;
- EXPECT_NO_THROW(cclass = t_obj_->getClass(xclass));
+ EXPECT_NO_THROW_LOG(cclass = t_obj_->getClass(xclass));
ASSERT_TRUE(cclass);
ElementPtr expected = Element::createMap();
expected->set("name", Element::create(string("foo")));
// Get the client class list and check if the client class is in it.
ConstElementPtr classes;
- EXPECT_NO_THROW(classes = t_obj_->getClasses(xpath));
+ EXPECT_NO_THROW_LOG(classes = t_obj_->getClasses(xpath));
ASSERT_TRUE(classes);
ASSERT_EQ(Element::list, classes->getType());
ASSERT_EQ(1, classes->size());
// Set empty list.
const string& xpath = "/kea-dhcp4-server:config";
ConstElementPtr classes = Element::createList();
- EXPECT_NO_THROW(t_obj_->setClasses(xpath, classes));
+ EXPECT_NO_THROW_LOG(t_obj_->setClasses(xpath, classes));
// Get it back.
classes.reset();
- EXPECT_NO_THROW(classes = t_obj_->getClasses(xpath));
+ EXPECT_NO_THROW_LOG(classes = t_obj_->getClasses(xpath));
EXPECT_FALSE(classes);
}
cclass->set("test", Element::create(string("''==''")));
cclass->set("only-if-required", Element::create(false));
classes->add(cclass);
- EXPECT_NO_THROW(t_obj_->setClasses(xpath, classes));
+ EXPECT_NO_THROW_LOG(t_obj_->setClasses(xpath, classes));
// Get it back.
ConstElementPtr got;
- EXPECT_NO_THROW(got = t_obj_->getClasses(xpath));
+ EXPECT_NO_THROW_LOG(got = t_obj_->getClasses(xpath));
ASSERT_TRUE(got);
ASSERT_EQ(Element::list, got->getType());
ASSERT_EQ(1, got->size());
// Get empty.
const string& xpath = "/kea-dhcp4-server:config/control-socket";
ConstElementPtr sock;
- EXPECT_NO_THROW(sock = t_obj_->getControlSocket(xpath));
+ EXPECT_NO_THROW_LOG(sock = t_obj_->getControlSocket(xpath));
EXPECT_FALSE(sock);
}
const string& xtype = xpath + "/socket-type";
const string& xcontext = xpath + "/user-context";
string const s_name("/tmp/kea.sock");
- EXPECT_NO_THROW(sess_->setItem(xname, s_name));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xname, s_name));
string const s_type("unix");
- EXPECT_NO_THROW(sess_->setItem(xtype, s_type));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xtype, s_type));
string const s_context("{ \"foo\": 1 }");
- EXPECT_NO_THROW(sess_->setItem(xcontext, s_context));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xcontext, s_context));
sess_->applyChanges();
// Get it.
ConstElementPtr sock;
- EXPECT_NO_THROW(sock = t_obj_->getControlSocket(xpath));
+ EXPECT_NO_THROW_LOG(sock = t_obj_->getControlSocket(xpath));
ASSERT_TRUE(sock);
ASSERT_EQ(Element::map, sock->getType());
EXPECT_EQ(3, sock->size());
// Get it back.
ConstElementPtr got;
- EXPECT_NO_THROW(got = t_obj_->getControlSocket(xpath));
+ EXPECT_NO_THROW_LOG(got = t_obj_->getControlSocket(xpath));
ASSERT_TRUE(got);
ASSERT_EQ(Element::map, got->getType());
EXPECT_EQ(3, got->size());
const string& xtype = xpath + "/socket-type";
const string& xcontext = xpath + "/user-context";
string const s_name("/tmp/kea.sock");
- EXPECT_NO_THROW(sess_->setItem(xname, s_name));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xname, s_name));
string const s_type("unix");
- EXPECT_NO_THROW(sess_->setItem(xtype, s_type));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xtype, s_type));
string const s_context("{ \"foo\": 1 }");
- EXPECT_NO_THROW(sess_->setItem(xcontext, s_context));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xcontext, s_context));
sess_->applyChanges();
// Get it back.
ConstElementPtr sock;
- EXPECT_NO_THROW(sock = t_obj_->getControlSocket(xpath));
+ EXPECT_NO_THROW_LOG(sock = t_obj_->getControlSocket(xpath));
ASSERT_TRUE(sock);
EXPECT_EQ(sock->str(),
R"({ "socket-name": "/tmp/kea.sock", "socket-type": "unix", "user-context": { "foo": 1 } })");
// Reset to empty.
- EXPECT_NO_THROW(t_obj_->setControlSocket(xpath, ConstElementPtr()));
+ EXPECT_NO_THROW_LOG(t_obj_->setControlSocket(xpath, ConstElementPtr()));
// Get it back.
- EXPECT_NO_THROW(sock = t_obj_->getControlSocket(xpath));
+ EXPECT_NO_THROW_LOG(sock = t_obj_->getControlSocket(xpath));
EXPECT_FALSE(sock);
}
// Get empty.
const string& xpath = "/kea-dhcp4-server:config/lease-database";
ConstElementPtr database;
- EXPECT_NO_THROW(database = t_obj_->getDatabase(xpath));
+ EXPECT_NO_THROW_LOG(database = t_obj_->getDatabase(xpath));
EXPECT_FALSE(database);
}
const string& xtype = xpath + "/database-type";
const string& xinterval = xpath + "/lfc-interval";
string const s_type("memfile");
- EXPECT_NO_THROW(sess_->setItem(xtype, s_type));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xtype, s_type));
uint32_t li = 3600;
string const s_interval(to_string(li));
- EXPECT_NO_THROW(sess_->setItem(xinterval, s_interval));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xinterval, s_interval));
sess_->applyChanges();
// Get empty.
ConstElementPtr database;
- EXPECT_NO_THROW(database = t_obj_->getDatabase(xpath));
+ EXPECT_NO_THROW_LOG(database = t_obj_->getDatabase(xpath));
ASSERT_TRUE(database);
EXPECT_EQ(2, database->size());
ConstElementPtr type = database->get("type");
// Get it back.
ConstElementPtr got;
- EXPECT_NO_THROW(got = t_obj_->getDatabase(xpath));
+ EXPECT_NO_THROW_LOG(got = t_obj_->getDatabase(xpath));
ASSERT_TRUE(got);
ASSERT_EQ(Element::map, got->getType());
EXPECT_EQ(2, got->size());
const string& xtype = xpath + "/database-type";
const string& xinterval = xpath + "/lfc-interval";
string const s_type("memfile");
- EXPECT_NO_THROW(sess_->setItem(xtype, s_type));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xtype, s_type));
uint32_t li = 3600;
string const s_interval(to_string(li));
- EXPECT_NO_THROW(sess_->setItem(xinterval, s_interval));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xinterval, s_interval));
sess_->applyChanges();
// Reset to empty.
// Get it back.
ConstElementPtr database;
- EXPECT_NO_THROW(database = t_obj_->getDatabase(xpath));
+ EXPECT_NO_THROW_LOG(database = t_obj_->getDatabase(xpath));
EXPECT_FALSE(database);
}
// Get empty.
const string& xpath = "/kea-dhcp6-server:config/hosts-database";
ConstElementPtr databases;
- EXPECT_NO_THROW(databases = t_obj_->getDatabases(xpath));
+ EXPECT_NO_THROW_LOG(databases = t_obj_->getDatabases(xpath));
EXPECT_FALSE(databases);
}
const string& xhost = xdatabase + "/host";
const string& xport = xdatabase + "/port";
string const s_name("kea");
- EXPECT_NO_THROW(sess_->setItem(xname, s_name));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xname, s_name));
string const s_user("kea");
- EXPECT_NO_THROW(sess_->setItem(xuser, s_user));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xuser, s_user));
string const s_password("kea");
- EXPECT_NO_THROW(sess_->setItem(xpassword, s_password));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xpassword, s_password));
string const s_host("localhost");
- EXPECT_NO_THROW(sess_->setItem(xhost, s_host));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xhost, s_host));
uint16_t mport = 3306;
string const s_port(to_string(mport));
- EXPECT_NO_THROW(sess_->setItem(xport, s_port));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xport, s_port));
sess_->applyChanges();
// Get empty.
ConstElementPtr databases;
- EXPECT_NO_THROW(databases = t_obj_->getDatabases(xpath));
+ EXPECT_NO_THROW_LOG(databases = t_obj_->getDatabases(xpath));
ASSERT_TRUE(databases);
ASSERT_EQ(1, databases->size());
ConstElementPtr database = databases->get(0);
// Get it back.
ConstElementPtr gots;
- EXPECT_NO_THROW(gots = t_obj_->getDatabases(xpath));
+ EXPECT_NO_THROW_LOG(gots = t_obj_->getDatabases(xpath));
ASSERT_TRUE(gots);
ASSERT_EQ(Element::list, gots->getType());
ASSERT_EQ(1, gots->size());
const string& xhost = xdatabase + "/host";
const string& xport = xdatabase + "/port";
string const s_name("kea");
- EXPECT_NO_THROW(sess_->setItem(xname, s_name));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xname, s_name));
string const s_user("kea");
- EXPECT_NO_THROW(sess_->setItem(xuser, s_user));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xuser, s_user));
string const s_password("kea");
- EXPECT_NO_THROW(sess_->setItem(xpassword, s_password));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xpassword, s_password));
string const s_host("localhost");
- EXPECT_NO_THROW(sess_->setItem(xhost, s_host));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xhost, s_host));
uint16_t mport = 3306;
string const s_port(to_string(mport));
- EXPECT_NO_THROW(sess_->setItem(xport, s_port));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xport, s_port));
sess_->applyChanges();
// Reset to empty.
- EXPECT_NO_THROW(t_obj_->setDatabase(xdatabase, ConstElementPtr()));
+ EXPECT_NO_THROW_LOG(t_obj_->setDatabase(xdatabase, ConstElementPtr()));
// Get empty.
ConstElementPtr databases;
- EXPECT_NO_THROW(databases = t_obj_->getDatabases(xpath));
+ EXPECT_NO_THROW_LOG(databases = t_obj_->getDatabases(xpath));
EXPECT_FALSE(databases);
}
const string& xhost = xdatabase + "/host";
const string& xport = xdatabase + "/port";
string const s_name("kea");
- EXPECT_NO_THROW(sess_->setItem(xname, s_name));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xname, s_name));
string const s_user("kea");
- EXPECT_NO_THROW(sess_->setItem(xuser, s_user));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xuser, s_user));
string const s_password("kea");
- EXPECT_NO_THROW(sess_->setItem(xpassword, s_password));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xpassword, s_password));
string const s_host("localhost");
- EXPECT_NO_THROW(sess_->setItem(xhost, s_host));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xhost, s_host));
uint16_t mport = 3306;
string const s_port(to_string(mport));
- EXPECT_NO_THROW(sess_->setItem(xport, s_port));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xport, s_port));
sess_->applyChanges();
// Reset to empty.
- EXPECT_NO_THROW(t_obj_->setDatabases(xdatabase, ConstElementPtr()));
+ EXPECT_NO_THROW_LOG(t_obj_->setDatabases(xdatabase, ConstElementPtr()));
// Get empty.
ConstElementPtr databases;
- EXPECT_NO_THROW(databases = t_obj_->getDatabases(xpath));
+ EXPECT_NO_THROW_LOG(databases = t_obj_->getDatabases(xpath));
EXPECT_FALSE(databases);
}
const string& xpath =
"/kea-dhcp6-server:config/subnet6[id='111']";
ConstElementPtr hosts;
- EXPECT_NO_THROW(hosts = t_obj_->getHosts(xpath));
+ EXPECT_NO_THROW_LOG(hosts = t_obj_->getHosts(xpath));
ASSERT_FALSE(hosts);
}
"/kea-dhcp6-server:config/subnet6[id='111']";
string const v_subnet("2001:db8::/48");
const string& subnet = xpath + "/subnet";
- EXPECT_NO_THROW(sess_->setItem(subnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(subnet, v_subnet));
sess_->applyChanges();
// Create the host reservation for 2001:db8::1.
<< "[identifier='00:01:02:03:04:05']";
const string& xaddr = shost.str() + "/ip-addresses";
string const s_addr("2001:db8::1");
- EXPECT_NO_THROW(sess_->setItem(xaddr, s_addr));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xaddr, s_addr));
sess_->applyChanges();
// Get the host.
ConstElementPtr host;
- EXPECT_NO_THROW(host = t_obj_->getHost(shost.str()));
+ EXPECT_NO_THROW_LOG(host = t_obj_->getHost(shost.str()));
ASSERT_TRUE(host);
ElementPtr expected = Element::createMap();
ElementPtr addresses = Element::createList();
// Get the host reservation list and check if the host reservation
// is in it.
ConstElementPtr hosts;
- EXPECT_NO_THROW(hosts = t_obj_->getHosts(xpath));
+ EXPECT_NO_THROW_LOG(hosts = t_obj_->getHosts(xpath));
ASSERT_TRUE(hosts);
ASSERT_EQ(Element::list, hosts->getType());
ASSERT_EQ(1, hosts->size());
"/kea-dhcp6-server:config/subnet6[id='111']";
string const v_subnet("2001:db8::/48");
const string& subnet = xpath + "/subnet";
- EXPECT_NO_THROW(sess_->setItem(subnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(subnet, v_subnet));
sess_->applyChanges();
// Set empty list.
ConstElementPtr hosts = Element::createList();
- EXPECT_NO_THROW(t_obj_->setHosts(xpath, hosts));
+ EXPECT_NO_THROW_LOG(t_obj_->setHosts(xpath, hosts));
// Get it back.
hosts.reset();
- EXPECT_NO_THROW(hosts = t_obj_->getHosts(xpath));
+ EXPECT_NO_THROW_LOG(hosts = t_obj_->getHosts(xpath));
ASSERT_FALSE(hosts);
}
"/kea-dhcp4-server:config/subnet4[id='111']";
string const v_subnet("10.0.0.0/24");
const string& subnet = xpath + "/subnet";
- EXPECT_NO_THROW(sess_->setItem(subnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(subnet, v_subnet));
sess_->applyChanges();
// Set one host.
host->set("ip-address", Element::create(string("10.0.0.1")));
host->set("hostname", Element::create(string("foo")));
hosts->add(host);
- EXPECT_NO_THROW(t_obj_->setHosts(xpath, hosts));
+ EXPECT_NO_THROW_LOG(t_obj_->setHosts(xpath, hosts));
// Get it back.
hosts.reset();
- EXPECT_NO_THROW(hosts = t_obj_->getHosts(xpath));
+ EXPECT_NO_THROW_LOG(hosts = t_obj_->getHosts(xpath));
ASSERT_TRUE(hosts);
ASSERT_EQ(Element::list, hosts->getType());
ASSERT_EQ(1, hosts->size());
"/kea-dhcp6-server:config/subnet6[id='111']";
string const v_subnet("2001:db8::/48");
const string& subnet = xpath + "/subnet";
- EXPECT_NO_THROW(sess_->setItem(subnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(subnet, v_subnet));
sess_->applyChanges();
// Create the host reservation for 2001:db8::1.
<< "[identifier='00:01:02:03:04:05']";
const string& xaddr = shost.str() + "/ip-addresses";
string const s_addr("2001:db8::1");
- EXPECT_NO_THROW(sess_->setItem(xaddr, s_addr));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xaddr, s_addr));
sess_->applyChanges();
// Create another reservation for 2001:db8::2
<< "[identifier='00:01:0a:0b:0c:0d']";
const string xaddr2 = shost2.str() + "/ip-addresses";
string const s_addr2("2001:db8::2");
- EXPECT_NO_THROW(sess_->setItem(xaddr2, s_addr2));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xaddr2, s_addr2));
sess_->applyChanges();
// Get the host.
ConstElementPtr hosts;
- EXPECT_NO_THROW(hosts = t_obj_->getHosts(xpath));
+ EXPECT_NO_THROW_LOG(hosts = t_obj_->getHosts(xpath));
ASSERT_TRUE(hosts);
EXPECT_EQ(hosts->str(),
// Get empty.
const string& xpath = "/kea-dhcp4-server:config";
ConstElementPtr loggers;
- EXPECT_NO_THROW(loggers = t_obj_->getLoggers(xpath));
+ EXPECT_NO_THROW_LOG(loggers = t_obj_->getLoggers(xpath));
ASSERT_FALSE(loggers);
}
const string& xoption = xlogger + "/output-option[output='/bar']";
const string& xmaxver = xoption + "/maxver";
string const s_severity("WARN");
- EXPECT_NO_THROW(sess_->setItem(xseverity, s_severity));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xseverity, s_severity));
uint32_t max_ver = 10;
string const s_maxver(to_string(max_ver));
- EXPECT_NO_THROW(sess_->setItem(xmaxver, s_maxver));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xmaxver, s_maxver));
sess_->applyChanges();
// Get empty.
ConstElementPtr loggers;
- EXPECT_NO_THROW(loggers = t_obj_->getLoggers(xpath));
+ EXPECT_NO_THROW_LOG(loggers = t_obj_->getLoggers(xpath));
ASSERT_TRUE(loggers);
ASSERT_EQ(1, loggers->size());
ConstElementPtr logger = loggers->get(0);
// Get it back.
ConstElementPtr gots;
- EXPECT_NO_THROW(gots = t_obj_->getLoggers(xpath));
+ EXPECT_NO_THROW_LOG(gots = t_obj_->getLoggers(xpath));
ASSERT_TRUE(gots);
ASSERT_EQ(1, gots->size());
ConstElementPtr got = gots->get(0);
// Get the option data list and check if it is empty.
const string& xpath = "/kea-dhcp4-server:config";
ConstElementPtr options;
- EXPECT_NO_THROW(options = t_obj_->getOptionDataList(xpath));
+ EXPECT_NO_THROW_LOG(options = t_obj_->getOptionDataList(xpath));
ASSERT_FALSE(options);
}
// Get the option data.
ConstElementPtr option;
- EXPECT_NO_THROW(option = t_obj_->getOptionData(xoption));
+ EXPECT_NO_THROW_LOG(option = t_obj_->getOptionData(xoption));
ASSERT_TRUE(option);
EXPECT_EQ("{"
" \"always-send\": false,"
// Get the option data list.
ConstElementPtr options;
- EXPECT_NO_THROW(options = t_obj_->getOptionDataList(xpath));
+ EXPECT_NO_THROW_LOG(options = t_obj_->getOptionDataList(xpath));
ASSERT_TRUE(options);
ASSERT_EQ(Element::list, options->getType());
EXPECT_EQ(1, options->size());
// Set empty list.
const string& xpath = "/kea-dhcp4-server:config";
ConstElementPtr options = Element::createList();
- EXPECT_NO_THROW(t_obj_->setOptionDataList(xpath, options));
+ EXPECT_NO_THROW_LOG(t_obj_->setOptionDataList(xpath, options));
// Get it back.
options.reset();
- EXPECT_NO_THROW(options = t_obj_->getOptionDataList(xpath));
+ EXPECT_NO_THROW_LOG(options = t_obj_->getOptionDataList(xpath));
ASSERT_FALSE(options);
}
option->set("data", Element::create(string("12121212")));
option->set("always-send", Element::create(false));
options->add(option);
- EXPECT_NO_THROW(t_obj_->setOptionDataList(xpath, options));
+ EXPECT_NO_THROW_LOG(t_obj_->setOptionDataList(xpath, options));
// Get it back.
ConstElementPtr got;
- EXPECT_NO_THROW(got = t_obj_->getOptionDataList(xpath));
+ EXPECT_NO_THROW_LOG(got = t_obj_->getOptionDataList(xpath));
ASSERT_TRUE(got);
ASSERT_EQ(1, got->size());
EXPECT_TRUE(option->equals(*got->get(0)));
// Get the option definition list and check if it is empty.
const string& xpath = "/kea-dhcp4-server:config";
ConstElementPtr options;
- EXPECT_NO_THROW(options = t_obj_->getOptionDefList(xpath));
+ EXPECT_NO_THROW_LOG(options = t_obj_->getOptionDefList(xpath));
ASSERT_FALSE(options);
}
// Get the option def.
ConstElementPtr def;
- EXPECT_NO_THROW(def = t_obj_->getOptionDef(xdef));
+ EXPECT_NO_THROW_LOG(def = t_obj_->getOptionDef(xdef));
ASSERT_TRUE(def);
EXPECT_EQ("{ "
"\"array\": false, "
// Get the option definition list.
ConstElementPtr defs;
- EXPECT_NO_THROW(defs = t_obj_->getOptionDefList(xpath));
+ EXPECT_NO_THROW_LOG(defs = t_obj_->getOptionDefList(xpath));
ASSERT_TRUE(defs);
ASSERT_EQ(Element::list, defs->getType());
EXPECT_EQ(1, defs->size());
// Set empty list.
const string& xpath = "/kea-dhcp4-server:config";
ConstElementPtr defs = Element::createList();
- EXPECT_NO_THROW(t_obj_->setOptionDefList(xpath, defs));
+ EXPECT_NO_THROW_LOG(t_obj_->setOptionDefList(xpath, defs));
// Get it back.
defs.reset();
- EXPECT_NO_THROW(defs = t_obj_->getOptionDefList(xpath));
+ EXPECT_NO_THROW_LOG(defs = t_obj_->getOptionDefList(xpath));
ASSERT_FALSE(defs);
}
def->set("type", Element::create(string("string")));
def->set("array", Element::create(false));
defs->add(def);
- EXPECT_NO_THROW(t_obj_->setOptionDefList(xpath, defs));
+ EXPECT_NO_THROW_LOG(t_obj_->setOptionDefList(xpath, defs));
// Get it back.
ConstElementPtr got;
- EXPECT_NO_THROW(got = t_obj_->getOptionDefList(xpath));
+ EXPECT_NO_THROW_LOG(got = t_obj_->getOptionDefList(xpath));
ASSERT_TRUE(got);
ASSERT_EQ(1, got->size());
EXPECT_TRUE(def->equals(*got->get(0)));
"/ietf-dhcpv6-server:server/server-config/network-ranges"
"/network-range[network-range-id='111']/pd-pools";
ConstElementPtr pools;
- EXPECT_NO_THROW(pools = t_obj_->getPdPools(xpath));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPdPools(xpath));
ASSERT_FALSE(pools);
}
// Get the pd-pool list and check if it is empty.
const string& xpath = "/kea-dhcp6-server:config/subnet6[id='111']";
ConstElementPtr pools;
- EXPECT_NO_THROW(pools = t_obj_->getPdPools(xpath));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPdPools(xpath));
ASSERT_FALSE(pools);
}
"/network-range[network-range-id='111']";
string const v_subnet("2001:db8::/48");
const string& subnet_subnet = subnet + "/network-prefix";
- EXPECT_NO_THROW(sess_->setItem(subnet_subnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(subnet_subnet, v_subnet));
sess_->applyChanges();
// Create the pd-pool 2001:db8:0:1000::/64 #222.
const string& xpath = subnet + "/pd-pools/pd-pool[pool-id='222']";
const string& prefix = xpath + "/prefix";
string const s_prefix("2001:db8:0:1000::/56");
- EXPECT_NO_THROW(sess_->setItem(prefix, s_prefix));
+ EXPECT_NO_THROW_LOG(sess_->setItem(prefix, s_prefix));
const string& length = xpath + "/prefix-length";
uint8_t len = 56;
string const s_length(to_string(len));
- EXPECT_NO_THROW(sess_->setItem(length, s_length));
+ EXPECT_NO_THROW_LOG(sess_->setItem(length, s_length));
sess_->applyChanges();
// Get the pool.
ConstElementPtr pool;
- EXPECT_NO_THROW(pool = t_obj_->getPdPool(xpath));
+ EXPECT_NO_THROW_LOG(pool = t_obj_->getPdPool(xpath));
ASSERT_TRUE(pool);
ElementPtr expected = Element::createMap();
expected->set("prefix", Element::create(string("2001:db8:0:1000::")));
// Get the pd-pool list and check if the pd-pool is in it.
ConstElementPtr pools;
- EXPECT_NO_THROW(pools = t_obj_->getPdPools(subnet + "/pd-pools"));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPdPools(subnet + "/pd-pools"));
ASSERT_TRUE(pools);
ASSERT_EQ(Element::list, pools->getType());
ASSERT_EQ(1, pools->size());
"/kea-dhcp6-server:config/subnet6[id='111']";
string const v_subnet("2001:db8::/48");
const string& subnet = xpath + "/subnet";
- EXPECT_NO_THROW(sess_->setItem(subnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(subnet, v_subnet));
sess_->applyChanges();
// Create the pd-pool 2001:db8:0:1000::/64.
const string& x_delegated = spool.str() + "/delegated-len";
uint8_t dl = 64;
string const s_delegated(to_string(dl));
- EXPECT_NO_THROW(sess_->setItem(x_delegated, s_delegated));
+ EXPECT_NO_THROW_LOG(sess_->setItem(x_delegated, s_delegated));
sess_->applyChanges();
// Get the pool.
ConstElementPtr pool;
- EXPECT_NO_THROW(pool = t_obj_->getPdPool(spool.str()));
+ EXPECT_NO_THROW_LOG(pool = t_obj_->getPdPool(spool.str()));
ASSERT_TRUE(pool);
ElementPtr expected = Element::createMap();
expected->set("prefix", Element::create(string("2001:db8:0:1000::")));
// Get the pd-pool list and check if the pd-pool is in it.
ConstElementPtr pools;
- EXPECT_NO_THROW(pools = t_obj_->getPdPools(xpath));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPdPools(xpath));
ASSERT_TRUE(pools);
ASSERT_EQ(Element::list, pools->getType());
ASSERT_EQ(1, pools->size());
"/network-range[network-range-id='111']";
string const v_subnet("2001:db8::/48");
const string& subnet_subnet = subnet + "/network-prefix";
- EXPECT_NO_THROW(sess_->setItem(subnet_subnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(subnet_subnet, v_subnet));
sess_->applyChanges();
// Set empty list.
const string& xpath = subnet + "/pd-pools";
ConstElementPtr pools = Element::createList();
- EXPECT_NO_THROW(t_obj_->setPdPools(xpath, pools));
+ EXPECT_NO_THROW_LOG(t_obj_->setPdPools(xpath, pools));
// Get it back.
pools.reset();
- EXPECT_NO_THROW(pools = t_obj_->getPdPools(xpath));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPdPools(xpath));
ASSERT_FALSE(pools);
}
"/kea-dhcp6-server:config/subnet6[id='111']";
string const v_subnet("2001:db8::/48");
const string& subnet = xpath + "/subnet";
- EXPECT_NO_THROW(sess_->setItem(subnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(subnet, v_subnet));
sess_->applyChanges();
// Set empty list.
ConstElementPtr pools = Element::createList();
- EXPECT_NO_THROW(t_obj_->setPdPools(xpath, pools));
+ EXPECT_NO_THROW_LOG(t_obj_->setPdPools(xpath, pools));
// Get it back.
pools.reset();
- EXPECT_NO_THROW(pools = t_obj_->getPdPools(xpath));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPdPools(xpath));
ASSERT_FALSE(pools);
}
"/network-range[network-range-id='111']";
string const v_subnet("2001:db8::/48");
const string& subnet_subnet = subnet + "/network-prefix";
- EXPECT_NO_THROW(sess_->setItem(subnet_subnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(subnet_subnet, v_subnet));
sess_->applyChanges();
// Set one pool.
pool->set("prefix", Element::create(string("2001:db8:0:1000::")));
pool->set("prefix-len", Element::create(56));
pools->add(pool);
- EXPECT_NO_THROW(t_obj_->setPdPools(xpath, pools));
+ EXPECT_NO_THROW_LOG(t_obj_->setPdPools(xpath, pools));
// Get it back.
pools.reset();
- EXPECT_NO_THROW(pools = t_obj_->getPdPools(xpath));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPdPools(xpath));
ASSERT_TRUE(pools);
ASSERT_EQ(Element::list, pools->getType());
ASSERT_EQ(1, pools->size());
"/kea-dhcp6-server:config/subnet6[id='111']";
string const v_subnet("2001:db8::/48");
const string& subnet = xpath + "/subnet";
- EXPECT_NO_THROW(sess_->setItem(subnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(subnet, v_subnet));
sess_->applyChanges();
// Set one pool.
pool->set("prefix-len", Element::create(56));
pool->set("delegated-len", Element::create(64));
pools->add(pool);
- EXPECT_NO_THROW(t_obj_->setPdPools(xpath, pools));
+ EXPECT_NO_THROW_LOG(t_obj_->setPdPools(xpath, pools));
// Get it back.
pools.reset();
- EXPECT_NO_THROW(pools = t_obj_->getPdPools(xpath));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPdPools(xpath));
ASSERT_TRUE(pools);
ASSERT_EQ(Element::list, pools->getType());
ASSERT_EQ(1, pools->size());
"/kea-dhcp6-server:config/subnet6[id='111']";
string const v_subnet("2001:db8::/48");
const string& subnet = xpath + "/subnet";
- EXPECT_NO_THROW(sess_->setItem(subnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(subnet, v_subnet));
sess_->applyChanges();
// Create the first pd-pool 2001:db8:0:1000::/56.
const string& x_delegated = spool.str() + "/delegated-len";
uint8_t dl = 64;
string const s_delegated(to_string(dl));
- EXPECT_NO_THROW(sess_->setItem(x_delegated, s_delegated));
+ EXPECT_NO_THROW_LOG(sess_->setItem(x_delegated, s_delegated));
sess_->applyChanges();
// Create the second pd-pool 2001:db8:0:2000::/56
const string& x_delegated2 = spool2.str() + "/delegated-len";
uint8_t dl2 = 60;
string const s_delegated2(to_string(dl2));
- EXPECT_NO_THROW(sess_->setItem(x_delegated2, s_delegated2));
+ EXPECT_NO_THROW_LOG(sess_->setItem(x_delegated2, s_delegated2));
sess_->applyChanges();
// Get the pools list.
ConstElementPtr pools;
- EXPECT_NO_THROW(pools = t_obj_->getPdPools(xpath));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPdPools(xpath));
ASSERT_TRUE(pools);
// Check that both of them are returned properly.
const string& xpath = "/ietf-dhcpv6-server:server/server-config/"
"network-ranges/network-range[network-range-id='111']/address-pools";
ConstElementPtr pools;
- EXPECT_NO_THROW(pools = t_obj_->getPools(xpath));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPools(xpath));
ASSERT_FALSE(pools);
}
// Get the pool list and check if it is empty.
const string& xpath = "/kea-dhcp6-server:config/subnet6[id='111']";
ConstElementPtr pools;
- EXPECT_NO_THROW(pools = t_obj_->getPools(xpath));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPools(xpath));
ASSERT_FALSE(pools);
}
"network-ranges/network-range[network-range-id='111']";
string const subnet_value("2001:db8::/48");
string const& network_prefix_path = subnet + "/network-prefix";
- EXPECT_NO_THROW(sess_->setItem(network_prefix_path, subnet_value));
+ EXPECT_NO_THROW_LOG(sess_->setItem(network_prefix_path, subnet_value));
sess_->applyChanges();
// Create the pool 2001:db8::1:0/112 #222.
const string& xpath = subnet + "/address-pools";
const string& prefix = xpath + "/address-pool[pool-id='222']/pool-prefix";
string const value("2001:db8::1:0/112");
- EXPECT_NO_THROW(sess_->setItem(prefix, value));
+ EXPECT_NO_THROW_LOG(sess_->setItem(prefix, value));
sess_->applyChanges();
// Get the pool.
ConstElementPtr pool;
- EXPECT_NO_THROW(pool = t_obj_->getPool(xpath + "/address-pool[pool-id='222']"));
+ EXPECT_NO_THROW_LOG(pool = t_obj_->getPool(xpath + "/address-pool[pool-id='222']"));
ASSERT_TRUE(pool);
EXPECT_EQ("{ \"pool\": \"2001:db8::1:0/112\" }", pool->str());
// Get the pool list and check if the pool is in it.
ConstElementPtr pools;
- EXPECT_NO_THROW(pools = t_obj_->getPools(xpath));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPools(xpath));
ASSERT_TRUE(pools);
ASSERT_EQ(Element::list, pools->getType());
ASSERT_EQ(1, pools->size());
"/kea-dhcp6-server:config/subnet6[id='111']";
string const v_subnet("2001:db8::/48");
const string& subnet = xpath + "/subnet";
- EXPECT_NO_THROW(sess_->setItem(subnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(subnet, v_subnet));
sess_->applyChanges();
// Create the pool 2001:db8::1:0/112.
<< "'][end-address='" << end_addr << "']";
const string& x_prefix = spool.str() + "/prefix";
string const s_prefix("2001:db8::1:0/112");
- EXPECT_NO_THROW(sess_->setItem(x_prefix, s_prefix));
+ EXPECT_NO_THROW_LOG(sess_->setItem(x_prefix, s_prefix));
sess_->applyChanges();
// Get the pool.
ConstElementPtr pool;
- EXPECT_NO_THROW(pool = t_obj_->getPool(spool.str()));
+ EXPECT_NO_THROW_LOG(pool = t_obj_->getPool(spool.str()));
ASSERT_TRUE(pool);
ElementPtr expected = Element::createMap();
expected->set("pool", Element::create(string("2001:db8::1:0/112")));
// Get the pool list and check if the pool is in it.
ConstElementPtr pools;
- EXPECT_NO_THROW(pools = t_obj_->getPools(xpath));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPools(xpath));
ASSERT_TRUE(pools);
ASSERT_EQ(Element::list, pools->getType());
ASSERT_EQ(1, pools->size());
"network-ranges/network-range[network-range-id='111']";
string const v_subnet("2001:db8::/48");
const string& subnet_subnet = subnet + "/network-prefix";
- EXPECT_NO_THROW(sess_->setItem(subnet_subnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(subnet_subnet, v_subnet));
sess_->applyChanges();
// Set empty list.
const string& xpath = subnet + "/address-pools";
ConstElementPtr pools = Element::createList();
- EXPECT_NO_THROW(t_obj_->setPools(xpath, pools));
+ EXPECT_NO_THROW_LOG(t_obj_->setPools(xpath, pools));
// Get it back.
pools.reset();
- EXPECT_NO_THROW(pools = t_obj_->getPools(xpath));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPools(xpath));
ASSERT_FALSE(pools);
}
"/kea-dhcp6-server:config/subnet6[id='111']";
string const v_subnet("2001:db8::/48");
const string& subnet = xpath + "/subnet";
- EXPECT_NO_THROW(sess_->setItem(subnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(subnet, v_subnet));
sess_->applyChanges();
// Set empty list.
ConstElementPtr pools = Element::createList();
- EXPECT_NO_THROW(t_obj_->setPools(xpath, pools));
+ EXPECT_NO_THROW_LOG(t_obj_->setPools(xpath, pools));
// Get it back.
pools.reset();
- EXPECT_NO_THROW(pools = t_obj_->getPools(xpath));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPools(xpath));
ASSERT_FALSE(pools);
}
"network-ranges/network-range[network-range-id='111']";
string const v_subnet("2001:db8::/48");
const string& subnet_subnet = subnet + "/network-prefix";
- EXPECT_NO_THROW(sess_->setItem(subnet_subnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(subnet_subnet, v_subnet));
sess_->applyChanges();
// Set one pool.
ElementPtr pool = Element::createMap();
pool->set("pool", Element::create(string("2001:db8::1:0/112")));
pools->add(pool);
- EXPECT_NO_THROW(t_obj_->setPools(xpath, pools));
+ EXPECT_NO_THROW_LOG(t_obj_->setPools(xpath, pools));
// Get it back.
pools.reset();
- EXPECT_NO_THROW(pools = t_obj_->getPools(xpath));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPools(xpath));
ASSERT_TRUE(pools);
ASSERT_EQ(Element::list, pools->getType());
ASSERT_EQ(1, pools->size());
"/kea-dhcp6-server:config/subnet6[id='111']";
string const v_subnet("2001:db8::/48");
const string& subnet = xpath + "/subnet";
- EXPECT_NO_THROW(sess_->setItem(subnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(subnet, v_subnet));
sess_->applyChanges();
// Set one pool.
pool->set("pool",
Element::create(string("2001:db8::1 - 2001:db8::100")));
pools->add(pool);
- EXPECT_NO_THROW(t_obj_->setPools(xpath, pools));
+ EXPECT_NO_THROW_LOG(t_obj_->setPools(xpath, pools));
// Get it back.
pools.reset();
- EXPECT_NO_THROW(pools = t_obj_->getPools(xpath));
+ EXPECT_NO_THROW_LOG(pools = t_obj_->getPools(xpath));
ASSERT_TRUE(pools);
ASSERT_EQ(Element::list, pools->getType());
ASSERT_EQ(1, pools->size());
// Get the shared network list and check if it is empty.
const string& xpath = "/kea-dhcp4-server:config";
ConstElementPtr networks;
- EXPECT_NO_THROW(networks = t_obj_->getSharedNetworks(xpath));
+ EXPECT_NO_THROW_LOG(networks = t_obj_->getSharedNetworks(xpath));
ASSERT_FALSE(networks);
}
const string& xnetwork = xpath + "/shared-network[name='foo']";
const string& xsubnet = xnetwork + "/subnet6[id='111']/subnet";
string const v_subnet("2001:db8::/48");
- EXPECT_NO_THROW(sess_->setItem(xsubnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xsubnet, v_subnet));
sess_->applyChanges();
// Get the shared network.
ConstElementPtr network;
- EXPECT_NO_THROW(network = t_obj_->getSharedNetwork(xnetwork));
+ EXPECT_NO_THROW_LOG(network = t_obj_->getSharedNetwork(xnetwork));
ASSERT_TRUE(network);
ElementPtr subnet = Element::createMap();
subnet->set("id", Element::create(111));
// Get the shared network list and check if the shared network is in it.
ConstElementPtr networks;
- EXPECT_NO_THROW(networks = t_obj_->getSharedNetworks(xpath));
+ EXPECT_NO_THROW_LOG(networks = t_obj_->getSharedNetworks(xpath));
ASSERT_TRUE(networks);
ASSERT_EQ(Element::list, networks->getType());
ASSERT_EQ(1, networks->size());
// Set empty list.
const string& xpath = "/kea-dhcp4-server:config";
ConstElementPtr networks = Element::createList();
- EXPECT_NO_THROW(t_obj_->setSharedNetworks(xpath, networks));
+ EXPECT_NO_THROW_LOG(t_obj_->setSharedNetworks(xpath, networks));
// Get it back.
networks.reset();
- EXPECT_NO_THROW(networks = t_obj_->getSharedNetworks(xpath));
+ EXPECT_NO_THROW_LOG(networks = t_obj_->getSharedNetworks(xpath));
ASSERT_FALSE(networks);
}
share->set("name", Element::create(string("foo")));
share->set("subnet6", subnets);
networks->add(share);
- EXPECT_NO_THROW(t_obj_->setSharedNetworks(xpath, networks));
+ EXPECT_NO_THROW_LOG(t_obj_->setSharedNetworks(xpath, networks));
// Get it back.
networks.reset();
- EXPECT_NO_THROW(networks = t_obj_->getSharedNetworks(xpath));
+ EXPECT_NO_THROW_LOG(networks = t_obj_->getSharedNetworks(xpath));
ASSERT_TRUE(networks);
ASSERT_EQ(Element::list, networks->getType());
ASSERT_EQ(1, networks->size());
// Create the subnet1: 2001:db8:1::/48 #1 in shared network foo.
const string& xsubnet1 = xnetwork1 + "/subnet6[id='1']/subnet";
string const v_subnet1("2001:db8:1::/48");
- EXPECT_NO_THROW(sess_->setItem(xsubnet1, v_subnet1));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xsubnet1, v_subnet1));
sess_->applyChanges();
// Create the subnet2: 2001:db8:2::/48 #2 in shared network foo.
const string& xsubnet2 = xnetwork1 + "/subnet6[id='2']/subnet";
string const v_subnet2("2001:db8:2::/48");
- EXPECT_NO_THROW(sess_->setItem(xsubnet2, v_subnet2));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xsubnet2, v_subnet2));
sess_->applyChanges();
// Create the subnet1: 2001:db8:101::/48 #101 in shared network foo.
const string& xsubnet3 = xnetwork2 + "/subnet6[id='101']/subnet";
string const v_subnet("2001:db8:101::/48");
- EXPECT_NO_THROW(sess_->setItem(xsubnet3, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xsubnet3, v_subnet));
sess_->applyChanges();
// Create the subnet2: 2001:db8:2::/48 #2 in shared network foo.
const string& xsubnet4 = xnetwork2 + "/subnet6[id='102']/subnet";
string const v_subnet4("2001:db8:102::/48");
- EXPECT_NO_THROW(sess_->setItem(xsubnet4, v_subnet4));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xsubnet4, v_subnet4));
sess_->applyChanges();
// Ok, now test the getters. Let's start with the easier ones that
ConstElementPtr network;
// Get the first network.
- EXPECT_NO_THROW(network = t_obj_->getSharedNetwork(xnetwork1));
+ EXPECT_NO_THROW_LOG(network = t_obj_->getSharedNetwork(xnetwork1));
ASSERT_TRUE(network);
EXPECT_EQ(exp_net1, network->str());
// Get the second network.
- EXPECT_NO_THROW(network = t_obj_->getSharedNetwork(xnetwork2));
+ EXPECT_NO_THROW_LOG(network = t_obj_->getSharedNetwork(xnetwork2));
ASSERT_TRUE(network);
EXPECT_EQ(exp_net2, network->str());
// Check that networks with non-existent name are not returned.
- EXPECT_NO_THROW(network = t_obj_->getSharedNetwork(xnetwork3));
+ EXPECT_NO_THROW_LOG(network = t_obj_->getSharedNetwork(xnetwork3));
EXPECT_FALSE(network);
// Now test returns all networks
ConstElementPtr networks;
- EXPECT_NO_THROW(networks = t_obj_->getSharedNetworks(xpath));
+ EXPECT_NO_THROW_LOG(networks = t_obj_->getSharedNetworks(xpath));
ASSERT_TRUE(networks);
EXPECT_EQ(exp_both, networks->str());
}
const string& xpath =
"/ietf-dhcpv6-server:server/server-config/network-ranges";
ConstElementPtr subnets;
- EXPECT_NO_THROW(subnets = t_obj_->getSubnets(xpath));
+ EXPECT_NO_THROW_LOG(subnets = t_obj_->getSubnets(xpath));
ASSERT_FALSE(subnets);
}
// Get the subnet list and check if it is empty.
const string& xpath = "/kea-dhcp6-server:config";
ConstElementPtr subnets;
- EXPECT_NO_THROW(subnets = t_obj_->getSubnets(xpath));
+ EXPECT_NO_THROW_LOG(subnets = t_obj_->getSubnets(xpath));
ASSERT_FALSE(subnets);
}
const string& xsub = xpath + "/network-range[network-range-id='111']";
string const v_subnet("2001:db8::/48");
const string& xsubnet = xsub + "/network-prefix";
- EXPECT_NO_THROW(sess_->setItem(xsubnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xsubnet, v_subnet));
sess_->applyChanges();
// Get the subnet.
ConstElementPtr subnet;
- EXPECT_NO_THROW(subnet = t_obj_->getSubnet(xsub));
+ EXPECT_NO_THROW_LOG(subnet = t_obj_->getSubnet(xsub));
ASSERT_TRUE(subnet);
EXPECT_EQ("{ \"id\": 111, "
"\"subnet\": \"2001:db8::/48\" }",
// Get the subnet list and check if the subnet is in it.
ConstElementPtr subnets;
- EXPECT_NO_THROW(subnets = t_obj_->getSubnets(xpath));
+ EXPECT_NO_THROW_LOG(subnets = t_obj_->getSubnets(xpath));
ASSERT_TRUE(subnets);
ASSERT_EQ(Element::list, subnets->getType());
ASSERT_EQ(1, subnets->size());
const string& xsub = xpath + "/subnet6[id='111']";
string const v_subnet("2001:db8::/48");
const string& xsubnet = xsub + "/subnet";
- EXPECT_NO_THROW(sess_->setItem(xsubnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xsubnet, v_subnet));
sess_->applyChanges();
// Get the subnet.
ConstElementPtr subnet;
- EXPECT_NO_THROW(subnet = t_obj_->getSubnet(xsub));
+ EXPECT_NO_THROW_LOG(subnet = t_obj_->getSubnet(xsub));
ASSERT_TRUE(subnet);
ElementPtr expected = Element::createMap();
expected->set("id", Element::create(111));
// Get the subnet list and check if the subnet is in it.
ConstElementPtr subnets;
- EXPECT_NO_THROW(subnets = t_obj_->getSubnets(xpath));
+ EXPECT_NO_THROW_LOG(subnets = t_obj_->getSubnets(xpath));
ASSERT_TRUE(subnets);
ASSERT_EQ(Element::list, subnets->getType());
ASSERT_EQ(1, subnets->size());
const string& xsub = xpath + "/network-range[network-range-id='111']";
string const v_subnet("2001:db8::/48");
const string& xsubnet = xsub + "/network-prefix";
- EXPECT_NO_THROW(sess_->setItem(xsubnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xsubnet, v_subnet));
sess_->applyChanges();
// Create the pool 2001:db8::1:0/112 #1.
const string& xpool = xsub + "/address-pools";
const string& prefix1 = xpool + "/address-pool[pool-id='1']/pool-prefix";
string const s_pool1("2001:db8::1:0/112");
- EXPECT_NO_THROW(sess_->setItem(prefix1, s_pool1));
+ EXPECT_NO_THROW_LOG(sess_->setItem(prefix1, s_pool1));
sess_->applyChanges();
// Create the pool 2001:db8::2:0/112 #2.
const string& prefix2 = xpool + "/address-pool[pool-id='2']/pool-prefix";
string const s_pool2("2001:db8::2:0/112");
- EXPECT_NO_THROW(sess_->setItem(prefix2, s_pool2));
+ EXPECT_NO_THROW_LOG(sess_->setItem(prefix2, s_pool2));
sess_->applyChanges();
// Get the subnet.
ConstElementPtr subnet;
- EXPECT_NO_THROW(subnet = t_obj_->getSubnet(xsub));
+ EXPECT_NO_THROW_LOG(subnet = t_obj_->getSubnet(xsub));
ASSERT_TRUE(subnet);
string expected =
"{\n"
// Get the subnet list and check if the subnet is in it.
ConstElementPtr subnets;
- EXPECT_NO_THROW(subnets = t_obj_->getSubnets(xpath));
+ EXPECT_NO_THROW_LOG(subnets = t_obj_->getSubnets(xpath));
ASSERT_TRUE(subnets);
ASSERT_EQ(Element::list, subnets->getType());
ASSERT_EQ(1, subnets->size());
const string& xsub = xpath + "/subnet6[id='111']";
string const v_subnet("2001:db8::/48");
const string& xsubnet = xsub + "/subnet";
- EXPECT_NO_THROW(sess_->setItem(xsubnet, v_subnet));
+ EXPECT_NO_THROW_LOG(sess_->setItem(xsubnet, v_subnet));
sess_->applyChanges();
// Create the pool 2001:db8::1:0/112.
const string& prefix1 = xsub + "/pool[start-address='2001:db8::1:0']" +
"[end-address='2001:db8::1:ffff']/prefix";
string const s_pool1("2001:db8::1:0/112");
- EXPECT_NO_THROW(sess_->setItem(prefix1, s_pool1));
+ EXPECT_NO_THROW_LOG(sess_->setItem(prefix1, s_pool1));
sess_->applyChanges();
// Create the pool 2001:db8::2:0/112.
const string& prefix2 = xsub + "/pool[start-address='2001:db8::2:0']" +
"[end-address='2001:db8::2:ffff']";
- EXPECT_NO_THROW(sess_->setItem(prefix2, nullopt));
+ EXPECT_NO_THROW_LOG(sess_->setItem(prefix2, nullopt));
sess_->applyChanges();
// Get the subnet.
ConstElementPtr subnet;
- EXPECT_NO_THROW(subnet = t_obj_->getSubnet(xsub));
+ EXPECT_NO_THROW_LOG(subnet = t_obj_->getSubnet(xsub));
ASSERT_TRUE(subnet);
string expected =
"{\n"
// Get the subnet list and check if the subnet is in it.
ConstElementPtr subnets;
- EXPECT_NO_THROW(subnets = t_obj_->getSubnets(xpath));
+ EXPECT_NO_THROW_LOG(subnets = t_obj_->getSubnets(xpath));
ASSERT_TRUE(subnets);
ASSERT_EQ(Element::list, subnets->getType());
ASSERT_EQ(1, subnets->size());
const string& xpath =
"/ietf-dhcpv6-server:server/server-config/network-ranges";
ConstElementPtr subnets = Element::createList();
- EXPECT_NO_THROW(t_obj_->setSubnets(xpath, subnets));
+ EXPECT_NO_THROW_LOG(t_obj_->setSubnets(xpath, subnets));
// Get it back.
subnets.reset();
- EXPECT_NO_THROW(subnets = t_obj_->getSubnets(xpath));
+ EXPECT_NO_THROW_LOG(subnets = t_obj_->getSubnets(xpath));
ASSERT_FALSE(subnets);
}
// Set empty list.
const string& xpath = "/kea-dhcp4-server:config";
ElementPtr subnets = Element::createList();
- EXPECT_NO_THROW(t_obj_->setSubnets(xpath, subnets));
+ EXPECT_NO_THROW_LOG(t_obj_->setSubnets(xpath, subnets));
// Get it back.
subnets.reset();
- EXPECT_NO_THROW(subnets = t_obj_->getSubnets(xpath));
+ EXPECT_NO_THROW_LOG(subnets = t_obj_->getSubnets(xpath));
ASSERT_FALSE(subnets);
}
subnet->set("subnet", Element::create(string("2001:db8::/48")));
subnet->set("id", Element::create(123));
subnets->add(subnet);
- EXPECT_NO_THROW(t_obj_->setSubnets(xpath, subnets));
+ EXPECT_NO_THROW_LOG(t_obj_->setSubnets(xpath, subnets));
// Get it back.
subnets.reset();
- EXPECT_NO_THROW(subnets = t_obj_->getSubnets(xpath));
+ EXPECT_NO_THROW_LOG(subnets = t_obj_->getSubnets(xpath));
ASSERT_TRUE(subnets);
ASSERT_EQ(Element::list, subnets->getType());
ASSERT_EQ(1, subnets->size());
subnet->set("subnet", Element::create(string("10.0.1.0/24")));
subnet->set("id", Element::create(123));
subnets->add(subnet);
- EXPECT_NO_THROW(t_obj_->setSubnets(xpath, subnets));
+ EXPECT_NO_THROW_LOG(t_obj_->setSubnets(xpath, subnets));
// Get it back.
subnets.reset();
- EXPECT_NO_THROW(subnets = t_obj_->getSubnets(xpath));
+ EXPECT_NO_THROW_LOG(subnets = t_obj_->getSubnets(xpath));
ASSERT_TRUE(subnets);
ASSERT_EQ(Element::list, subnets->getType());
ASSERT_EQ(1, subnets->size());
// Add the subnet.
subnets->add(subnet);
- EXPECT_NO_THROW(t_obj_->setSubnets(xpath, subnets));
+ EXPECT_NO_THROW_LOG(t_obj_->setSubnets(xpath, subnets));
// Get it back.
subnets.reset();
- EXPECT_NO_THROW(subnets = t_obj_->getSubnets(xpath));
+ EXPECT_NO_THROW_LOG(subnets = t_obj_->getSubnets(xpath));
ASSERT_TRUE(subnets);
ASSERT_EQ(Element::list, subnets->getType());
ASSERT_EQ(1, subnets->size());
// Add the subnet.
subnets->add(subnet);
- EXPECT_NO_THROW(t_obj_->setSubnets(xpath, subnets));
+ EXPECT_NO_THROW_LOG(t_obj_->setSubnets(xpath, subnets));
// Get it back.
subnets.reset();
- EXPECT_NO_THROW(subnets = t_obj_->getSubnets(xpath));
+ EXPECT_NO_THROW_LOG(subnets = t_obj_->getSubnets(xpath));
ASSERT_TRUE(subnets);
ASSERT_EQ(Element::list, subnets->getType());
ASSERT_EQ(1, subnets->size());
sess.switchDatastore(sysrepo::Datastore::Candidate);
// Get a translator object.
boost::scoped_ptr<TranslatorBasic> t_obj;
- EXPECT_NO_THROW(t_obj.reset(new TranslatorBasic(sess, "")));
+ EXPECT_NO_THROW_LOG(t_obj.reset(new TranslatorBasic(sess, "")));
}
// Test basic YANG to JSON value conversion using sysrepo test models.
// String.
xpath = "/keatest-module:main/string";
value = "str";
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(elem = t_obj->getItem(xpath));
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(elem = t_obj->getItem(xpath));
ASSERT_TRUE(elem);
ASSERT_EQ(Element::string, elem->getType());
EXPECT_EQ("str", elem->stringValue());
// Bool.
xpath = "/keatest-module:main/boolean";
value = "true";
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(elem = t_obj->getItem(xpath));
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(elem = t_obj->getItem(xpath));
ASSERT_TRUE(elem);
ASSERT_EQ(Element::boolean, elem->getType());
EXPECT_TRUE(elem->boolValue());
xpath = "/keatest-module:main/ui8";
uint8_t u8(8);
value = to_string(u8);
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(elem = t_obj->getItem(xpath));
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(elem = t_obj->getItem(xpath));
ASSERT_TRUE(elem);
ASSERT_EQ(Element::integer, elem->getType());
EXPECT_EQ(8, elem->intValue());
xpath = "/keatest-module:main/ui16";
uint16_t u16(16);
value = to_string(u16);
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(elem = t_obj->getItem(xpath));
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(elem = t_obj->getItem(xpath));
ASSERT_TRUE(elem);
ASSERT_EQ(Element::integer, elem->getType());
EXPECT_EQ(16, elem->intValue());
xpath = "/keatest-module:main/ui32";
uint32_t u32(32);
value = to_string(u32);
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(elem = t_obj->getItem(xpath));
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(elem = t_obj->getItem(xpath));
ASSERT_TRUE(elem);
ASSERT_EQ(Element::integer, elem->getType());
EXPECT_EQ(32, elem->intValue());
xpath = "/keatest-module:main/i8";
int8_t s8(8);
value = to_string(s8);
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(elem = t_obj->getItem(xpath));
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(elem = t_obj->getItem(xpath));
ASSERT_TRUE(elem);
ASSERT_EQ(Element::integer, elem->getType());
EXPECT_EQ(8, elem->intValue());
xpath = "/keatest-module:main/i16";
int16_t s16(16);
value = to_string(s16);
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(elem = t_obj->getItem(xpath));
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(elem = t_obj->getItem(xpath));
ASSERT_TRUE(elem);
ASSERT_EQ(Element::integer, elem->getType());
EXPECT_EQ(16, elem->intValue());
xpath = "/keatest-module:main/i32";
int32_t s32(32);
value = to_string(s32);
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(elem = t_obj->getItem(xpath));
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(elem = t_obj->getItem(xpath));
ASSERT_TRUE(elem);
ASSERT_EQ(Element::integer, elem->getType());
EXPECT_EQ(32, elem->intValue());
// Identity reference.
xpath = "/keatest-module:main/id_ref";
value = "keatest-module:id_1";
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(elem = t_obj->getItem(xpath));
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(elem = t_obj->getItem(xpath));
ASSERT_TRUE(elem);
ASSERT_EQ(Element::string, elem->getType());
EXPECT_EQ("keatest-module:id_1", elem->stringValue());
// Enumeration item.
xpath = "/keatest-module:main/enum";
value = "maybe";
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(elem = t_obj->getItem(xpath));
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(elem = t_obj->getItem(xpath));
ASSERT_TRUE(elem);
ASSERT_EQ(Element::string, elem->getType());
EXPECT_EQ("maybe", elem->stringValue());
// Binary.
xpath = "/keatest-module:main/raw";
value = "Zm9vYmFy";
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(elem = t_obj->getItem(xpath));
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(elem = t_obj->getItem(xpath));
ASSERT_TRUE(elem);
ASSERT_EQ(Element::string, elem->getType());
EXPECT_EQ("foobar", elem->stringValue());
// Leaf-list: not yet exist.
xpath = "/keatest-module:main/numbers";
- EXPECT_NO_THROW(elem = t_obj->getItem(xpath));
+ EXPECT_NO_THROW_LOG(elem = t_obj->getItem(xpath));
EXPECT_FALSE(elem);
elem.reset();
// Leaf-list: 1, 2 and 3.
u8 = 1;
value = to_string(u8);
- EXPECT_NO_THROW(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
u8 = 2;
value = to_string(u8);
- EXPECT_NO_THROW(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
u8 = 3;
value = to_string(u8);
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(elem = t_obj->getItem(xpath));
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(elem = t_obj->getItem(xpath));
ASSERT_TRUE(elem);
ASSERT_EQ(Element::list, elem->getType());
EXPECT_EQ(3, elem->size());
// Unknown / unsupported.
xpath = "/keatest-module:main/dec64";
value = to_string(9.85);
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(elem = t_obj->getItem(xpath));
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(elem = t_obj->getItem(xpath));
ASSERT_TRUE(elem);
ASSERT_EQ(Element::real, elem->getType());
EXPECT_EQ("9.85", elem->str());
// String.
string str("foo");
elem = Element::create(str);
- EXPECT_NO_THROW(value = TranslatorBasic::translate(elem, LeafBaseType::String));
+ EXPECT_NO_THROW_LOG(value = TranslatorBasic::translate(elem, LeafBaseType::String));
EXPECT_EQ(elem->stringValue(), value);
// Bool.
elem = Element::create(false);
- EXPECT_NO_THROW(value = TranslatorBasic::translate(elem, LeafBaseType::Bool));
+ EXPECT_NO_THROW_LOG(value = TranslatorBasic::translate(elem, LeafBaseType::Bool));
EXPECT_EQ(elem->str(), value);
// Unsigned 8 bit integer.
elem = Element::create(123);
- EXPECT_NO_THROW(value = TranslatorBasic::translate(elem, LeafBaseType::Uint8));
+ EXPECT_NO_THROW_LOG(value = TranslatorBasic::translate(elem, LeafBaseType::Uint8));
EXPECT_EQ(elem->str(), value);
elem.reset();
// Unsigned 16 bit integer.
elem = Element::create(12345);
- EXPECT_NO_THROW(value = TranslatorBasic::translate(elem, LeafBaseType::Uint16));
+ EXPECT_NO_THROW_LOG(value = TranslatorBasic::translate(elem, LeafBaseType::Uint16));
EXPECT_EQ(elem->str(), value);
elem.reset();
// Unsigned 32 bit integer.
elem = Element::create(123456789);
- EXPECT_NO_THROW(value = TranslatorBasic::translate(elem, LeafBaseType::Uint32));
+ EXPECT_NO_THROW_LOG(value = TranslatorBasic::translate(elem, LeafBaseType::Uint32));
EXPECT_EQ(elem->str(), value);
elem.reset();
// Signed 8 bit integer.
elem = Element::create(-123);
- EXPECT_NO_THROW(value = TranslatorBasic::translate(elem, LeafBaseType::Int8));
+ EXPECT_NO_THROW_LOG(value = TranslatorBasic::translate(elem, LeafBaseType::Int8));
EXPECT_EQ(elem->str(), value);
elem.reset();
// Signed 16 bit integer.
elem = Element::create(-12345);
- EXPECT_NO_THROW(value = TranslatorBasic::translate(elem, LeafBaseType::Int16));
+ EXPECT_NO_THROW_LOG(value = TranslatorBasic::translate(elem, LeafBaseType::Int16));
EXPECT_EQ(elem->str(), value);
elem.reset();
// Signed 32 bit integer.
elem = Element::create(-123456789);
- EXPECT_NO_THROW(value = TranslatorBasic::translate(elem, LeafBaseType::Int32));
+ EXPECT_NO_THROW_LOG(value = TranslatorBasic::translate(elem, LeafBaseType::Int32));
EXPECT_EQ(elem->str(), value);
elem.reset();
// Identity reference.
elem = Element::create(str);
- EXPECT_NO_THROW(value = TranslatorBasic::translate(elem, LeafBaseType::IdentityRef));
+ EXPECT_NO_THROW_LOG(value = TranslatorBasic::translate(elem, LeafBaseType::IdentityRef));
EXPECT_EQ(elem->stringValue(), value);
// Enumeration item.
- EXPECT_NO_THROW(value = TranslatorBasic::translate(elem, LeafBaseType::Enum));
+ EXPECT_NO_THROW_LOG(value = TranslatorBasic::translate(elem, LeafBaseType::Enum));
EXPECT_EQ(elem->stringValue(), value);
// Binary.
elem = Element::create(string("foobar"));
- EXPECT_NO_THROW(value = TranslatorBasic::translate(elem, LeafBaseType::Binary));
+ EXPECT_NO_THROW_LOG(value = TranslatorBasic::translate(elem, LeafBaseType::Binary));
EXPECT_EQ("Zm9vYmFy", value);
// Decimal 64.
double d64(.1234);
elem = Element::create(d64);
- EXPECT_NO_THROW(value = TranslatorBasic::translate(elem, LeafBaseType::Dec64));
+ EXPECT_NO_THROW_LOG(value = TranslatorBasic::translate(elem, LeafBaseType::Dec64));
EXPECT_EQ(elem->str(), value);
}
optional<DataNode> data_node;
xpath = "/keatest-module:main/string";
elem = Element::create(string("str"));
- EXPECT_NO_THROW(t_obj->setItem(xpath, elem, LeafBaseType::String));
- EXPECT_NO_THROW(data_node = sess.getData(xpath));
+ EXPECT_NO_THROW_LOG(t_obj->setItem(xpath, elem, LeafBaseType::String));
+ EXPECT_NO_THROW_LOG(data_node = sess.getData(xpath));
ASSERT_TRUE(data_node);
- EXPECT_NO_THROW(data_node = data_node->findPath(xpath));
+ EXPECT_NO_THROW_LOG(data_node = data_node->findPath(xpath));
ASSERT_TRUE(data_node);
ASSERT_EQ(LeafBaseType::String, data_node->schema().asLeaf().valueType().base());
EXPECT_EQ(elem->stringValue(), string(data_node->asTerm().valueStr()));
// Bool.
xpath = "/keatest-module:main/boolean";
elem = Element::create(true);
- EXPECT_NO_THROW(t_obj->setItem(xpath, elem, LeafBaseType::Bool));
- EXPECT_NO_THROW(data_node = sess.getData(xpath));
+ EXPECT_NO_THROW_LOG(t_obj->setItem(xpath, elem, LeafBaseType::Bool));
+ EXPECT_NO_THROW_LOG(data_node = sess.getData(xpath));
ASSERT_TRUE(data_node);
- EXPECT_NO_THROW(data_node = data_node->findPath(xpath));
+ EXPECT_NO_THROW_LOG(data_node = data_node->findPath(xpath));
ASSERT_TRUE(data_node);
ASSERT_EQ(LeafBaseType::Bool, data_node->schema().asLeaf().valueType().base());
EXPECT_EQ(elem->str(), string(data_node->asTerm().valueStr()));
// Unsigned 8 bit integer.
xpath = "/keatest-module:main/ui8";
elem = Element::create(8);
- EXPECT_NO_THROW(t_obj->setItem(xpath, elem, LeafBaseType::Uint8));
- EXPECT_NO_THROW(data_node = sess.getData(xpath));
+ EXPECT_NO_THROW_LOG(t_obj->setItem(xpath, elem, LeafBaseType::Uint8));
+ EXPECT_NO_THROW_LOG(data_node = sess.getData(xpath));
ASSERT_TRUE(data_node);
- EXPECT_NO_THROW(data_node = data_node->findPath(xpath));
+ EXPECT_NO_THROW_LOG(data_node = data_node->findPath(xpath));
ASSERT_TRUE(data_node);
ASSERT_EQ(LeafBaseType::Uint8, data_node->schema().asLeaf().valueType().base());
EXPECT_EQ(elem->str(), string(data_node->asTerm().valueStr()));
// Unsigned 16 bit integer.
xpath = "/keatest-module:main/ui16";
elem = Element::create(16);
- EXPECT_NO_THROW(t_obj->setItem(xpath, elem, LeafBaseType::Uint16));
- EXPECT_NO_THROW(data_node = sess.getData(xpath));
+ EXPECT_NO_THROW_LOG(t_obj->setItem(xpath, elem, LeafBaseType::Uint16));
+ EXPECT_NO_THROW_LOG(data_node = sess.getData(xpath));
ASSERT_TRUE(data_node);
- EXPECT_NO_THROW(data_node = data_node->findPath(xpath));
+ EXPECT_NO_THROW_LOG(data_node = data_node->findPath(xpath));
ASSERT_TRUE(data_node);
ASSERT_EQ(LeafBaseType::Uint16, data_node->schema().asLeaf().valueType().base());
EXPECT_EQ(elem->str(), string(data_node->asTerm().valueStr()));
// Unsigned 32 bit integer.
xpath = "/keatest-module:main/ui32";
elem = Element::create(32);
- EXPECT_NO_THROW(t_obj->setItem(xpath, elem, LeafBaseType::Uint32));
- EXPECT_NO_THROW(data_node = sess.getData(xpath));
+ EXPECT_NO_THROW_LOG(t_obj->setItem(xpath, elem, LeafBaseType::Uint32));
+ EXPECT_NO_THROW_LOG(data_node = sess.getData(xpath));
ASSERT_TRUE(data_node);
- EXPECT_NO_THROW(data_node = data_node->findPath(xpath));
+ EXPECT_NO_THROW_LOG(data_node = data_node->findPath(xpath));
ASSERT_TRUE(data_node);
ASSERT_EQ(LeafBaseType::Uint32, data_node->schema().asLeaf().valueType().base());
EXPECT_EQ(elem->str(), string(data_node->asTerm().valueStr()));
// Signed 8 bit integer.
xpath = "/keatest-module:main/i8";
elem = Element::create(8);
- EXPECT_NO_THROW(t_obj->setItem(xpath, elem, LeafBaseType::Int8));
- EXPECT_NO_THROW(data_node = sess.getData(xpath));
+ EXPECT_NO_THROW_LOG(t_obj->setItem(xpath, elem, LeafBaseType::Int8));
+ EXPECT_NO_THROW_LOG(data_node = sess.getData(xpath));
ASSERT_TRUE(data_node);
- EXPECT_NO_THROW(data_node = data_node->findPath(xpath));
+ EXPECT_NO_THROW_LOG(data_node = data_node->findPath(xpath));
ASSERT_TRUE(data_node);
ASSERT_EQ(LeafBaseType::Int8, data_node->schema().asLeaf().valueType().base());
EXPECT_EQ(elem->str(), string(data_node->asTerm().valueStr()));
// Signed 16 bit integer.
xpath = "/keatest-module:main/i16";
elem = Element::create(16);
- EXPECT_NO_THROW(t_obj->setItem(xpath, elem, LeafBaseType::Int16));
- EXPECT_NO_THROW(data_node = sess.getData(xpath));
+ EXPECT_NO_THROW_LOG(t_obj->setItem(xpath, elem, LeafBaseType::Int16));
+ EXPECT_NO_THROW_LOG(data_node = sess.getData(xpath));
ASSERT_TRUE(data_node);
- EXPECT_NO_THROW(data_node = data_node->findPath(xpath));
+ EXPECT_NO_THROW_LOG(data_node = data_node->findPath(xpath));
ASSERT_TRUE(data_node);
ASSERT_EQ(LeafBaseType::Int16, data_node->schema().asLeaf().valueType().base());
EXPECT_EQ(elem->str(), string(data_node->asTerm().valueStr()));
// Signed 32 bit integer.
xpath = "/keatest-module:main/i32";
elem = Element::create(32);
- EXPECT_NO_THROW(t_obj->setItem(xpath, elem, LeafBaseType::Int32));
- EXPECT_NO_THROW(data_node = sess.getData(xpath));
+ EXPECT_NO_THROW_LOG(t_obj->setItem(xpath, elem, LeafBaseType::Int32));
+ EXPECT_NO_THROW_LOG(data_node = sess.getData(xpath));
ASSERT_TRUE(data_node);
- EXPECT_NO_THROW(data_node = data_node->findPath(xpath));
+ EXPECT_NO_THROW_LOG(data_node = data_node->findPath(xpath));
ASSERT_TRUE(data_node);
ASSERT_EQ(LeafBaseType::Int32, data_node->schema().asLeaf().valueType().base());
EXPECT_EQ(elem->str(), string(data_node->asTerm().valueStr()));
// Identity reference.
xpath = "/keatest-module:main/id_ref";
elem = Element::create(string("keatest-module:id_1"));
- EXPECT_NO_THROW(t_obj->setItem(xpath, elem, LeafBaseType::IdentityRef));
- EXPECT_NO_THROW(data_node = sess.getData(xpath));
+ EXPECT_NO_THROW_LOG(t_obj->setItem(xpath, elem, LeafBaseType::IdentityRef));
+ EXPECT_NO_THROW_LOG(data_node = sess.getData(xpath));
ASSERT_TRUE(data_node);
- EXPECT_NO_THROW(data_node = data_node->findPath(xpath));
+ EXPECT_NO_THROW_LOG(data_node = data_node->findPath(xpath));
ASSERT_TRUE(data_node);
ASSERT_EQ(LeafBaseType::IdentityRef, data_node->schema().asLeaf().valueType().base());
EXPECT_EQ(elem->stringValue(), string(data_node->asTerm().valueStr()));
// Enumeration item.
xpath = "/keatest-module:main/enum";
elem = Element::create(string("maybe"));
- EXPECT_NO_THROW(t_obj->setItem(xpath, elem, LeafBaseType::Enum));
- EXPECT_NO_THROW(data_node = sess.getData(xpath));
+ EXPECT_NO_THROW_LOG(t_obj->setItem(xpath, elem, LeafBaseType::Enum));
+ EXPECT_NO_THROW_LOG(data_node = sess.getData(xpath));
ASSERT_TRUE(data_node);
- EXPECT_NO_THROW(data_node = data_node->findPath(xpath));
+ EXPECT_NO_THROW_LOG(data_node = data_node->findPath(xpath));
ASSERT_TRUE(data_node);
ASSERT_EQ(LeafBaseType::Enum, data_node->schema().asLeaf().valueType().base());
EXPECT_EQ(elem->stringValue(), string(data_node->asTerm().valueStr()));
// Binary.
xpath = "/keatest-module:main/raw";
elem = Element::create(string("foobar"));
- EXPECT_NO_THROW(t_obj->setItem(xpath, elem, LeafBaseType::Binary));
- EXPECT_NO_THROW(data_node = sess.getData(xpath));
+ EXPECT_NO_THROW_LOG(t_obj->setItem(xpath, elem, LeafBaseType::Binary));
+ EXPECT_NO_THROW_LOG(data_node = sess.getData(xpath));
ASSERT_TRUE(data_node);
- EXPECT_NO_THROW(data_node = data_node->findPath(xpath));
+ EXPECT_NO_THROW_LOG(data_node = data_node->findPath(xpath));
ASSERT_TRUE(data_node);
ASSERT_EQ(LeafBaseType::Binary, data_node->schema().asLeaf().valueType().base());
EXPECT_EQ("Zm9vYmFy", string(data_node->asTerm().valueStr()));
xpath = "/keatest-module:main/dec64";
double d64(9.85);
elem = Element::create(d64);
- EXPECT_NO_THROW(t_obj->setItem(xpath, elem, LeafBaseType::Dec64));
- EXPECT_NO_THROW(data_node = sess.getData(xpath));
+ EXPECT_NO_THROW_LOG(t_obj->setItem(xpath, elem, LeafBaseType::Dec64));
+ EXPECT_NO_THROW_LOG(data_node = sess.getData(xpath));
ASSERT_TRUE(data_node);
- EXPECT_NO_THROW(data_node = data_node->findPath(xpath));
+ EXPECT_NO_THROW_LOG(data_node = data_node->findPath(xpath));
ASSERT_TRUE(data_node);
ASSERT_EQ(LeafBaseType::Dec64, data_node->schema().asLeaf().valueType().base());
EXPECT_EQ(elem->str(), string(data_node->asTerm().valueStr()));
// Leaf-list.
xpath = "/keatest-module:main/numbers";
- EXPECT_NO_THROW(t_obj->setItem(xpath, Element::fromJSON("1"), LeafBaseType::Uint8));
- EXPECT_NO_THROW(t_obj->setItem(xpath, Element::fromJSON("2"), LeafBaseType::Uint8));
- EXPECT_NO_THROW(t_obj->setItem(xpath, Element::fromJSON("3"), LeafBaseType::Uint8));
+ EXPECT_NO_THROW_LOG(t_obj->setItem(xpath, Element::fromJSON("1"), LeafBaseType::Uint8));
+ EXPECT_NO_THROW_LOG(t_obj->setItem(xpath, Element::fromJSON("2"), LeafBaseType::Uint8));
+ EXPECT_NO_THROW_LOG(t_obj->setItem(xpath, Element::fromJSON("3"), LeafBaseType::Uint8));
ElementPtr got(t_obj->getItem(xpath));
ASSERT_EQ(LeafBaseType::Dec64, data_node->schema().asLeaf().valueType().base());
EXPECT_EQ("[ 1, 2, 3 ]", got->str());
// Clean it.
- EXPECT_NO_THROW(t_obj->deleteItem(xpath));
- EXPECT_NO_THROW(data_node = sess.getData(xpath));
+ EXPECT_NO_THROW_LOG(t_obj->deleteItem(xpath));
+ EXPECT_NO_THROW_LOG(data_node = sess.getData(xpath));
EXPECT_FALSE(data_node);
data_node.reset();
// Delete (twice).
xpath = "/keatest-module:main/string";
- EXPECT_NO_THROW(data_node = sess.getData(xpath));
+ EXPECT_NO_THROW_LOG(data_node = sess.getData(xpath));
EXPECT_TRUE(data_node);
- EXPECT_NO_THROW(data_node = data_node->findPath(xpath));
+ EXPECT_NO_THROW_LOG(data_node = data_node->findPath(xpath));
EXPECT_TRUE(data_node);
ASSERT_TRUE(NodeType::Leaf == data_node->schema().nodeType());
EXPECT_EQ("true", data_node->asTerm().valueStr());
- EXPECT_NO_THROW(t_obj->deleteItem(xpath));
+ EXPECT_NO_THROW_LOG(t_obj->deleteItem(xpath));
EXPECT_NO_THROW_LOG(data_node = sess.getData(xpath));
EXPECT_FALSE(data_node);
- EXPECT_NO_THROW(t_obj->deleteItem(xpath));
+ EXPECT_NO_THROW_LOG(t_obj->deleteItem(xpath));
EXPECT_NO_THROW_LOG(data_node = sess.getData(xpath));
EXPECT_FALSE(data_node);
}
// Empty list.
ElementPtr element;
- EXPECT_NO_THROW(element = t_obj->getItem("/keatest-module:container/list"));
+ EXPECT_NO_THROW_LOG(element = t_obj->getItem("/keatest-module:container/list"));
EXPECT_FALSE(element);
element.reset();
// Retried with a filled list.
xpath = "/keatest-module:container/list[key1='key1'][key2='key2']/leaf";
element = Element::create("Leaf value");
- EXPECT_NO_THROW(t_obj->setItem(xpath, element, LeafBaseType::String));
- EXPECT_NO_THROW(element = t_obj->getItem("/keatest-module:container/list"));
+ EXPECT_NO_THROW_LOG(t_obj->setItem(xpath, element, LeafBaseType::String));
+ EXPECT_NO_THROW_LOG(element = t_obj->getItem("/keatest-module:container/list"));
EXPECT_FALSE(element);
- EXPECT_NO_THROW(element = t_obj->getItem("/keatest-module:container/list[key1='key1'][key2='key2']"));
+ EXPECT_NO_THROW_LOG(element = t_obj->getItem("/keatest-module:container/list[key1='key1'][key2='key2']"));
EXPECT_FALSE(element);
}
sess.switchDatastore(sysrepo::Datastore::Candidate);
// Cleanup.
- EXPECT_NO_THROW(sess.deleteItem("/keatest-module:container"));
- EXPECT_NO_THROW(sess.applyChanges());
- EXPECT_NO_THROW(sess.deleteItem("/keatest-module:main"));
- EXPECT_NO_THROW(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.deleteItem("/keatest-module:container"));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.deleteItem("/keatest-module:main"));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
// Fill the test module.
string xpath;
xpath = "/keatest-module:main/string";
value = "str";
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
xpath = "/keatest-module:main/boolean";
value = "true";
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
xpath = "/keatest-module:main/ui8";
uint8_t u8(8);
value = to_string(u8);
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
xpath = "/keatest-module:main/ui16";
uint16_t u16(16);
value = to_string(u16);
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
xpath = "/keatest-module:main/ui32";
uint32_t u32(32);
value = to_string(u32);
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
xpath = "/keatest-module:main/i8";
int8_t s8(8);
value = to_string(s8);
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
xpath = "/keatest-module:main/i16";
int16_t s16(16);
value = to_string(s16);
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
xpath = "/keatest-module:main/i32";
int32_t s32(32);
value = to_string(s32);
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
xpath = "/keatest-module:main/id_ref";
value = "keatest-module:id_1";
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
xpath = "/keatest-module:main/enum";
value = "maybe";
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
// Binary.
xpath = "/keatest-module:main/raw";
value = "Zm9vYmFy";
- EXPECT_NO_THROW(sess.setItem(xpath, value));
- EXPECT_NO_THROW(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.setItem(xpath, value));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
// Get it.
YangRepr repr(testModel);
YRTree tree;
- EXPECT_NO_THROW(tree = repr.get(sess));
+ EXPECT_NO_THROW_LOG(tree = repr.get(sess));
// Verify.
EXPECT_TRUE(repr.verify(testTree, sess, cerr));
sess.switchDatastore(sysrepo::Datastore::Candidate);
// Cleanup.
- EXPECT_NO_THROW(sess.deleteItem("/keatest-module:container"));
- EXPECT_NO_THROW(sess.applyChanges());
- EXPECT_NO_THROW(sess.deleteItem("/keatest-module:main"));
- EXPECT_NO_THROW(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.deleteItem("/keatest-module:container"));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.deleteItem("/keatest-module:main"));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
// Get it.
YangRepr repr(testModel);
YRTree tree;
- EXPECT_NO_THROW(repr.set(testTree, sess));
+ EXPECT_NO_THROW_LOG(repr.set(testTree, sess));
// Verify.
EXPECT_TRUE(repr.verify(testTree, sess, cerr));
sess.switchDatastore(sysrepo::Datastore::Candidate);
// Cleanup.
- EXPECT_NO_THROW(sess.deleteItem("/keatest-module:container"));
- EXPECT_NO_THROW(sess.applyChanges());
- EXPECT_NO_THROW(sess.deleteItem("/keatest-module:main"));
- EXPECT_NO_THROW(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.deleteItem("/keatest-module:container"));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
+ EXPECT_NO_THROW_LOG(sess.deleteItem("/keatest-module:main"));
+ EXPECT_NO_THROW_LOG(sess.applyChanges());
// Set the module content.
YangRepr repr(testModel);
- EXPECT_NO_THROW(repr.set(testTree, sess));
+ EXPECT_NO_THROW_LOG(repr.set(testTree, sess));
// Verify it.
EXPECT_TRUE(repr.verify(testTree, sess, cerr));
/// @param model name of the model to be verified against.
/// @param tree tree to be verified.
void sanityCheckConfig(const std::string& model, const YRTree& tree) {
+ SCOPED_TRACE("\n* Tested model: " + model);
SysrepoSetup::cleanSharedMemory();
// Get a translator object to play with.
if (model == IETF_DHCPV6_SERVER) {
toplevel_node = "server";
}
- EXPECT_NO_THROW(translator.deleteItem("/" + model + ":" + toplevel_node));
+ EXPECT_NO_THROW_LOG(translator.deleteItem("/" + model + ":" + toplevel_node));
}
// Get it.
YangRepr repr(model);
- EXPECT_NO_THROW(repr.set(tree, sess))
- << " for model " << model;
+ EXPECT_NO_THROW_LOG(repr.set(tree, sess));
bool result = false;
- EXPECT_NO_THROW(result = repr.verify(tree, sess, cerr))
- << " for model " << model;
- EXPECT_TRUE(result)
- << " for model " << model;
+ EXPECT_NO_THROW_LOG(result = repr.verify(tree, sess, cerr));
+ EXPECT_TRUE(result);
}
// This is test environment sanity check. It verifies that all configuration
projects / thirdparty / kea.git / commitdiff
