Commit d4421125 authored by Francis Dupont's avatar Francis Dupont

[153-netconf-agent] Updates (include !94)

parent 8245b37b
......@@ -106,6 +106,9 @@ NetconfAgent::~NetconfAgent() {
void
NetconfAgent::init(NetconfCfgMgrPtr cfg_mgr) {
if (NetconfProcess::global_shut_down_flag) {
return;
}
const CfgServersMapPtr& servers =
cfg_mgr->getNetconfConfig()->getCfgServersMap();
for (auto pair : *servers) {
......@@ -113,11 +116,17 @@ NetconfAgent::init(NetconfCfgMgrPtr cfg_mgr) {
return;
}
keaConfig(pair);
if (NetconfProcess::global_shut_down_flag) {
return;
}
}
if (NetconfProcess::global_shut_down_flag) {
return;
}
initSysrepo();
if (NetconfProcess::global_shut_down_flag) {
return;
}
for (auto pair : *servers) {
if (NetconfProcess::global_shut_down_flag) {
return;
......@@ -127,6 +136,9 @@ NetconfAgent::init(NetconfCfgMgrPtr cfg_mgr) {
return;
}
subscribe(pair);
if (NetconfProcess::global_shut_down_flag) {
return;
}
}
}
......
......@@ -144,12 +144,12 @@ public:
/// @brief Destructor.
virtual ~NetconfAgentTest() {
NetconfProcess::global_shut_down_flag = true;
io_service_->stop();
io_service_.reset();
if (thread_) {
thread_->wait();
thread_.reset();
}
io_service_->stop();
io_service_.reset();
if (agent_) {
clearYang(agent_);
agent_->clear();
......@@ -230,12 +230,12 @@ public:
/// @brief Destructor.
virtual ~NetconfAgentLogTest() {
NetconfProcess::global_shut_down_flag = true;
io_service_->stop();
io_service_.reset();
if (thread_) {
thread_->wait();
thread_.reset();
}
io_service_->stop();
io_service_.reset();
if (agent_) {
clearYang(agent_);
agent_->clear();
......@@ -822,7 +822,7 @@ TEST_F(NetconfAgentTest, subscribe) {
EXPECT_NO_THROW(agent_->subscriptions_.clear());
}
/// Verifies the update method works as expected: apply new YNAG configuration
/// Verifies the update method works as expected: apply new YANG configuration
/// to the server. Note it is called by the subscription callback.
TEST_F(NetconfAgentTest, update) {
// Initial YANG configuration.
......@@ -963,7 +963,7 @@ TEST_F(NetconfAgentTest, update) {
EXPECT_TRUE(expected->equals(*pruned));
}
/// Verifies the validate method works as expected: test new YNAG configuration
/// Verifies the validate method works as expected: test new YANG configuration
/// with the server. Note it is called by the subscription callback and
/// update is called after.
TEST_F(NetconfAgentTest, validate) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment