Test modifications

Signed-off-by: Daniel Madej <daniel.madej@huawei.com>

Author: Deixx

test/functional/tests/cache_ops/test_cleaning_policy_operation.py

@@ -209,6 +209,8 @@ def set_cleaning_policy_params(cache, cleaning_policy):
             alru_params.staleness_time = Time(seconds=2)
             alru_params.flush_max_buffers = 100
             alru_params.activity_threshold = Time(milliseconds=1000)
+            alru_params.dirty_ratio_threshold = 66
+            alru_params.dirty_ratio_inertia = Size(66, Unit.MebiByte)
             cache.set_params_alru(alru_params)
             current_alru_params = cache.get_flush_parameters_alru()
             if current_alru_params != alru_params:
@@ -233,6 +235,16 @@ def set_cleaning_policy_params(cache, cleaning_policy):
                         f"Activity threshold is {current_alru_params.activity_threshold}, "
                         f"should be {alru_params.activity_threshold}\n"
                     )
+                if current_alru_params.dirty_ratio_threshold != alru_params.dirty_ratio_threshold:
+                    failed_params += (
+                        f"Dirty ratio trigger threshold is {current_alru_params.dirty_ratio_threshold}, "
+                        f"should be {alru_params.dirty_ratio_threshold}\n"
+                    )
+                if current_alru_params.dirty_ratio_inertia != alru_params.dirty_ratio_inertia:
+                    failed_params += (
+                        f"Dirty ratio trigger inertia is {current_alru_params.dirty_ratio_inertia}, "
+                        f"should be {alru_params.dirty_ratio_inertia}\n"
+                    )
                 TestRun.LOGGER.error(f"ALRU parameters did not switch properly:\n{failed_params}")
 
 

test/functional/tests/cli/test_set_get_params.py

@@ -243,7 +243,7 @@ def new_seq_cutoff_parameters_random_values():
 
 def new_cleaning_parameters_random_values(cleaning_policy):
     if cleaning_policy == CleaningPolicy.alru:
-        alru_params_range = FlushParametersAlru().alru_params_range()
+        alru_params_range = FlushParametersAlru.alru_params_range()
         wake_up_time_random_value = Time(
             seconds=random.randint(*alru_params_range.wake_up_time)
         )
@@ -256,11 +256,21 @@ def new_cleaning_parameters_random_values(cleaning_policy):
         activity_threshold_random_value = Time(
             milliseconds=random.randint(*alru_params_range.activity_threshold)
         )
+        dirty_ratio_threshold_random_value = random.randint(
+            *alru_params_range.dirty_ratio_threshold
+        )
+        dirty_ratio_inertia_random_value = Size(random.randint(
+            *alru_params_range.dirty_ratio_inertia),
+            Unit.MebiByte,
+        )
         cleaning_params = FlushParametersAlru()
         cleaning_params.wake_up_time = wake_up_time_random_value
         cleaning_params.staleness_time = staleness_time_random_value
         cleaning_params.flush_max_buffers = flush_max_buffers_random_value
         cleaning_params.activity_threshold = activity_threshold_random_value
+        cleaning_params.dirty_ratio_threshold = dirty_ratio_threshold_random_value
+        cleaning_params.dirty_ratio_inertia = dirty_ratio_inertia_random_value
+        
 
     if cleaning_policy == CleaningPolicy.acp:
         acp_params_range = FlushParametersAcp().acp_params_range()

test/functional/tests/initialize/test_initialize_load.py

@@ -1,6 +1,6 @@
 #
 # Copyright(c) 2019-2022 Intel Corporation
-# Copyright(c) 2024 Huawei Technologies Co., Ltd.
+# Copyright(c) 2024-2025 Huawei Technologies Co., Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -67,6 +67,8 @@ def test_load_x_cores_to_one_cache(cache_mode, cleaning_policy, cache_line_size,
             alru.flush_max_buffers = 10
             alru.staleness_time = Time(seconds=60)
             alru.wake_up_time = Time(seconds=5)
+            alru.dirty_ratio_threshold = 75
+            alru.dirty_ratio_inertia = Size(15, Unit.MebiByte)
             cache.set_params_alru(alru)
         if cleaning_policy == CleaningPolicy.acp:
             acp = FlushParametersAcp()

test/functional/tests/misc/test_random_cache_ops.py

@@ -330,7 +330,6 @@ def set_param(
                     f"Changed seq-cutoff params on cache {cache_to_set_param.cache_id} to:\n"
                     f"Threshold: {str(random_threshold)}\n"
                     f"Policy: {str(random_policy)}\n"
-                    f"Threshold: {str(random_threshold)}\n"
                 )
             else:
                 core_list = cache_to_set_param.get_cores()
@@ -385,15 +384,20 @@ def set_param(
             )
 
         case cache_to_set_param.set_params_alru:
-            random_wake_up_time = Time(seconds=random.randint(0, 3600))
-            random_staleness_time = Time(seconds=random.randint(1, 3600))
-            random_flush_max_buffers = random.randint(1, 10000)
-            random_activity_threshold = Time(milliseconds=random.randint(0, 1000000))
+            ranges = FlushParametersAlru.alru_params_range()
+            random_wake_up_time = Time(seconds=random.randint(*ranges.wake_up_time))
+            random_staleness_time = Time(seconds=random.randint(*ranges.staleness_time))
+            random_flush_max_buffers = random.randint(*ranges.flush_max_buffers)
+            random_activity_threshold = Time(milliseconds=random.randint(*ranges.activity_threshold))
+            random_dirty_ratio_threshold = random.randint(*ranges.dirty_ratio_threshold)
+            random_dirty_ratio_inertia = Size(random.randint(*ranges.dirty_ratio_inertia), Unit.MebiByte)
             random_flush_parameters_alru = FlushParametersAlru(
                 wake_up_time=random_wake_up_time,
                 staleness_time=random_staleness_time,
                 flush_max_buffers=random_flush_max_buffers,
                 activity_threshold=random_activity_threshold,
+                dirty_ratio_threshold=random_dirty_ratio_threshold,
+                dirty_ratio_inertia=random_dirty_ratio_inertia,
             )
             cache_to_set_param.set_params_alru(random_flush_parameters_alru)
             return (
@@ -402,6 +406,8 @@ def set_param(
                 f"Staleness time: {str(random_staleness_time)}\n"
                 f"Flush max buffers: {str(random_flush_max_buffers)}\n"
                 f"Activity threshold time: {str(random_activity_threshold)}\n"
+                f"Dirty ratio trigger threshold: {str(random_dirty_ratio_threshold)}%\n"
+                f"Dirty ratio trigger inertia: {str(random_dirty_ratio_inertia)}%\n"
             )
 
         case cache_to_set_param.set_params_acp: