wiliot-certificate 1.5.1a1__py3-none-any.whl → 1.5.2a1__py3-none-any.whl

brg_certificate/tests/datapath/stress_gen3_test/stress_gen3_test.py

@@ -8,185 +8,186 @@ from brg_certificate.cert_gw_sim import DEDUPLICATION_PKTS
 import statistics
 import time
 
-def configure_pacer_n_times(test, num_of_times, pacer_interval, datapath_module):
-    test = cert_config.brg_configure(test, fields=[BRG_PACER_INTERVAL], values=[pacer_interval], module=datapath_module)[0]
-    if test.rc == TEST_FAILED:
-        for i in range(num_of_times):
-            if test.rc == TEST_PASSED:
-                return test
-            print(f"sleeping for 10 seconds before trying to configure pacer again\n")
-            time.sleep(10)
-            test = cert_config.brg_configure(test, fields=[BRG_PACER_INTERVAL], values=[pacer_interval], module=datapath_module)[0]
-        test.add_reason("Didn't succeed to configure after two attempts - No pkt was found!")
-    return test
 
-def metric_checking_HB(test, mgmt_type_list, tx_queue_expected, pacer_increment_expected):
+def metric_checking_HB(test, check, mgmt_type_list, tx_queue_expected, pacer_increment_expected):
     if not mgmt_type_list:
-        test.add_reason("\nDidn't find HB pkt, therefore will not check tx_queue and pacer increment\n")
-        print(f"Didn't find HB pkt, therefore will not check tx_queue and pacer increment")
+        test.add_reason("\nDidn't find HB pkt, therefore skip all checks\n")
+        print("Didn't find HB pkt, therefore will not check tx_queue and pacer increment")
     else:
-        #check tx queue 
+        # check tx queue
         watermarks = [pkt.tx_queue_watermark for pkt in mgmt_type_list]
         half_index = len(watermarks) // 2
         tx_queue_HB = statistics.mean(watermarks[half_index:])
         if not (tx_queue_expected[0] <= tx_queue_HB <= tx_queue_expected[1]):
-            print(f"\ntx_queue value is wrong!  expected: {tx_queue_expected}, got: {tx_queue_HB}")
+            print(f"\ntx_queue: {tx_queue_HB} expected: {tx_queue_expected},")
         else:
             print(f"\ntx_queue from HB: {tx_queue_HB}\n")
-        
+
         # check pacer increment
         pacer_increment_HB = [pkt.effective_pacer_increment for pkt in mgmt_type_list]
         average_pacer_increment_HB = statistics.mean(pacer_increment_HB)
         if not (pacer_increment_expected[0] <= average_pacer_increment_HB <= pacer_increment_expected[1]):
-            test.rc = TEST_FAILED
-            test.add_reason(f"pacer_increment:{average_pacer_increment_HB}")
             print(f"\npacer_increment value is wrong\nexpected: {pacer_increment_expected}\ngot: {average_pacer_increment_HB}")
+            if check:
+                test.rc = TEST_FAILED
+                test.add_reason(f"pacer_increment:{average_pacer_increment_HB}")
         else:
-            test.add_reason(f"pacer_increment: {average_pacer_increment_HB}")
             print(f"\naverage pacer_increment from HB: {average_pacer_increment_HB}\n")
+            if check:
+                test.add_reason(f"pacer_increment: {average_pacer_increment_HB}")
     return test
 
-def metric_checking_df(test, check,  pacer_interval, df, repetition_value_expected,  brg_latency_expected, num_of_pixels_expected):
+
+def metric_checking_df(test, check, pacer_interval, df, repetition_value_expected, brg_latency_expected, num_of_pixels_expected):
     if df.empty:
-        print(f" df is empty, therefore will not check repetitions, brg latency and num of tags")
+        print("Df is empty, therefore will not check repetitions, brg latency and num of tags")
         test.rc = TEST_FAILED
-        test.add_reason(f"df is empty, therefore will not check repetitions, brg latency and num of tags")
+        test.add_reason("Df is empty, therefore skip all checks")
     else:
         print(f"result of pacer interval: {pacer_interval}\n")
         # check repetition value
         payload_counts_per_tag = df.groupby(TAG_ID)[PAYLOAD].value_counts()
         average_payload_count = round(payload_counts_per_tag.mean(), 2)
         if not repetition_value_expected[0] <= average_payload_count <= repetition_value_expected[1]:
+            print(f"Repetition value is wrong! \nexpected:{repetition_value_expected}\ngot: {average_payload_count}")
             if check:
                 test.rc = TEST_FAILED
-                test.add_reason(f"Repetition:{average_payload_count}, expected: {repetition_value_expected},")
-                print(f"Repetition value is wrong! \nexpected:{repetition_value_expected}\ngot: {average_payload_count}")
-            else:   
-                print(f"Repetition value is wrong! \nexpected:{repetition_value_expected}\ngot: {average_payload_count}")
+                test.add_reason(f"Repetition:{average_payload_count}, expected: {repetition_value_expected}")
         else:
+            print(f"Repetition value is correct! got: {average_payload_count}")
             if check:
                 test.add_reason(f"Repetition value: {average_payload_count}")
-                print(f"Repetition value is correct! got: {average_payload_count}")
-            else:
-                print(f"Repetition value is correct! got: {average_payload_count}")
-                
+
         # check num of tags, with tolerance of 5%
-        num_of_tags = len(df[TAG_ID].unique()) 
-        if not num_of_pixels_expected*0.95 <= num_of_tags <= num_of_pixels_expected*1.05:
-            test.add_reason(f"num of tags:  {num_of_tags}")
-            print(f"\n num of tags is not as expected\nexpected: {num_of_pixels_expected}, got: {num_of_tags}")
+        num_of_tags = len(df[TAG_ID].unique())
+        if not num_of_pixels_expected * 0.95 <= num_of_tags <= num_of_pixels_expected * 1.05:
+            print(f"\nnum of tags is not as expected\nexpected: {num_of_pixels_expected}, got: {num_of_tags}")
+            if check:
+                test.add_reason(f"num of tags:  {num_of_tags}")
         else:
             print(f"\nnum of tags from df: {num_of_tags}\n")
-        
-        #check brg_latency
-        brg_latency_avg = round(df[BRG_LATENCY].mean(),2)
-        if check:
-            if not (brg_latency_expected[0] <= brg_latency_avg <= brg_latency_expected[1]):
-                print(f"Average brg_latency: {brg_latency_avg}")
-            else:
-                print(f"Average brg_latency: {brg_latency_avg}")
+
+        # check brg_latency
+        brg_latency_avg = round(df[BRG_LATENCY].mean(), 2)
+        if not (brg_latency_expected[0] <= brg_latency_avg <= brg_latency_expected[1]):
+            print(f"Average brg_latency: {brg_latency_avg} , expected: {brg_latency_expected}")
         else:
             print(f"Average brg_latency: {brg_latency_avg}")
-    return test 
+    return test
+
+
+def combination_func(test, param, datapath_module, pacer_interval, num_of_sim_tags, repetition_value_expected,
+                     tx_queue_expected, pacer_increment_expected, brg_latency_expected):
+    test = cert_config.brg_configure(test, fields=[BRG_PACER_INTERVAL], values=[pacer_interval], module=datapath_module)[0]
+    if test.rc == TEST_FAILED:
+        print("Failed to configure pacer interval")
+        test.add_reason("Failed to configure pacer interval")
+        return test
+    if param.name == "rep1_adaptive_pacer":
+        print(f"run phase: {param.name}")
+        df = cert_common.data_scan(test, scan_time=30, brg_data=(not test.internal_brg), gw_data=test.internal_brg)
+        cert_common.display_data(df, nfpkt=True, tbc=True, name_prefix=f"stress_{pacer_interval}_", dir=test.dir)
+        test, hbs = cert_common.scan_for_mgmt_pkts(test, [eval_pkt(f'Brg2GwHbV{test.active_brg.api_version}')])
+        hbs = [p[MGMT_PKT].pkt for p in hbs]
+
+        check = True
+        test = metric_checking_df(test, check, pacer_interval, df, repetition_value_expected, brg_latency_expected, num_of_sim_tags)
+        if not test.rc == TEST_FAILED:
+            test = metric_checking_HB(test, check, hbs, tx_queue_expected, pacer_increment_expected)
+            return test
+        else:
+            # in case it failed because the repetition value.
+            return test
 
-def combination_func(test, datapath_module, pacer_interval, num_of_sim_tags, repetition_value_expected, tx_queue_expected, pacer_increment_expected, brg_latency_expected):
-    test = configure_pacer_n_times(test, 2, pacer_interval, datapath_module)
     time.sleep(30)
-# first df 
+    # first df
     df = cert_common.data_scan(test, scan_time=30, brg_data=(not test.internal_brg), gw_data=test.internal_brg)
     cert_common.display_data(df, nfpkt=True, tbc=True, name_prefix=f"stress_{pacer_interval}_", dir=test.dir)
     test, hbs = cert_common.scan_for_mgmt_pkts(test, [eval_pkt(f'Brg2GwHbV{test.active_brg.api_version}')])
-    hbs = [p[MGMT_PKT].pkt for p in hbs] 
-    print(f"result of first df\n")
+    hbs = [p[MGMT_PKT].pkt for p in hbs]
+    print("result of first df\n")
     check = False
+    test = metric_checking_HB(test, check, hbs, tx_queue_expected, pacer_increment_expected)
     test = metric_checking_df(test, check, pacer_interval, df, repetition_value_expected, brg_latency_expected, num_of_sim_tags)
     time.sleep(30)
-# second df
+    # second df
     df = cert_common.data_scan(test, scan_time=60, brg_data=(not test.internal_brg), gw_data=test.internal_brg)
     cert_common.display_data(df, nfpkt=True, tbc=True, name_prefix=f"stress_{pacer_interval}_", dir=test.dir)
     test, hbs = cert_common.scan_for_mgmt_pkts(test, [eval_pkt(f'Brg2GwHbV{test.active_brg.api_version}')])
-    hbs = [p[MGMT_PKT].pkt for p in hbs] 
-    print(f"result of second df\n")
+    hbs = [p[MGMT_PKT].pkt for p in hbs]
+    print("result of second df\n")
     check = True
+    test = metric_checking_HB(test, check, hbs, tx_queue_expected, pacer_increment_expected)
     test = metric_checking_df(test, check, pacer_interval, df, repetition_value_expected, brg_latency_expected, num_of_sim_tags)
-    test = metric_checking_HB(test, hbs, tx_queue_expected, pacer_increment_expected)
     return test
 
-def rep3(test, datapath_module, num_of_sim_tags):
-    # step 1 - config pacer interval=15 , then check repetition value = 3, tx_queue ~ 0, pacer increment ~ 0, brg latency ~ 0 , num of tags = all tags.
-    pacer_interval = 20 
-    test = combination_func(test, datapath_module, pacer_interval=pacer_interval, num_of_sim_tags=num_of_sim_tags, repetition_value_expected=[2,3], tx_queue_expected=[20,40], pacer_increment_expected=[0,2], brg_latency_expected=[0,10])
+
+def rep3(test, param, datapath_module, num_of_sim_tags):
+    # step 1 - config pacer interval=15 , then check repetition value = 3, tx_queue ~ 0, pacer increment ~ 0, brg latency ~ 0
+    pacer_interval = 22
+    test = combination_func(test, param, datapath_module, pacer_interval=pacer_interval, num_of_sim_tags=num_of_sim_tags,
+                            repetition_value_expected=[2, 3], tx_queue_expected=[20, 40],
+                            pacer_increment_expected=[0, 2], brg_latency_expected=[0, 10])
     time.sleep(5)
     return test
 
-def rep2(test, datapath_module, num_of_sim_tags):
-    #"step 2 - config pacer interval 9, then check repetition value = 2, tx_queue = 20-40, pacer increment = 0, brg latency = 0-200, num of tags = all tags"
-    pacer_interval = 15
-    test = combination_func(test, datapath_module, pacer_interval=pacer_interval, num_of_sim_tags=num_of_sim_tags, repetition_value_expected=[1.5,2.5], tx_queue_expected=[20,40], pacer_increment_expected=[0,2], brg_latency_expected=[10,200])
+
+def rep2(test, param, datapath_module, num_of_sim_tags):
+    # step 2 - config pacer interval 9, then check repetition value = 2, tx_queue = 20-40, pacer increment = 0, brg latency = 0-200
+    pacer_interval = 12
+    test = combination_func(test, param, datapath_module, pacer_interval=pacer_interval, num_of_sim_tags=num_of_sim_tags,
+                            repetition_value_expected=[1.5, 2.5], tx_queue_expected=[20, 40],
+                            pacer_increment_expected=[0, 2], brg_latency_expected=[10, 200])
     time.sleep(5)
     return test
 
-def rep1(test, datapath_module, num_of_sim_tags):
-    # "step 3 - config pacer interval 6 , then check repetition value = 1, tx_queue 40-60, pacer increment ~ 0, brg latency 200-300 , num of tags = all tags"
-    pacer_interval = 9
-    test = combination_func(test, datapath_module, pacer_interval=pacer_interval, num_of_sim_tags=num_of_sim_tags, repetition_value_expected=[1,2], tx_queue_expected=[20,40], pacer_increment_expected=[0,2], brg_latency_expected=[200,300])
+
+def rep1(test, param, datapath_module, num_of_sim_tags):
+    # "step 3 - config pacer interval 6 , then check repetition value = 1, tx_queue 40-60, pacer increment ~ 0, brg latency 200-300
+    pacer_interval = 7
+    test = combination_func(test, param, datapath_module, pacer_interval=pacer_interval, num_of_sim_tags=num_of_sim_tags,
+                            repetition_value_expected=[1, 2], tx_queue_expected=[20, 40],
+                            pacer_increment_expected=[0, 2], brg_latency_expected=[200, 300])
     time.sleep(5)
     return test
 
-def rep1_adaptive_pacer(test, datapath_module, num_of_sim_tags):
-    # "step 4 - config pacer interval 1  , then check repetition value = 1, tx_queue > 60, pacer increment = 3 , brg latency > 300 , num of tags = all tags"
-    pacer_interval = 1 
-    test = combination_func(test, datapath_module, pacer_interval=pacer_interval, num_of_sim_tags=num_of_sim_tags, repetition_value_expected=[1,2], tx_queue_expected=[20,40], pacer_increment_expected=[2,20], brg_latency_expected=[300,1000])
+
+def rep1_adaptive_pacer(test, param, datapath_module, num_of_sim_tags):
+    # step 4 - config pacer interval 1, then check repetition value = 1, tx_queue > 60, pacer increment = 3, brg latency > 300
+    pacer_interval = 1
+
+    test = combination_func(test, param, datapath_module, pacer_interval=pacer_interval, num_of_sim_tags=num_of_sim_tags,
+                            repetition_value_expected=[1, 2], tx_queue_expected=[20, 40],
+                            pacer_increment_expected=[2, 50], brg_latency_expected=[300, 1000])
     time.sleep(5)
     return test
 
-def pixels_burst(test, datapath_module, num_of_sim_tags, pixel_sim_thread):
-    #NOTE: I skipped this phase 
-    # "pixel_burst - config pacer interval 15 , then add more 200 packets with 0 delay(0.02 sec) , then check repetition value = 1 and not 2 "
-    pixel_sim_thread.stop()
-    pacer_interval = 15
-    test = configure_pacer_n_times(test, 2, pacer_interval, datapath_module)
-    pixel_sim_thread = cert_data_sim.DataSimThread(test=test, num_of_pixels=num_of_sim_tags, duplicates=1, delay=0, pkt_types=[0],pixels_type=GEN3)
-    pixel_sim_thread.start()
-    df = cert_common.data_scan(test, scan_time=180 , brg_data=(not test.internal_brg), gw_data=test.internal_brg)
-    check = True
-    test = metric_checking_df(test, check, pacer_interval, df, [2,3], [0,10], 200)
-    # we must have df, so we will try twice again to get it
-    if test.rc == TEST_FAILED:
-        for i in range(2):
-            if test.rc == TEST_PASSED:
-                break
-            df = cert_common.data_scan(test, scan_time=30 , brg_data=(not test.internal_brg), gw_data=test.internal_brg)
-            test =metric_checking_df(test, check, pacer_interval, df, [2,3], [0,10], 200)    
-    pixel_sim_thread.stop()
-    #change the number of pixels to 400, and check that the repetition value is 1 in short time 
-    pixel_sim_thread = cert_data_sim.DataSimThread(test=test, num_of_pixels=400, duplicates=1, delay=0, pkt_types=[0],pixels_type=GEN3)
-    pixel_sim_thread.start()
-    df = cert_common.data_scan(test, scan_time=30 , brg_data=(not test.internal_brg), gw_data=test.internal_brg)
-    test = metric_checking_df(test, check, pacer_interval, df, [1,2], [0,10], 400)    
-    pixel_sim_thread.stop()
-    return test
 
 def run(test):
     # Test prolog
     datapath_module = eval_pkt(f'ModuleDatapathV{test.active_brg.api_version}')
     test = cert_common.test_prolog(test)
     if test.rc == TEST_FAILED:
-        return cert_common.test_epilog(test)
-    #config GW deduplication pkts = 0  "
+        return cert_common.test_epilog(test, revert_brgs=True, modules=[datapath_module])
+    # config GW deduplication pkts = 0
     print("Configuring GW with !deduplication_pkts 0")
     cert_config.gw_action(test, f"{DEDUPLICATION_PKTS} 0")
     if test.rc == TEST_FAILED and test.exit_on_param_failure:
         return cert_common.test_epilog(test, revert_gws=True)
 
-    STRESS_TEST_MAP = {"rep3":rep3, "rep2": rep2 ,"rep1": rep1,  "rep1_adaptive_pacer":rep1_adaptive_pacer}
+    STRESS_TEST_MAP = {"rep3": rep3, "rep2": rep2, "rep1": rep1, "rep1_adaptive_pacer": rep1_adaptive_pacer}
     num_of_pixels = 300
-    pixel_sim_thread = cert_data_sim.DataSimThread(test=test, num_of_pixels=num_of_pixels, duplicates=1, delay=0, pkt_types=[0],pixels_type=GEN3)
+    pixel_sim_thread = cert_data_sim.DataSimThread(test=test,
+                                                   num_of_pixels=num_of_pixels,
+                                                   duplicates=1,
+                                                   delay=0,
+                                                   pkt_types=[0],
+                                                   pixels_type=GEN3)
     pixel_sim_thread.start()
     time.sleep(30)
     for param in test.params:
         functionality_run_print(param.name)
-        test = STRESS_TEST_MAP[param.value](test, datapath_module, num_of_pixels)
+        test = STRESS_TEST_MAP[param.value](test, param, datapath_module, num_of_pixels)
         generate_log_file(test, param.name)
         field_functionality_pass_fail_print(test, param.name)
         test.set_phase_rc(param.name, test.rc)
@@ -200,4 +201,4 @@ def run(test):
     # Re-enable unified packets deduplication
     cert_config.gw_action(test, f"{DEDUPLICATION_PKTS} 1")
 
-    return cert_common.test_epilog(test, revert_brgs=True, revert_gws=True, modules=[datapath_module])
+    return cert_common.test_epilog(test, revert_brgs=True, modules=[datapath_module])

brg_certificate/tests/datapath/stress_test/stress_test.json

@@ -1,23 +1,22 @@
 {
-    "name": "stress test",
-    "module": "datapath",
-    "purpose": ["verify the functionality of the bridge under stress conditions",
-                "verify that the algorithms 'adaptive repetition' and 'adaptive pacer' are working correctly"],
-    "documentation": ["https://community.wiliot.com/customers/s/article/Wiliot-Network-Data-Path-Module-Relaying-data"],
+    "name": "Stress Test Gen2 Pixels",
+    "module": "Datapath",
+    "purpose": "verify that the algorithms 'adaptive repetition' and 'adaptive pacer' are working correctly under stress conditions with Gen3 pixels",
+    "documentation": ["https://community.wiliot.com/customers/s/article/Wiliot-Network-Data-Path-Module-Relaying-data",
+                      "add more links here - about adaptive repetition, adaptive pacer"],
     "initialCondition": "Bridge configured to defaults",
-    "procedure": [
-        "Test prolog",
-        "define simulation with 200 packets with 0 delay(0.02 sec) ",
-        "rep 3 - config pacer interval 15, then check repetition value = 3, pacer increment = 0, num of tags = all tags  ",
-        "rep 2 - config pacer interval 9, then check repetition value = 2, pacer increment = 0, num of tags = all tags",
-        "rep 1 - config pacer interval 6, then check repetition value = 1, pacer increment = 0, num of tags = all tags",
-        "rep 1 adaptive pacer - config pacer interval 1, then check repetition value = 1, pacer increment = 3 , num of tags = all tags", 
-        "Test epilog"],
+    "procedure": ["Test prolog",
+                  "Configure GW to allow packets duplications",
+                  "define simulation with 300 pixels & 0 delay(0.02 sec) time",
+                  "rep 3 - config pacer interval 22, then check repetition value = 3, pacer increment = 0, num of tags = all tags",
+                  "rep 2 - config pacer interval 12, then check repetition value = 2, pacer increment = 0, num of tags = all tags",
+                  "rep 1 - config pacer interval 7, then check repetition value = 1, pacer increment = 0, num of tags = all tags",
+                  "rep 1 adaptive pacer - config pacer interval 1, then check repetition value = 1, pacer increment = 3 , num of tags = all tags",
+                  "Test epilog"],
     "expectedOutcome": "all metrics values will be as expected then the bridge is working correctly and the algorithms are working correctly",
     "mandatory": 1,
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
-    "internalBridge": 1,
+    "internalBridge": 0,
     "allSupportedValues": ["rep3", "rep2", "rep1", "rep1_adaptive_pacer"]
-
 }

brg_certificate/tests/datapath/stress_test/stress_test.py

@@ -8,185 +8,186 @@ from brg_certificate.cert_gw_sim import DEDUPLICATION_PKTS
 import statistics
 import time
 
-def configure_pacer_n_times(test, num_of_times, pacer_interval, datapath_module):
-    test = cert_config.brg_configure(test, fields=[BRG_PACER_INTERVAL], values=[pacer_interval], module=datapath_module)[0]
-    if test.rc == TEST_FAILED:
-        for i in range(num_of_times):
-            if test.rc == TEST_PASSED:
-                return test
-            print(f"sleeping for 10 seconds before trying to configure pacer again\n")
-            time.sleep(10)
-            test = cert_config.brg_configure(test, fields=[BRG_PACER_INTERVAL], values=[pacer_interval], module=datapath_module)[0]
-        test.add_reason("Didn't succeed to configure after two attempts - No pkt was found!")
-    return test
 
-def metric_checking_HB(test, mgmt_type_list, tx_queue_expected, pacer_increment_expected):
+def metric_checking_HB(test, check, mgmt_type_list, tx_queue_expected, pacer_increment_expected):
     if not mgmt_type_list:
-        test.add_reason("\nDidn't find HB pkt, therefore will not check tx_queue and pacer increment\n")
-        print(f"Didn't find HB pkt, therefore will not check tx_queue and pacer increment")
+        test.add_reason("\nDidn't find HB pkt, therefore skip all checks\n")
+        print("Didn't find HB pkt, therefore will not check tx_queue and pacer increment")
     else:
-        #check tx queue 
+        # check tx queue
         watermarks = [pkt.tx_queue_watermark for pkt in mgmt_type_list]
         half_index = len(watermarks) // 2
         tx_queue_HB = statistics.mean(watermarks[half_index:])
         if not (tx_queue_expected[0] <= tx_queue_HB <= tx_queue_expected[1]):
-            print(f"\ntx_queue value is wrong!  expected: {tx_queue_expected}, got: {tx_queue_HB}")
+            print(f"\ntx_queue: {tx_queue_HB} expected: {tx_queue_expected},")
         else:
             print(f"\ntx_queue from HB: {tx_queue_HB}\n")
-        
+
         # check pacer increment
         pacer_increment_HB = [pkt.effective_pacer_increment for pkt in mgmt_type_list]
         average_pacer_increment_HB = statistics.mean(pacer_increment_HB)
         if not (pacer_increment_expected[0] <= average_pacer_increment_HB <= pacer_increment_expected[1]):
-            test.rc = TEST_FAILED
-            test.add_reason(f"pacer_increment:{average_pacer_increment_HB}")
             print(f"\npacer_increment value is wrong\nexpected: {pacer_increment_expected}\ngot: {average_pacer_increment_HB}")
+            if check:
+                test.rc = TEST_FAILED
+                test.add_reason(f"pacer_increment:{average_pacer_increment_HB}")
         else:
-            test.add_reason(f"pacer_increment: {average_pacer_increment_HB}")
             print(f"\naverage pacer_increment from HB: {average_pacer_increment_HB}\n")
+            if check:
+                test.add_reason(f"pacer_increment: {average_pacer_increment_HB}")
     return test
 
-def metric_checking_df(test, check,  pacer_interval, df, repetition_value_expected,  brg_latency_expected, num_of_pixels_expected):
+
+def metric_checking_df(test, check, pacer_interval, df, repetition_value_expected, brg_latency_expected, num_of_pixels_expected):
     if df.empty:
-        print(f" df is empty, therefore will not check repetitions, brg latency and num of tags")
+        print("Df is empty, therefore will not check repetitions, brg latency and num of tags")
         test.rc = TEST_FAILED
-        test.add_reason(f"df is empty, therefore will not check repetitions, brg latency and num of tags")
+        test.add_reason("Df is empty, therefore skip all checks")
     else:
         print(f"result of pacer interval: {pacer_interval}\n")
         # check repetition value
         payload_counts_per_tag = df.groupby(TAG_ID)[PAYLOAD].value_counts()
         average_payload_count = round(payload_counts_per_tag.mean(), 2)
         if not repetition_value_expected[0] <= average_payload_count <= repetition_value_expected[1]:
+            print(f"Repetition value is wrong! \nexpected:{repetition_value_expected}\ngot: {average_payload_count}")
             if check:
                 test.rc = TEST_FAILED
-                test.add_reason(f"Repetition:{average_payload_count}, expected: {repetition_value_expected},")
-                print(f"Repetition value is wrong! \nexpected:{repetition_value_expected}\ngot: {average_payload_count}")
-            else:   
-                print(f"Repetition value is wrong! \nexpected:{repetition_value_expected}\ngot: {average_payload_count}")
+                test.add_reason(f"Repetition:{average_payload_count}, expected: {repetition_value_expected}")
         else:
+            print(f"Repetition value is correct! got: {average_payload_count}")
             if check:
                 test.add_reason(f"Repetition value: {average_payload_count}")
-                print(f"Repetition value is correct! got: {average_payload_count}")
-            else:
-                print(f"Repetition value is correct! got: {average_payload_count}")
-                
+
         # check num of tags, with tolerance of 5%
-        num_of_tags = len(df[TAG_ID].unique()) 
-        if not num_of_pixels_expected*0.95 <= num_of_tags <= num_of_pixels_expected*1.05:
-            test.add_reason(f"num of tags:  {num_of_tags}")
-            print(f"\n num of tags is not as expected\nexpected: {num_of_pixels_expected}, got: {num_of_tags}")
+        num_of_tags = len(df[TAG_ID].unique())
+        if not num_of_pixels_expected * 0.95 <= num_of_tags <= num_of_pixels_expected * 1.05:
+            print(f"\nnum of tags is not as expected\nexpected: {num_of_pixels_expected}, got: {num_of_tags}")
+            if check:
+                test.add_reason(f"num of tags:  {num_of_tags}")
         else:
             print(f"\nnum of tags from df: {num_of_tags}\n")
-        
-        #check brg_latency
-        brg_latency_avg = round(df[BRG_LATENCY].mean(),2)
-        if check:
-            if not (brg_latency_expected[0] <= brg_latency_avg <= brg_latency_expected[1]):
-                print(f"Average brg_latency: {brg_latency_avg}")
-            else:
-                print(f"Average brg_latency: {brg_latency_avg}")
+
+        # check brg_latency
+        brg_latency_avg = round(df[BRG_LATENCY].mean(), 2)
+        if not (brg_latency_expected[0] <= brg_latency_avg <= brg_latency_expected[1]):
+            print(f"Average brg_latency: {brg_latency_avg} , expected: {brg_latency_expected}")
         else:
             print(f"Average brg_latency: {brg_latency_avg}")
-    return test 
+    return test
+
+
+def combination_func(test, param, datapath_module, pacer_interval, num_of_sim_tags, repetition_value_expected,
+                     tx_queue_expected, pacer_increment_expected, brg_latency_expected):
+    test = cert_config.brg_configure(test, fields=[BRG_PACER_INTERVAL], values=[pacer_interval], module=datapath_module)[0]
+    if test.rc == TEST_FAILED:
+        print("Failed to configure pacer interval")
+        test.add_reason("Failed to configure pacer interval")
+        return test
+    if param.name == "rep1_adaptive_pacer":
+        print(f"run phase: {param.name}")
+        df = cert_common.data_scan(test, scan_time=30, brg_data=(not test.internal_brg), gw_data=test.internal_brg)
+        cert_common.display_data(df, nfpkt=True, tbc=True, name_prefix=f"stress_{pacer_interval}_", dir=test.dir)
+        test, hbs = cert_common.scan_for_mgmt_pkts(test, [eval_pkt(f'Brg2GwHbV{test.active_brg.api_version}')])
+        hbs = [p[MGMT_PKT].pkt for p in hbs]
+
+        check = True
+        test = metric_checking_df(test, check, pacer_interval, df, repetition_value_expected, brg_latency_expected, num_of_sim_tags)
+        if not test.rc == TEST_FAILED:
+            test = metric_checking_HB(test, check, hbs, tx_queue_expected, pacer_increment_expected)
+            return test
+        else:
+            # in case it failed because the repetition value.
+            return test
 
-def combination_func(test, datapath_module, pacer_interval, num_of_sim_tags, repetition_value_expected, tx_queue_expected, pacer_increment_expected, brg_latency_expected):
-    test = configure_pacer_n_times(test, 2, pacer_interval, datapath_module)
     time.sleep(30)
-# first df 
+    # first df
     df = cert_common.data_scan(test, scan_time=30, brg_data=(not test.internal_brg), gw_data=test.internal_brg)
     cert_common.display_data(df, nfpkt=True, tbc=True, name_prefix=f"stress_{pacer_interval}_", dir=test.dir)
     test, hbs = cert_common.scan_for_mgmt_pkts(test, [eval_pkt(f'Brg2GwHbV{test.active_brg.api_version}')])
-    hbs = [p[MGMT_PKT].pkt for p in hbs] 
-    print(f"result of first df\n")
+    hbs = [p[MGMT_PKT].pkt for p in hbs]
+    print("result of first df\n")
     check = False
+    test = metric_checking_HB(test, check, hbs, tx_queue_expected, pacer_increment_expected)
     test = metric_checking_df(test, check, pacer_interval, df, repetition_value_expected, brg_latency_expected, num_of_sim_tags)
     time.sleep(30)
-# second df
+    # second df
     df = cert_common.data_scan(test, scan_time=60, brg_data=(not test.internal_brg), gw_data=test.internal_brg)
     cert_common.display_data(df, nfpkt=True, tbc=True, name_prefix=f"stress_{pacer_interval}_", dir=test.dir)
     test, hbs = cert_common.scan_for_mgmt_pkts(test, [eval_pkt(f'Brg2GwHbV{test.active_brg.api_version}')])
-    hbs = [p[MGMT_PKT].pkt for p in hbs] 
-    print(f"result of second df\n")
+    hbs = [p[MGMT_PKT].pkt for p in hbs]
+    print("result of second df\n")
     check = True
+    test = metric_checking_HB(test, check, hbs, tx_queue_expected, pacer_increment_expected)
     test = metric_checking_df(test, check, pacer_interval, df, repetition_value_expected, brg_latency_expected, num_of_sim_tags)
-    test = metric_checking_HB(test, hbs, tx_queue_expected, pacer_increment_expected)
     return test
 
-def rep3(test, datapath_module, num_of_sim_tags):
-    # step 1 - config pacer interval=15 , then check repetition value = 3, tx_queue ~ 0, pacer increment ~ 0, brg latency ~ 0 , num of tags = all tags.
-    pacer_interval = 20 
-    test = combination_func(test, datapath_module, pacer_interval=pacer_interval, num_of_sim_tags=num_of_sim_tags, repetition_value_expected=[2,3], tx_queue_expected=[20,40], pacer_increment_expected=[0,2], brg_latency_expected=[0,10])
+
+def rep3(test, param, datapath_module, num_of_sim_tags):
+    # step 1 - config pacer interval=15 , then check repetition value = 3, tx_queue ~ 0, pacer increment ~ 0, brg latency ~ 0
+    pacer_interval = 22
+    test = combination_func(test, param, datapath_module, pacer_interval=pacer_interval, num_of_sim_tags=num_of_sim_tags,
+                            repetition_value_expected=[2, 3], tx_queue_expected=[20, 40],
+                            pacer_increment_expected=[0, 2], brg_latency_expected=[0, 10])
     time.sleep(5)
     return test
 
-def rep2(test, datapath_module, num_of_sim_tags):
-    #"step 2 - config pacer interval 9, then check repetition value = 2, tx_queue = 20-40, pacer increment = 0, brg latency = 0-200, num of tags = all tags"
-    pacer_interval = 15
-    test = combination_func(test, datapath_module, pacer_interval=pacer_interval, num_of_sim_tags=num_of_sim_tags, repetition_value_expected=[1.5,2.5], tx_queue_expected=[20,40], pacer_increment_expected=[0,2], brg_latency_expected=[10,200])
+
+def rep2(test, param, datapath_module, num_of_sim_tags):
+    # step 2 - config pacer interval 9, then check repetition value = 2, tx_queue = 20-40, pacer increment = 0, brg latency = 0-200
+    pacer_interval = 12
+    test = combination_func(test, param, datapath_module, pacer_interval=pacer_interval, num_of_sim_tags=num_of_sim_tags,
+                            repetition_value_expected=[1.5, 2.5], tx_queue_expected=[20, 40],
+                            pacer_increment_expected=[0, 2], brg_latency_expected=[10, 200])
     time.sleep(5)
     return test
 
-def rep1(test, datapath_module, num_of_sim_tags):
-    # "step 3 - config pacer interval 6 , then check repetition value = 1, tx_queue 40-60, pacer increment ~ 0, brg latency 200-300 , num of tags = all tags"
-    pacer_interval = 9
-    test = combination_func(test, datapath_module, pacer_interval=pacer_interval, num_of_sim_tags=num_of_sim_tags, repetition_value_expected=[1,2], tx_queue_expected=[20,40], pacer_increment_expected=[0,2], brg_latency_expected=[200,300])
+
+def rep1(test, param, datapath_module, num_of_sim_tags):
+    # "step 3 - config pacer interval 6 , then check repetition value = 1, tx_queue 40-60, pacer increment ~ 0, brg latency 200-300
+    pacer_interval = 7
+    test = combination_func(test, param, datapath_module, pacer_interval=pacer_interval, num_of_sim_tags=num_of_sim_tags,
+                            repetition_value_expected=[1, 2], tx_queue_expected=[20, 40],
+                            pacer_increment_expected=[0, 2], brg_latency_expected=[200, 300])
     time.sleep(5)
     return test
 
-def rep1_adaptive_pacer(test, datapath_module, num_of_sim_tags):
-    # "step 4 - config pacer interval 1  , then check repetition value = 1, tx_queue > 60, pacer increment = 3 , brg latency > 300 , num of tags = all tags"
-    pacer_interval = 1 
-    test = combination_func(test, datapath_module, pacer_interval=pacer_interval, num_of_sim_tags=num_of_sim_tags, repetition_value_expected=[1,2], tx_queue_expected=[20,40], pacer_increment_expected=[2,20], brg_latency_expected=[300,1000])
+
+def rep1_adaptive_pacer(test, param, datapath_module, num_of_sim_tags):
+    # step 4 - config pacer interval 1, then check repetition value = 1, tx_queue > 60, pacer increment = 3, brg latency > 300
+    pacer_interval = 1
+
+    test = combination_func(test, param, datapath_module, pacer_interval=pacer_interval, num_of_sim_tags=num_of_sim_tags,
+                            repetition_value_expected=[1, 2], tx_queue_expected=[20, 40],
+                            pacer_increment_expected=[2, 50], brg_latency_expected=[300, 1000])
     time.sleep(5)
     return test
 
-def pixels_burst(test, datapath_module, num_of_sim_tags, pixel_sim_thread):
-    #NOTE: I skipped this phase 
-    # "pixel_burst - config pacer interval 15 , then add more 200 packets with 0 delay(0.02 sec) , then check repetition value = 1 and not 2 "
-    pixel_sim_thread.stop()
-    pacer_interval = 15
-    test = configure_pacer_n_times(test, 2, pacer_interval, datapath_module)
-    pixel_sim_thread = cert_data_sim.DataSimThread(test=test, num_of_pixels=num_of_sim_tags, duplicates=1, delay=0, pkt_types=[0],pixels_type=GEN2)
-    pixel_sim_thread.start()
-    df = cert_common.data_scan(test, scan_time=180 , brg_data=(not test.internal_brg), gw_data=test.internal_brg)
-    check = True
-    test = metric_checking_df(test, check, pacer_interval, df, [2,3], [0,10], 200)
-    # we must have df, so we will try twice again to get it
-    if test.rc == TEST_FAILED:
-        for i in range(2):
-            if test.rc == TEST_PASSED:
-                break
-            df = cert_common.data_scan(test, scan_time=30 , brg_data=(not test.internal_brg), gw_data=test.internal_brg)
-            test =metric_checking_df(test, check, pacer_interval, df, [2,3], [0,10], 200)    
-    pixel_sim_thread.stop()
-    #change the number of pixels to 400, and check that the repetition value is 1 in short time 
-    pixel_sim_thread = cert_data_sim.DataSimThread(test=test, num_of_pixels=400, duplicates=1, delay=0, pkt_types=[0],pixels_type=GEN2)
-    pixel_sim_thread.start()
-    df = cert_common.data_scan(test, scan_time=30 , brg_data=(not test.internal_brg), gw_data=test.internal_brg)
-    test = metric_checking_df(test, check, pacer_interval, df, [1,2], [0,10], 400)    
-    pixel_sim_thread.stop()
-    return test
 
 def run(test):
     # Test prolog
     datapath_module = eval_pkt(f'ModuleDatapathV{test.active_brg.api_version}')
     test = cert_common.test_prolog(test)
     if test.rc == TEST_FAILED:
-        return cert_common.test_epilog(test)
-    #config GW deduplication pkts = 0  "
+        return cert_common.test_epilog(test, revert_brgs=True, modules=[datapath_module])
+    # config GW deduplication pkts = 0
     print("Configuring GW with !deduplication_pkts 0")
     cert_config.gw_action(test, f"{DEDUPLICATION_PKTS} 0")
     if test.rc == TEST_FAILED and test.exit_on_param_failure:
         return cert_common.test_epilog(test, revert_gws=True)
 
-    STRESS_TEST_MAP = {"rep3":rep3, "rep2": rep2 ,"rep1": rep1,  "rep1_adaptive_pacer":rep1_adaptive_pacer}
+    STRESS_TEST_MAP = {"rep3": rep3, "rep2": rep2, "rep1": rep1, "rep1_adaptive_pacer": rep1_adaptive_pacer}
     num_of_pixels = 300
-    pixel_sim_thread = cert_data_sim.DataSimThread(test=test, num_of_pixels=num_of_pixels, duplicates=1, delay=0, pkt_types=[0],pixels_type=GEN2)
+    pixel_sim_thread = cert_data_sim.DataSimThread(test=test,
+                                                   num_of_pixels=num_of_pixels,
+                                                   duplicates=1,
+                                                   delay=0,
+                                                   pkt_types=[0],
+                                                   pixels_type=GEN2)
     pixel_sim_thread.start()
     time.sleep(30)
     for param in test.params:
         functionality_run_print(param.name)
-        test = STRESS_TEST_MAP[param.value](test, datapath_module, num_of_pixels)
+        test = STRESS_TEST_MAP[param.value](test, param, datapath_module, num_of_pixels)
         generate_log_file(test, param.name)
         field_functionality_pass_fail_print(test, param.name)
         test.set_phase_rc(param.name, test.rc)
@@ -200,4 +201,4 @@ def run(test):
     # Re-enable unified packets deduplication
     cert_config.gw_action(test, f"{DEDUPLICATION_PKTS} 1")
 
-    return cert_common.test_epilog(test, revert_brgs=True, revert_gws=True, modules=[datapath_module])
+    return cert_common.test_epilog(test, revert_brgs=True, modules=[datapath_module])