tests: internal: routing: update routing tests to use router context

Create router context in test setup and update all mask operations.
Add router cleanup in test teardown.

Signed-off-by: Eduardo Silva <[email protected]>

Author: edsiper

tests/internal/conditional_routing.c

@@ -315,7 +315,7 @@ void test_conditional_routing_per_record()
 
     /* Cleanup */
     flb_router_exit(&config);
-    cleanup_conditional_routing_instances(&input, &output1, &output2, &output3,
+    cleanup_conditional_routing_instances(&config, &input, &output1, &output2, &output3,
                                           &input_routes, &route1, &route2, &route3,
                                           &route_output1, &route_output2, &route_output3);
 }
@@ -374,7 +374,7 @@ void test_conditional_routing_default_route()
 
     /* Cleanup */
     flb_router_exit(&config);
-    cleanup_conditional_routing_instances(&input, &output1, &output2, &output3,
+    cleanup_conditional_routing_instances(&config, &input, &output1, &output2, &output3,
                                           &input_routes, &route1, &route2, &route3,
                                           &route_output1, &route_output2, &route_output3);
 }
@@ -414,17 +414,17 @@ void test_conditional_routing_route_mask()
 
         if (strcmp(record->level, "info") == 0) {
             /* Create a test chunk */
-            chunk = flb_input_chunk_create(&input, "test_tag", 8, NULL, 0);
+            chunk = flb_input_chunk_create(&input, FLB_INPUT_LOGS, "test_tag", 8);
             TEST_CHECK(chunk != NULL);
             if (chunk) {
                 /* Set route mask for info output only */
                 routes_mask = chunk->routes_mask;
-                flb_routes_mask_set_bit(routes_mask, output1.id, &config);
+                flb_routes_mask_set_bit(routes_mask, output1.id, config.router);
 
                 /* Verify route mask is set correctly */
-                TEST_CHECK(flb_routes_mask_get_bit(routes_mask, output1.id, &config) == 1);
-                TEST_CHECK(flb_routes_mask_get_bit(routes_mask, output2.id, &config) == 0);
-                TEST_CHECK(flb_routes_mask_get_bit(routes_mask, output3.id, &config) == 0);
+                TEST_CHECK(flb_routes_mask_get_bit(routes_mask, output1.id, config.router) == 1);
+                TEST_CHECK(flb_routes_mask_get_bit(routes_mask, output2.id, config.router) == 0);
+                TEST_CHECK(flb_routes_mask_get_bit(routes_mask, output3.id, config.router) == 0);
 
                 flb_input_chunk_destroy(chunk);
             }
@@ -433,7 +433,7 @@ void test_conditional_routing_route_mask()
 
     /* Cleanup */
     flb_router_exit(&config);
-    cleanup_conditional_routing_instances(&input, &output1, &output2, &output3,
+    cleanup_conditional_routing_instances(&config, &input, &output1, &output2, &output3,
                                           &input_routes, &route1, &route2, &route3,
                                           &route_output1, &route_output2, &route_output3);
 }
@@ -503,7 +503,7 @@ void test_conditional_routing_no_duplicates()
 
     /* Cleanup */
     flb_router_exit(&config);
-    cleanup_conditional_routing_instances(&input, &output1, &output2, &output3,
+    cleanup_conditional_routing_instances(&config, &input, &output1, &output2, &output3,
                                           &input_routes, &route1, &route2, &route3,
                                           &route_output1, &route_output2, &route_output3);
 }
@@ -814,6 +814,12 @@ static void setup_conditional_routing_instances(struct flb_config *config,
     mk_list_init(&config->outputs);
     cfl_list_init(&config->input_routes);
 
+    config->router = flb_router_create(config);
+    TEST_CHECK(config->router != NULL);
+    if (config->router) {
+        flb_routes_mask_set_size(1, config->router);
+    }
+
     memset(input, 0, sizeof(struct flb_input_instance));
     mk_list_init(&input->_head);
     cfl_list_init(&input->routes_direct);
@@ -947,7 +953,8 @@ static int test_record_routing(struct flb_input_instance *input,
     return found;
 }
 
-static void cleanup_conditional_routing_instances(struct flb_input_instance *input,
+static void cleanup_conditional_routing_instances(struct flb_config *config,
+                                                 struct flb_input_instance *input,
                                                  struct flb_output_instance *output1,
                                                  struct flb_output_instance *output2,
                                                  struct flb_output_instance *output3,
@@ -970,6 +977,11 @@ static void cleanup_conditional_routing_instances(struct flb_input_instance *inp
     flb_sds_destroy(route_output1->name);
     flb_sds_destroy(route_output2->name);
     flb_sds_destroy(route_output3->name);
+
+    if (config && config->router) {
+        flb_router_destroy(config->router);
+        config->router = NULL;
+    }
 }
 
 TEST_LIST = {

tests/internal/input_chunk_routes.c

@@ -7,6 +7,7 @@
 #include <fluent-bit/flb_output.h>
 #include <fluent-bit/flb_output_plugin.h>
 #include <fluent-bit/flb_routes_mask.h>
+#include <fluent-bit/flb_router.h>
 #include <fluent-bit/flb_env.h>
 #include <fluent-bit/flb_hash_table.h>
 #include <fluent-bit/flb_kv.h>
@@ -65,8 +66,18 @@ static int init_test_config(struct flb_config *config,
         return -1;
     }
 
-    ret = flb_routes_mask_set_size(64, config);
+    /* Create router context */
+    config->router = flb_router_create(config);
+    if (config->router == NULL) {
+        flb_env_destroy(config->env);
+        config->env = NULL;
+        return -1;
+    }
+
+    ret = flb_routes_mask_set_size(64, config->router);
     if (ret != 0) {
+        flb_router_destroy(config->router);
+        config->router = NULL;
         flb_env_destroy(config->env);
         config->env = NULL;
         return -1;
@@ -241,7 +252,10 @@ static void cleanup_test_routing_scenario(struct flb_input_chunk *ic,
             in->net_config_map = NULL;
         }
 
-        flb_routes_empty_mask_destroy(config);
+        if (config->router) {
+            flb_router_destroy(config->router);
+            config->router = NULL;
+        }
         if (config->env) {
             flb_env_destroy(config->env);
             config->env = NULL;
@@ -601,13 +615,13 @@ static void test_chunk_restore_alias_plugin_match_multiple()
 
     TEST_CHECK(flb_routes_mask_get_bit(ic->routes_mask,
                                        stdout_one.id,
-                                       &config) == 1);
+                                       config.router) == 1);
     TEST_CHECK(flb_routes_mask_get_bit(ic->routes_mask,
                                        stdout_two.id,
-                                       &config) == 1);
+                                       config.router) == 1);
     TEST_CHECK(flb_routes_mask_get_bit(ic->routes_mask,
                                        http_out.id,
-                                       &config) == 0);
+                                       config.router) == 0);
 
 cleanup:
     cleanup_test_routing_scenario(ic, &stdout_one, &stdout_two, &http_out,
@@ -762,13 +776,13 @@ static void test_chunk_restore_alias_plugin_null_matches_all()
 
     TEST_CHECK(flb_routes_mask_get_bit(ic->routes_mask,
                                        stdout_one.id,
-                                       &config) == 1);
+                                       config.router) == 1);
     TEST_CHECK(flb_routes_mask_get_bit(ic->routes_mask,
                                        stdout_two.id,
-                                       &config) == 1);
+                                       config.router) == 1);
     TEST_CHECK(flb_routes_mask_get_bit(ic->routes_mask,
                                        http_out.id,
-                                       &config) == 1);
+                                       config.router) == 1);
 
 cleanup:
     cleanup_test_routing_scenario(ic, &stdout_one, &stdout_two, &http_out,