commit 70e5456b334c6076bc593d827279fec9d0f72166
author Tomáš Pecka <tomas.pecka@cesnet.cz> Wed Mar 10 12:39:03 2021 +0100
committer Tomáš Pecka <tomas.pecka@cesnet.cz> Tue Apr 13 11:38:38 2021 +0200
tree 3bd876c4aa9c4147e3bb8c11369333157a522bbb
parent b29f36bc44ec5eb363e2eb941c1c4132e7376691

system: Implement interface statistics in IETFInterfaces

The YANG model ietf-interfaces [1] models interface statistics. This
commit implements some of the interface statistics that are available
via libnl.

Also require newer sysrepo. This version fixes deadlock between push and
pull ops data manipulation from multiple threads [2].

[1] https://tools.ietf.org/html/rfc8343
[2] https://github.com/sysrepo/sysrepo/issues/2375

Bug: https://github.com/sysrepo/sysrepo/issues/2375
Change-Id: I6daa798af25181cb49cb199631f853520c0e91ce

src/system/IETFInterfaces.cpp

diff --git a/src/system/IETFInterfaces.cpp b/src/system/IETFInterfaces.cpp
index 23a636d..d82f5e5 100644
--- a/src/system/IETFInterfaces.cpp
+++ b/src/system/IETFInterfaces.cpp
@@ -125,6 +125,7 @@
 
 IETFInterfaces::IETFInterfaces(std::shared_ptr<::sysrepo::Session> srSess)
     : m_srSession(std::move(srSess))
+    , m_srSubscribe(std::make_shared<::sysrepo::Subscribe>(m_srSession))
     , m_log(spdlog::get("system"))
     , m_rtnetlink(std::make_shared<Rtnetlink>(
           [this](rtnl_link* link, int action) { onLinkUpdate(link, action); },
@@ -137,6 +138,25 @@
 
     m_rtnetlink->invokeInitialCallbacks();
     // TODO: Implement /ietf-routing:routing/interfaces and /ietf-routing:routing/router-id
+
+    m_srSubscribe->oper_get_items_subscribe(
+        IETF_INTERFACES_MODULE_NAME.c_str(), [this](auto session, auto, auto, auto, auto, auto& parent) {
+            std::map<std::string, std::string> values;
+            for (const auto& link : m_rtnetlink->getLinks()) {
+                const auto yangPrefix = IETF_INTERFACES + "/interface[name='" + rtnl_link_get_name(link.get()) + "']/statistics";
+
+                values[yangPrefix + "/in-octets"] = std::to_string(rtnl_link_get_stat(link.get(), RTNL_LINK_RX_BYTES));
+                values[yangPrefix + "/out-octets"] = std::to_string(rtnl_link_get_stat(link.get(), RTNL_LINK_TX_BYTES));
+                values[yangPrefix + "/in-discards"] = std::to_string(rtnl_link_get_stat(link.get(), RTNL_LINK_RX_DROPPED));
+                values[yangPrefix + "/out-discards"] = std::to_string(rtnl_link_get_stat(link.get(), RTNL_LINK_TX_DROPPED));
+                values[yangPrefix + "/in-errors"] = std::to_string(rtnl_link_get_stat(link.get(), RTNL_LINK_RX_ERRORS));
+                values[yangPrefix + "/out-errors"] = std::to_string(rtnl_link_get_stat(link.get(), RTNL_LINK_TX_ERRORS));
+            }
+
+            utils::valuesToYang(values, {}, session, parent);
+            return SR_ERR_OK;
+        },
+        (IETF_INTERFACES + "/interface/statistics").c_str());
 }
 
 void IETFInterfaces::onLinkUpdate(rtnl_link* link, int action)