Merge branch 'telekom:refactor' into refactor

telekom · Oct 7, 2022 · ac465f8 · ac465f8
2 parents 2cb5bb0 + 6637c83
commit ac465f8
Show file tree

Hide file tree

Showing 24 changed files with 413 additions and 120 deletions.
diff --git a/src/interfaces/src/main.c b/src/interfaces/src/main.c
@@ -5,6 +5,8 @@
 #include "plugin.h"
 #include "plugin/common.h"
 
+#include <srpc.h>
+
 volatile int exit_application = 0;
 
 static void sigint_handler(__attribute__((unused)) int signum);
@@ -19,23 +21,11 @@ int main(void)
     sr_log_stderr(SR_LL_INF);
 
     /* connect to sysrepo */
-    error = sr_connect(SR_CONN_DEFAULT, &connection);
-    if (error) {
-        SRPLG_LOG_ERR(PLUGIN_NAME, "sr_connect error (%d): %s", error, sr_strerror(error));
-        goto out;
-    }
+    SRPC_SAFE_CALL_ERR(error, sr_connect(SR_CONN_DEFAULT, &connection), out);
+    SRPC_SAFE_CALL_ERR(error, sr_session_start(connection, SR_DS_RUNNING, &session), out);
 
-    error = sr_session_start(connection, SR_DS_RUNNING, &session);
-    if (error) {
-        SRPLG_LOG_ERR(PLUGIN_NAME, "sr_session_start error (%d): %s", error, sr_strerror(error));
-        goto out;
-    }
-
-    error = sr_plugin_init_cb(session, &private_data);
-    if (error) {
-        SRPLG_LOG_ERR(PLUGIN_NAME, "sr_plugin_init_cb error");
-        goto out;
-    }
+    /* init plugin */
+    SRPC_SAFE_CALL_ERR(error, sr_plugin_init_cb(session, &private_data), out);
 
     /* loop until ctrl-c is pressed / SIGINT is received */
     signal(SIGINT, sigint_handler);
@@ -45,6 +35,7 @@ int main(void)
     }
 
 out:
+    /* cleanup plugin */
     sr_plugin_cleanup_cb(session, private_data);
     sr_disconnect(connection);
 

diff --git a/src/interfaces/src/plugin.c b/src/interfaces/src/plugin.c
@@ -276,20 +276,15 @@ int sr_plugin_init_cb(sr_session_ctx_t* running_session, void** private_data)
         },
     };
 
-    connection = sr_session_get_connection(running_session);
-    error = sr_session_start(connection, SR_DS_STARTUP, &startup_session);
-    if (error) {
-        SRPLG_LOG_ERR(PLUGIN_NAME, "sr_session_start() error (%d): %s", error, sr_strerror(error));
-        goto error_out;
-    }
+    // get connection
+    SRPC_SAFE_CALL_PTR(connection, sr_session_get_connection(running_session), error_out);
+
+    // start a session
+    SRPC_SAFE_CALL_ERR(error, sr_session_start(connection, SR_DS_STARTUP, &startup_session), error_out);
 
     ctx->startup_session = startup_session;
 
-    error = srpc_check_empty_datastore(startup_session, INTERFACES_INTERFACES_INTERFACE_YANG_PATH, &empty_startup);
-    if (error) {
-        SRPLG_LOG_ERR(PLUGIN_NAME, "Failed checking datastore contents: %d", error);
-        goto error_out;
-    }
+    SRPC_SAFE_CALL_ERR(error, srpc_check_empty_datastore(startup_session, INTERFACES_INTERFACES_INTERFACE_YANG_PATH, &empty_startup), error_out);
 
     if (empty_startup) {
         SRPLG_LOG_INF(PLUGIN_NAME, "Startup datastore is empty");
@@ -338,7 +333,7 @@ int sr_plugin_init_cb(sr_session_ctx_t* running_session, void** private_data)
         if (op->cb) {
             error = sr_oper_get_subscribe(running_session, op->module, op->path, op->cb, *private_data, SR_SUBSCR_DEFAULT, &subscription);
             if (error) {
-                SRPLG_LOG_ERR(PLUGIN_NAME, "sr_oper_get_subscribe() error (%d): %s", error, sr_strerror(error));
+                SRPLG_LOG_ERR(PLUGIN_NAME, "sr_oper_get_subscribe() error for \"%s\" (%d): %s", op->path, error, sr_strerror(error));
                 goto error_out;
             }
         }

diff --git a/src/interfaces/src/plugin/api/interfaces/change.c b/src/interfaces/src/plugin/api/interfaces/change.c
@@ -1,4 +1,5 @@
 #include "change.h"
+#include "netlink/route/addr.h"
 #include "plugin/common.h"
 #include "plugin/context.h"
 
@@ -25,6 +26,9 @@ int interfaces_change_interface_init(void* priv)
     // allocate link cache
     SRPC_SAFE_CALL_ERR(error, rtnl_link_alloc_cache(mod_ctx->nl_ctx.socket, AF_UNSPEC, &mod_ctx->nl_ctx.link_cache), error_out);
 
+    // allocate address cache
+    SRPC_SAFE_CALL_ERR(error, rtnl_addr_alloc_cache(mod_ctx->nl_ctx.socket, &mod_ctx->nl_ctx.addr_cache), error_out);
+
     goto out;
 
 error_out:
@@ -91,6 +95,11 @@ void interfaces_change_interface_free(void* priv)
     if (mod_ctx->nl_ctx.link_cache) {
         nl_cache_put(mod_ctx->nl_ctx.link_cache);
     }
+
+    if (mod_ctx->nl_ctx.addr_cache) {
+        nl_cache_put(mod_ctx->nl_ctx.addr_cache);
+    }
+
     if (mod_ctx->nl_ctx.socket) {
         nl_socket_free(mod_ctx->nl_ctx.socket);
     }

diff --git a/src/interfaces/src/plugin/api/interfaces/interface/carrier-delay/change.c b/src/interfaces/src/plugin/api/interfaces/interface/carrier-delay/change.c
@@ -9,7 +9,7 @@ int interfaces_interface_carrier_delay_change_up(void* priv, sr_session_ctx_t* s
     const char* node_name = LYD_NAME(change_ctx->node);
     const char* node_value = lyd_get_value(change_ctx->node);
 
-    SRPLG_LOG_DBG(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
+    SRPLG_LOG_INF(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
 
     switch (change_ctx->operation) {
     case SR_OP_CREATED:
@@ -31,7 +31,7 @@ int interfaces_interface_carrier_delay_change_down(void* priv, sr_session_ctx_t*
     const char* node_name = LYD_NAME(change_ctx->node);
     const char* node_value = lyd_get_value(change_ctx->node);
 
-    SRPLG_LOG_DBG(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
+    SRPLG_LOG_INF(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
 
     switch (change_ctx->operation) {
     case SR_OP_CREATED:

diff --git a/src/interfaces/src/plugin/api/interfaces/interface/change.c b/src/interfaces/src/plugin/api/interfaces/interface/change.c
@@ -134,6 +134,7 @@ int interfaces_interface_change_enabled(void* priv, sr_session_ctx_t* session, c
         // set name
         rtnl_link_set_name(request_link, interface_name_buffer);
         rtnl_link_set_type(request_link, rtnl_link_get_type(current_link));
+
         // set operstate
         rtnl_link_set_flags(request_link, (strcmp(node_value, "true") == 0) ? (unsigned int)rtnl_link_str2flags("up") : (unsigned int)rtnl_link_str2flags("down"));
         rtnl_link_unset_flags(request_link, (strcmp(node_value, "true") == 0) ? (unsigned int)rtnl_link_str2flags("down") : (unsigned int)rtnl_link_str2flags("up"));

diff --git a/src/interfaces/src/plugin/api/interfaces/interface/dampening/change.c b/src/interfaces/src/plugin/api/interfaces/interface/dampening/change.c
@@ -9,7 +9,7 @@ int interfaces_interface_dampening_change_max_suppress_time(void* priv, sr_sessi
     const char* node_name = LYD_NAME(change_ctx->node);
     const char* node_value = lyd_get_value(change_ctx->node);
 
-    SRPLG_LOG_DBG(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
+    SRPLG_LOG_INF(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
 
     switch (change_ctx->operation) {
     case SR_OP_CREATED:
@@ -31,7 +31,7 @@ int interfaces_interface_dampening_change_suppress(void* priv, sr_session_ctx_t*
     const char* node_name = LYD_NAME(change_ctx->node);
     const char* node_value = lyd_get_value(change_ctx->node);
 
-    SRPLG_LOG_DBG(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
+    SRPLG_LOG_INF(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
 
     switch (change_ctx->operation) {
     case SR_OP_CREATED:
@@ -53,7 +53,7 @@ int interfaces_interface_dampening_change_reuse(void* priv, sr_session_ctx_t* se
     const char* node_name = LYD_NAME(change_ctx->node);
     const char* node_value = lyd_get_value(change_ctx->node);
 
-    SRPLG_LOG_DBG(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
+    SRPLG_LOG_INF(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
 
     switch (change_ctx->operation) {
     case SR_OP_CREATED:
@@ -75,7 +75,7 @@ int interfaces_interface_dampening_change_half_life(void* priv, sr_session_ctx_t
     const char* node_name = LYD_NAME(change_ctx->node);
     const char* node_value = lyd_get_value(change_ctx->node);
 
-    SRPLG_LOG_DBG(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
+    SRPLG_LOG_INF(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
 
     switch (change_ctx->operation) {
     case SR_OP_CREATED:

diff --git a/...nterfaces/src/plugin/api/interfaces/interface/encapsulation/dot1q-vlan/outer-tag/change.c b/...nterfaces/src/plugin/api/interfaces/interface/encapsulation/dot1q-vlan/outer-tag/change.c
@@ -9,7 +9,7 @@ int interfaces_interface_encapsulation_dot1q_vlan_outer_tag_change_vlan_id(void*
     const char* node_name = LYD_NAME(change_ctx->node);
     const char* node_value = lyd_get_value(change_ctx->node);
 
-    SRPLG_LOG_DBG(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
+    SRPLG_LOG_INF(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
 
     switch (change_ctx->operation) {
     case SR_OP_CREATED:
@@ -31,7 +31,7 @@ int interfaces_interface_encapsulation_dot1q_vlan_outer_tag_change_tag_type(void
     const char* node_name = LYD_NAME(change_ctx->node);
     const char* node_value = lyd_get_value(change_ctx->node);
 
-    SRPLG_LOG_DBG(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
+    SRPLG_LOG_INF(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
 
     switch (change_ctx->operation) {
     case SR_OP_CREATED:

diff --git a/...terfaces/src/plugin/api/interfaces/interface/encapsulation/dot1q-vlan/second-tag/change.c b/...terfaces/src/plugin/api/interfaces/interface/encapsulation/dot1q-vlan/second-tag/change.c
@@ -9,7 +9,7 @@ int interfaces_interface_encapsulation_dot1q_vlan_second_tag_change_vlan_id(void
     const char* node_name = LYD_NAME(change_ctx->node);
     const char* node_value = lyd_get_value(change_ctx->node);
 
-    SRPLG_LOG_DBG(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
+    SRPLG_LOG_INF(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
 
     switch (change_ctx->operation) {
     case SR_OP_CREATED:
@@ -31,7 +31,7 @@ int interfaces_interface_encapsulation_dot1q_vlan_second_tag_change_tag_type(voi
     const char* node_name = LYD_NAME(change_ctx->node);
     const char* node_value = lyd_get_value(change_ctx->node);
 
-    SRPLG_LOG_DBG(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
+    SRPLG_LOG_INF(PLUGIN_NAME, "Node Name: %s; Previous Value: %s, Value: %s; Operation: %d", node_name, change_ctx->previous_value, node_value, change_ctx->operation);
 
     switch (change_ctx->operation) {
     case SR_OP_CREATED: