northd: Add I-P for NB_Global and SB_Global.

A new engine node "global_config" is added which handles the changes to NB_Global an SB_Global tables. It also creates these rows if not present. Without the I-P, any changes to the options column of these tables result in recompute of 'northd' and 'lflow' engine nodes. Signed-off-by: Numan Siddique <[email protected]>
hzhou8 · Nov 14, 2023 · c6f336e · c6f336e
1 parent a7d65d4
commit c6f336e
Show file tree

Hide file tree

Showing 12 changed files with 1,014 additions and 297 deletions.
diff --git a/northd/aging.c b/northd/aging.c
@@ -15,6 +15,7 @@
 
 #include <config.h>
 
+#include "en-global-config.h"
 #include "lib/inc-proc-eng.h"
 #include "lib/ovn-nb-idl.h"
 #include "lib/ovn-sb-idl.h"
@@ -100,15 +101,10 @@ aging_context_handle_timestamp(struct aging_context *ctx, int64_t timestamp)
 static uint32_t
 get_removal_limit(struct engine_node *node, const char *name)
 {
-    const struct nbrec_nb_global_table *nb_global_table =
-            EN_OVSDB_GET(engine_get_input("NB_nb_global", node));
-    const struct nbrec_nb_global *nb =
-            nbrec_nb_global_table_first(nb_global_table);
-    if (!nb) {
-        return 0;
-    }
+    struct ed_type_global_config *global_config =
+        engine_get_input_data("global_config", node);
 
-    return smap_get_uint(&nb->options, name, 0);
+    return smap_get_uint(&global_config->nb_options, name, 0);
 }
 
 /* MAC binding aging */
@@ -142,11 +138,14 @@ en_mac_binding_aging_run(struct engine_node *node, void *data OVS_UNUSED)
 {
     const struct engine_context *eng_ctx = engine_get_context();
     struct northd_data *northd_data = engine_get_input_data("northd", node);
+    struct ed_type_global_config *global_config =
+        engine_get_input_data("global_config", node);
+
     struct aging_waker *waker =
         engine_get_input_data("mac_binding_aging_waker", node);
 
     if (!eng_ctx->ovnsb_idl_txn ||
-        !northd_data->features.mac_binding_timestamp ||
+        !global_config->features.mac_binding_timestamp ||
         time_msec() < waker->next_wake_msec) {
         return;
     }
@@ -271,9 +270,11 @@ en_fdb_aging_run(struct engine_node *node, void *data OVS_UNUSED)
     const struct engine_context *eng_ctx = engine_get_context();
     struct northd_data *northd_data = engine_get_input_data("northd", node);
     struct aging_waker *waker = engine_get_input_data("fdb_aging_waker", node);
+    struct ed_type_global_config *global_config =
+        engine_get_input_data("global_config", node);
 
     if (!eng_ctx->ovnsb_idl_txn ||
-        !northd_data->features.fdb_timestamp ||
+        !global_config->features.fdb_timestamp ||
         time_msec() < waker->next_wake_msec) {
         return;
     }

diff --git a/northd/automake.mk b/northd/automake.mk
@@ -8,6 +8,8 @@ northd_ovn_northd_SOURCES = \
 	northd/northd.c \
 	northd/northd.h \
 	northd/ovn-northd.c \
+	northd/en-global-config.c \
+	northd/en-global-config.h \
 	northd/en-northd.c \
 	northd/en-northd.h \
 	northd/en-lflow.c \