wiliot-certificate 4.5.0__py3-none-any.whl → 4.5.0a1__py3-none-any.whl

certificate/tests/datapath/event_test/event_test.py

@@ -7,9 +7,15 @@ import certificate.cert_config as cert_config
 
 NEW_TAG_EVENT_SCAN_TIME = 100             # in seconds
 TAG_EVENT_SCAN_TIME = 60                 # in seconds
+NEW_TAG_HOURS_EVENT_SCAN_TIME = 62 * 60   # 62 minutes
 RSSI_MOVEMENT_THRESHOLD = 15
 
 
+def test_new_tag_event_hours(test, phase, datapath_module):
+    values = [ag.EVENT_TIME_UNIT_HOURS, TEST_EVENT_WINDOW_HR_CFG, ag.RX_CHANNEL_37, ag.EVENT_TRIGGER_NEW_TAG, 0]
+    return cert_common.run_event_test_phase(test, phase, datapath_module, values, NEW_TAG_HOURS_EVENT_SCAN_TIME, ag.EVENT_TIME_UNIT_HOURS)
+
+
 def test_new_tag_event_minutes(test, phase, datapath_module):
     values = [ag.EVENT_TIME_UNIT_MINUTES, TEST_EVENT_WINDOW_MIN_CFG, ag.RX_CHANNEL_37, ag.EVENT_TRIGGER_NEW_TAG, 0]
     return cert_common.run_event_test_phase(test, phase, datapath_module, values, NEW_TAG_EVENT_SCAN_TIME, ag.EVENT_TIME_UNIT_MINUTES)
@@ -39,7 +45,7 @@ def test_rssi_event(test, phase, datapath_module):
 
 
 EVENT_TEST_MAP = {"rssi_event": test_rssi_event, "new_tag_event_seconds": test_new_tag_event_seconds,
-                  "new_tag_event_minutes": test_new_tag_event_minutes,
+                  "new_tag_event_minutes": test_new_tag_event_minutes, "new_tag_event_hours": test_new_tag_event_hours,
                   "temp_event": test_temp_event, "tx_rate_event": test_tx_rate_event}
 
 
@@ -48,11 +54,10 @@ def run(test):
     test = cert_common.test_prolog(test)
     if test.rc == TEST_FAILED:
         return cert_common.test_epilog(test)
-    dut = cert_config.get_brg_by_target(test, DUT)
 
     for param in test.params:
         phase_run_print(param.name)
-        test = EVENT_TEST_MAP[param.value](test, param.name, dut.datapath)
+        test = EVENT_TEST_MAP[param.value](test, param.name, test.active_brg.datapath)
         cert_mqtt.generate_log_file(test, param.name)
         field_functionality_pass_fail_print(test, param.name)
         test.set_phase_rc(param.name, test.rc)
@@ -65,7 +70,7 @@ def run(test):
                 continue
 
         # Reset to defaults after every phase (don't fail the phase on that)
-        test = cert_config.config_brg_defaults(test, modules=[dut.datapath])[0]
+        test = cert_config.config_brg_defaults(test, modules=[test.active_brg.datapath])[0]
         if test.rc == TEST_FAILED:
             test.add_reason("Failed to restore brg to defaults")
 
@@ -77,4 +82,4 @@ def run(test):
         else:
             test.reset_result()
 
-    return cert_common.test_epilog(test, revert_brgs=True, modules=[dut.datapath])
+    return cert_common.test_epilog(test, revert_brgs=True, modules=[test.active_brg.datapath])

certificate/tests/datapath/num_of_tags_test/num_of_tags_test.json

@@ -2,7 +2,7 @@
     "name": "Supported Pixels",
     "module": "Datapath",
     "purpose": "Test pixels handling in the bridge for different amount of pixels",
-    "documentation": "",
+    "documentation": "<TEST_DOCUMENTATION_LINK>",
     "initialCondition": "Bridge & data simulator configured to defaults",
     "procedure": ["Test prolog",
                   "Generate packets from the given amount of pixels & scan for packets in the bridge",
@@ -14,6 +14,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 1,
-    "SupportedFromApiVersion": 12,
-    "allSupportedValues": ["dynamic_parameters", 1000]
+    "allSupportedValues": [500, 1000, 2500, 5000]
 }

certificate/tests/datapath/num_of_tags_test/num_of_tags_test.py

@@ -51,11 +51,9 @@ def run(test):
         cert_config.send_brg_action(test, ag.ACTION_SEND_HB)
         test, mgmt_pkts = cert_common.scan_for_mgmt_pkts(test, [eval_pkt(f'Brg2GwHbV{test.active_brg.api_version}')])
         if not mgmt_pkts:
-            reason = "Didn't find ACTION HB pkt"
-            utPrint(reason, "RED")
-            test.set_phase_rc(param.name, TEST_FAILED)
-            test.add_phase_reason(param.name, "Didn't find ACTION HB pkt")
-            continue
+            test.rc = TEST_FAILED
+            test.add_reason("Didn't find ACTION HB pkt")
+            break
 
         num_of_tags_HB = mgmt_pkts[0][MGMT_PKT].pkt.tags_ctr
         print(f"Tags from HB: {num_of_tags_HB}\n ")
@@ -64,13 +62,11 @@ def run(test):
 
         # compare the numbers of tags that come from the brg, success in 95% from number of tags (value) or more.
         if num_of_tags < (param.value * 0.95):
-            test.add_reason(f"Received {num_of_tags} different pixels, expected: {param.name} pixels!")
-            test.rc = TEST_FAILED
+            test.add_reason(f"Received {num_of_tags} pixels, expected: {param.name} pixels!")
 
         # compare the counter tags in the HB packet
         if num_of_tags_HB < 0.95 * param.value or num_of_tags_HB > (param.value + 100):
-            test.add_reason(f"HB counter num_of_tags: {num_of_tags_HB}, expected: {param.name}!")
-            test.rc = TEST_FAILED
+            test.add_reason(f"HB counter: {num_of_tags_HB}, expected: {param.name}!")
         # param epilog
         time.sleep(10)
         cert_mqtt.generate_log_file(test, param.name)

certificate/tests/datapath/output_power_test/output_power_test.json

@@ -12,7 +12,6 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 13,
     "allSupportedValues": ["OUTPUT_POWER_2_4_MAX", "OUTPUT_POWER_2_4_MAX_MINUS_2", "OUTPUT_POWER_2_4_MAX_MINUS_3",
                            "OUTPUT_POWER_2_4_MAX_MINUS_4", "OUTPUT_POWER_2_4_MAX_MINUS_6", "OUTPUT_POWER_2_4_MAX_MINUS_7",
                            "OUTPUT_POWER_2_4_MAX_MINUS_8", "OUTPUT_POWER_2_4_MAX_MINUS_10", "OUTPUT_POWER_2_4_MAX_MINUS_11",

certificate/tests/datapath/pacer_interval_ble5_test/pacer_interval_ble5_test.json

@@ -12,6 +12,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": [5, 15, 30, 60]
 }

certificate/tests/datapath/pacer_interval_ble5_test/pacer_interval_ble5_test.py

@@ -10,15 +10,15 @@ import certificate.cert_data_sim as cert_data_sim
 def run(test):
 
     fields = [BRG_PACER_INTERVAL, BRG_RX_CHANNEL, BRG_PKT_FILTER]
-    dut = cert_config.get_brg_by_target(test, DUT)
+    datapath_module = test.active_brg.datapath
 
     test = cert_common.test_prolog(test)
     if test.rc == TEST_FAILED:
         return cert_common.test_epilog(test)
 
     for param in test.params:
-        test = cert_config.brg_configure(test, fields=fields, values=[param.value, ag.RX_CHANNEL_10_500K, ag.PKT_FILTER_TEMP_PKT],
-                                         module=dut.datapath, ble5=test.dut_is_bridge())[0]
+        test = cert_config.brg_configure_ble5(test, fields=fields, values=[param.value, ag.RX_CHANNEL_10_500K, ag.PKT_FILTER_TEMP_PKT],
+                                              module=datapath_module)[0]
         if test.rc == TEST_FAILED:
             if test.exit_on_param_failure:
                 break  # break the whole for loop and keep the test as failed
@@ -49,4 +49,4 @@ def run(test):
                 break  # break the whole for loop and keep the test as failed
         test.reset_result()  # reset result and continue to next param
 
-    return cert_common.test_epilog(test, revert_brgs=True, revert_gws=test.internal_brg, modules=[dut.datapath], ble5=test.dut_is_bridge())
+    return cert_common.test_epilog(test, revert_brgs=True, revert_gws=test.internal_brg, modules=[datapath_module], ble5=True)

certificate/tests/datapath/pacer_interval_test/pacer_interval_test.json

@@ -12,6 +12,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": [5, 10, 15, 30, 60]
 }

certificate/tests/datapath/pattern_test/pattern_test.json

@@ -12,6 +12,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": ["DATAPATH_PATTERN_STANDARD", "DATAPATH_PATTERN_38_38_39", "DATAPATH_PATTERN_EU_PATTERN", "DATAPATH_PATTERN_EXTENDED_ADV", "DATAPATH_PATTERN_EXTENDED_ADV_38_39", "DATAPATH_PATTERN_EXTENDED_ADV_CH_10"]
 }

certificate/tests/datapath/pkt_filter_ble5_chl21_test/pkt_filter_ble5_chl21_test.json

@@ -15,6 +15,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 13,
     "allSupportedValues": ["PKT_FILTER_RANDOM_FIRST_ARRIVING_PKT", "PKT_FILTER_DISABLE_FORWARDING", "PKT_FILTER_TEMP_PKT", "PKT_FILTER_TEMP_AND_ADVANCED_PKTS", "PKT_FILTER_TEMP_ADVANCED_AND_DEBUG_PKTS"]
 }

certificate/tests/datapath/pkt_filter_ble5_chl21_test/pkt_filter_ble5_chl21_test.py

@@ -12,16 +12,16 @@ PKT_FILTER_TEST_PACER_INTERVAL = 10
 def run(test):
 
     fields = [BRG_PKT_FILTER, BRG_RX_CHANNEL, BRG_PACER_INTERVAL]
-    dut = cert_config.get_brg_by_target(test, DUT)
+    datapath_module = eval(f'ModuleDatapathV{test.active_brg.api_version}')
 
     test = cert_common.test_prolog(test)
     if test.rc == TEST_FAILED:
         return cert_common.test_epilog(test)
 
     for param in test.params:
-        test = cert_config.brg_configure(test, fields=fields,
-                                         values=[param.value, RX_CHANNEL_21, PKT_FILTER_TEST_PACER_INTERVAL],
-                                         module=dut.datapath, ble5=test.dut_is_bridge())[0]
+        test = cert_config.brg_configure_ble5(test, fields=fields,
+                                              values=[param.value, RX_CHANNEL_21, PKT_FILTER_TEST_PACER_INTERVAL],
+                                              module=datapath_module)[0]
         test.set_phase_rc(param.name, test.rc)
         test.add_phase_reason(param.name, test.reason)
         if test.rc == TEST_FAILED:
@@ -58,4 +58,4 @@ def run(test):
                 break  # break the whole for loop and keep the test as failed
         test.reset_result()  # reset result and continue to next param
 
-    return cert_common.test_epilog(test, revert_brgs=True, revert_gws=test.internal_brg, modules=[dut.datapath], ble5=test.dut_is_bridge())
+    return cert_common.test_epilog(test, revert_brgs=True, revert_gws=test.internal_brg, modules=[datapath_module], ble5=True)

certificate/tests/datapath/pkt_filter_ble5_test/pkt_filter_ble5_test.json

@@ -15,6 +15,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": ["PKT_FILTER_RANDOM_FIRST_ARRIVING_PKT", "PKT_FILTER_DISABLE_FORWARDING", "PKT_FILTER_TEMP_PKT", "PKT_FILTER_TEMP_AND_ADVANCED_PKTS", "PKT_FILTER_TEMP_ADVANCED_AND_DEBUG_PKTS"]
 }

certificate/tests/datapath/pkt_filter_ble5_test/pkt_filter_ble5_test.py

@@ -12,16 +12,16 @@ PKT_FILTER_TEST_PACER_INTERVAL = 10
 def run(test):
 
     fields = [BRG_PKT_FILTER, BRG_RX_CHANNEL, BRG_PACER_INTERVAL]
-    dut = cert_config.get_brg_by_target(test, DUT)
+    datapath_module = eval(f'ModuleDatapathV{test.active_brg.api_version}')
 
     test = cert_common.test_prolog(test)
     if test.rc == TEST_FAILED:
         return cert_common.test_epilog(test)
 
     for param in test.params:
-        test = cert_config.brg_configure(test, fields=fields,
-                                         values=[param.value, RX_CHANNEL_10_500K, PKT_FILTER_TEST_PACER_INTERVAL],
-                                         module=dut.datapath, ble5=test.dut_is_bridge())[0]
+        test = cert_config.brg_configure_ble5(test, fields=fields,
+                                              values=[param.value, RX_CHANNEL_10_500K, PKT_FILTER_TEST_PACER_INTERVAL],
+                                              module=datapath_module)[0]
         test.set_phase_rc(param.name, test.rc)
         test.add_phase_reason(param.name, test.reason)
         if test.rc == TEST_FAILED:
@@ -57,4 +57,4 @@ def run(test):
                 break  # break the whole for loop and keep the test as failed
         test.reset_result()  # reset result and continue to next param
 
-    return cert_common.test_epilog(test, revert_brgs=True, revert_gws=test.internal_brg, modules=[dut.datapath], ble5=test.dut_is_bridge())
+    return cert_common.test_epilog(test, revert_brgs=True, revert_gws=test.internal_brg, modules=[datapath_module], ble5=True)

certificate/tests/datapath/pkt_filter_brg2gw_ext_adv_test/pkt_filter_brg2gw_ext_adv_test.json

@@ -14,6 +14,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 13,
     "allSupportedValues": ["RX_CHANNEL_37", "RX_CHANNEL_38", "RX_CHANNEL_39", "RX_CHANNEL_10_500K"]
 }

certificate/tests/datapath/pkt_filter_brg2gw_ext_adv_test/pkt_filter_brg2gw_ext_adv_test.py

@@ -12,16 +12,15 @@ PKT_FILTER_TEST_PACER_INTERVAL = 4
 def run(test):
 
     fields = [BRG_PKT_FILTER, BRG_RX_CHANNEL, BRG_PACER_INTERVAL, BRG_PATTERN]
-    dut = cert_config.get_brg_by_target(test, DUT)
+    datapath_module = eval(f'ModuleDatapathV{test.active_brg.api_version}')
 
     test = cert_common.test_prolog(test)
     if test.rc == TEST_FAILED:
         return cert_common.test_epilog(test)
 
-    test = cert_config.brg_configure(test, fields=fields,
-                                     values=[PKT_FILTER_TEMP_AND_ADVANCED_PKTS, RX_CHANNEL_10_500K,
-                                             PKT_FILTER_TEST_PACER_INTERVAL, DATAPATH_PATTERN_EXTENDED_ADV],
-                                     module=dut.datapath, ble5=test.dut_is_bridge())[0]
+    test = cert_config.brg_configure_ble5(test, fields=fields, values=[PKT_FILTER_TEMP_AND_ADVANCED_PKTS,
+                                          RX_CHANNEL_10_500K, PKT_FILTER_TEST_PACER_INTERVAL,
+                                          DATAPATH_PATTERN_EXTENDED_ADV], module=datapath_module)[0]
     if test.rc == TEST_FAILED:
         return cert_common.test_epilog(test)
 
@@ -42,10 +41,9 @@ def run(test):
 
         # Configure the BRG to DATAPATH_PATTERN_EXTENDED_ADV_CH_10 if the GW listens to channel 10
         if param.value == RX_CHANNEL_10_500K:
-            test = cert_config.brg_configure(test, fields=fields,
-                                             values=[PKT_FILTER_TEMP_AND_ADVANCED_PKTS, RX_CHANNEL_10_500K,
-                                                     PKT_FILTER_TEST_PACER_INTERVAL, DATAPATH_PATTERN_EXTENDED_ADV_CH_10],
-                                             module=dut.datapath, ble5=test.dut_is_bridge())[0]
+            test = cert_config.brg_configure_ble5(test, fields=fields, values=[PKT_FILTER_TEMP_AND_ADVANCED_PKTS,
+                                                  RX_CHANNEL_10_500K, PKT_FILTER_TEST_PACER_INTERVAL,
+                                                  DATAPATH_PATTERN_EXTENDED_ADV_CH_10], module=datapath_module)[0]
             if test.rc == TEST_FAILED:
                 if test.exit_on_param_failure:
                     break  # break the whole for loop and keep the test as failed
@@ -82,4 +80,4 @@ def run(test):
         # Revert tester's rx channel
         test = cert_config.brg_configure(test, module=test.tester.internal_brg.datapath, target=TESTER)[0]
 
-    return cert_common.test_epilog(test, revert_brgs=True, modules=[dut.datapath], ble5=test.dut_is_bridge())
+    return cert_common.test_epilog(test, revert_brgs=True, modules=[datapath_module], ble5=True)

certificate/tests/datapath/pkt_filter_gen3_test/pkt_filter_gen3_test.json

@@ -15,6 +15,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": ["PKT_FILTER_RANDOM_FIRST_ARRIVING_PKT", "PKT_FILTER_DISABLE_FORWARDING", "PKT_FILTER_TEMP_PKT", "PKT_FILTER_TEMP_AND_ADVANCED_PKTS"]
 }

certificate/tests/datapath/pkt_filter_test/pkt_filter_test.json

@@ -15,6 +15,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": ["PKT_FILTER_RANDOM_FIRST_ARRIVING_PKT", "PKT_FILTER_DISABLE_FORWARDING", "PKT_FILTER_TEMP_PKT", "PKT_FILTER_TEMP_AND_ADVANCED_PKTS", "PKT_FILTER_TEMP_ADVANCED_AND_DEBUG_PKTS"]
 }

certificate/tests/datapath/rssi_threshold_test/rssi_threshold_test.json

@@ -2,7 +2,7 @@
     "name": "RSSI Threshold",
     "module": "Datapath",
     "purpose": "Test RSSI threshold configuration and functionality in the bridge",
-    "documentation": "",
+    "documentation": "<TEST_DOCUMENTATION_LINK>",
     "initialCondition": "Bridge configured to defaults",
     "procedure": ["Test prolog",
                   "RSSI Threshold configuration",
@@ -13,6 +13,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": ["-80", "-65", "-10"]
 }

certificate/tests/datapath/rx_channel_hopping_test/rx_channel_hopping_test.json

@@ -13,6 +13,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 13,
     "allSupportedValues": []
 }

certificate/tests/datapath/rx_channel_test/rx_channel_test.json

@@ -12,6 +12,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 13,
     "allSupportedValues": ["RX_CHANNEL_37", "RX_CHANNEL_38", "RX_CHANNEL_39", "RX_CHANNEL_10_500K", "RX_CHANNEL_HOPPING_37_10"]
 }

certificate/tests/datapath/rx_rate_gen2_test/rx_rate_gen2_test.json

@@ -16,6 +16,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 1,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": ["mid_values", "diff_pacer", "min_value", "max_value", "diff_rate"]
 }

certificate/tests/datapath/rx_rate_gen2_test/rx_rate_gen2_test.py

@@ -31,7 +31,7 @@ def cal_scan_time(test, delay, pacer_interval):
 
 def scan_and_compare(test, pacer_interval, delay, expected_TBC_value):
 
-    pixel_sim_thread = cert_data_sim.DataSimThread(test=test, num_of_pixels=1, duplicates=3, delay=delay, pkt_types=[0], pixels_type=GEN2)
+    pixel_sim_thread = cert_data_sim.DataSimThread(test=test, num_of_pixels=1, duplicates=3, delay=delay, pkt_types=[0], pixels_type=GEN3)
     pixel_sim_thread.start()
     test, scan_time = cal_scan_time(test, delay, pacer_interval)
     df = cert_common.data_scan(test, scan_time=scan_time, brg_data=(not test.internal_brg), gw_data=test.internal_brg)

certificate/tests/datapath/rx_rate_gen3_test/rx_rate_gen3_test.json

@@ -16,6 +16,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 1,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": ["mid_values", "diff_pacer", "min_value", "max_value", "diff_rate"]
 }

certificate/tests/datapath/stress_gen3_test/stress_gen3_test.json

@@ -17,6 +17,5 @@
     "gwOnlyTest": 0,
     "bridgeOnlyTest": 1,
     "dataSimOnlyTest": 1,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": ["rep3", "rep2", "rep1"]
 }

certificate/tests/datapath/stress_gen3_test/stress_gen3_test.py

@@ -206,7 +206,4 @@ def run(test):
     # Re-enable unified packets deduplication
     cert_config.gw_action(test, f"{DEDUPLICATION_PKTS} 1")
 
-    # wait a few seconds to ensure bridge relaxed before next test
-    wait_time_n_print(60)
-
     return cert_common.test_epilog(test, revert_brgs=True, modules=[datapath_module])

certificate/tests/datapath/stress_test/stress_test.json

@@ -17,6 +17,5 @@
     "gwOnlyTest": 0,
     "bridgeOnlyTest": 1,
     "dataSimOnlyTest": 1,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": ["rep3", "rep2", "rep1"]
 }

certificate/tests/datapath/stress_test/stress_test.py

@@ -205,7 +205,4 @@ def run(test):
     # Re-enable unified packets deduplication
     cert_config.gw_action(test, f"{DEDUPLICATION_PKTS} 1")
 
-    # wait a few seconds to ensure bridge relaxed before next test
-    wait_time_n_print(60)
-
     return cert_common.test_epilog(test, revert_brgs=True, modules=[datapath_module])

certificate/tests/datapath/tx_repetition_test/tx_repetition_test.json

@@ -14,6 +14,5 @@
     "gwOnlyTest": 0,
     "bridgeOnlyTest": 1,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": [1, 2, 3, 4, 5, 6]
 }

certificate/tests/edge_mgmt/action_blink_test/action_blink_test.json

@@ -10,6 +10,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": []
 }

certificate/tests/edge_mgmt/action_get_battery_sensor_test/action_get_battery_sensor_test.json

@@ -10,6 +10,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": []
 }

certificate/tests/edge_mgmt/action_get_module_test/action_get_module_test.json

@@ -10,6 +10,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": []
 }

certificate/tests/edge_mgmt/action_get_pof_data_test/action_get_pof_data_test.json

@@ -10,6 +10,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": []
 }

certificate/tests/edge_mgmt/action_gw_hb_test/action_gw_hb_test.json

@@ -11,6 +11,5 @@
     "gwOnlyTest": 0,
     "bridgeOnlyTest": 1,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": []
 }

certificate/tests/edge_mgmt/action_reboot_test/action_reboot_test.json

@@ -10,6 +10,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": []
 }

certificate/tests/edge_mgmt/action_restore_defaults_test/action_restore_defaults_test.json

@@ -10,6 +10,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 13,
     "allSupportedValues": []
 }

certificate/tests/edge_mgmt/action_send_hb_test/action_send_hb_test.json

@@ -10,6 +10,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": []
 }

certificate/tests/edge_mgmt/action_send_hb_test/action_send_hb_test.py

@@ -20,24 +20,20 @@ def run(test):
     if not mgmt_pkts:
         test.add_reason("Didn't find ACTION HB pkt")
         test.rc = TEST_FAILED
-    elif test.active_brg.api_version >= ag.API_VERSION_V13:
-        utPrint("Got HB pkt", "GREEN")
-        algo_tx_rep_val = []
-        for p in mgmt_pkts:
-            algo_tx_rep_val.append(p[MGMT_PKT].pkt.algo_tx_rep)
-        if test.dut_is_combo() and any(val != 0 for val in algo_tx_rep_val):
-            invalid_vals = [val for val in algo_tx_rep_val if val != 0]
-            print(f"ERROR: tx_rep_algo yielded invalid value(s) {invalid_vals} instead of '0' for internal brg!")
-            test.add_reason("Internal's BRG tx_rep_algo isn't working as expected!")
-            test.rc = TEST_FAILED
-        elif test.dut_is_bridge() and any((val < 1 or val > 3) for val in algo_tx_rep_val):
-            invalid_vals = [val for val in algo_tx_rep_val if val < 1 or val > 3]
-            print(f"ERROR: tx_rep_algo yielded invalid value(s) {invalid_vals}!")
-            test.add_reason("BRG's tx_rep_algo isn't working as expected!")
-            test.rc = TEST_FAILED
-        print(f"tx_rep_algo yielded valid value(s) of - {algo_tx_rep_val}")
-    else:
-        utPrint("Got HB pkt, Skipping tx_rep_algo hb field check - API version < V13", "GREEN")
+    algo_tx_rep_val = []
+    for p in mgmt_pkts:
+        algo_tx_rep_val.append(p[MGMT_PKT].pkt.algo_tx_rep)
+    if (test.internal_brg or test.dut_is_combo()) and any(val != 0 for val in algo_tx_rep_val):
+        invalid_vals = [val for val in algo_tx_rep_val if val != 0]
+        print(f"ERROR: tx_rep_algo yielded invalid value(s) {invalid_vals} instead of '0' for internal brg!")
+        test.add_reason("Internal's BRG tx_rep_algo isn't working as expected!")
+        test.rc = TEST_FAILED
+    elif not (test.internal_brg or test.dut_is_combo()) and any((val < 1 or val > 3) for val in algo_tx_rep_val):
+        invalid_vals = [val for val in algo_tx_rep_val if val < 1 or val > 3]
+        print(f"ERROR: tx_rep_algo yielded invalid value(s) {invalid_vals}!")
+        test.add_reason("BRG's tx_rep_algo isn't working as expected!")
+        test.rc = TEST_FAILED
+    print(f"tx_rep_algo yielded valid value(s) of - {algo_tx_rep_val}")
 
     cert_mqtt.generate_log_file(test, "action_send_hb")
     field_functionality_pass_fail_print(test, "action_send_hb")

certificate/tests/edge_mgmt/periodic_msgs_test/periodic_msgs_test.json

@@ -10,6 +10,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": []
 }

certificate/tests/energy2400/duty_cycle_test/duty_cycle_test.json

@@ -12,6 +12,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": [1, 25, 50, 75]
 }

certificate/tests/energy2400/output_power_test/output_power_test.json

@@ -12,7 +12,6 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 13,
     "allSupportedValues": ["OUTPUT_POWER_2_4_MAX", "OUTPUT_POWER_2_4_MAX_MINUS_2", "OUTPUT_POWER_2_4_MAX_MINUS_3",
                            "OUTPUT_POWER_2_4_MAX_MINUS_4", "OUTPUT_POWER_2_4_MAX_MINUS_6", "OUTPUT_POWER_2_4_MAX_MINUS_7",
                            "OUTPUT_POWER_2_4_MAX_MINUS_8", "OUTPUT_POWER_2_4_MAX_MINUS_10", "OUTPUT_POWER_2_4_MAX_MINUS_11",

certificate/tests/energy2400/pattern_test/pattern_test.json

@@ -12,6 +12,5 @@
     "multiBridgeTest": 0,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 12,
     "allSupportedValues": ["ENERGY_PATTERN_2_4_NO_ENERGIZING", "ENERGY_PATTERN_2_4_CHANNEL_37", "ENERGY_PATTERN_2_4_CHANNEL_38", "ENERGY_PATTERN_2_4_CHANNEL_39", "ENERGY_PATTERN_2_4_FREQ_2450", "ENERGY_PATTERN_2_4_FREQ_2454"]
 }

certificate/tests/energy2400/signal_indicator_ble5_test/signal_indicator_ble5_test.json

@@ -21,6 +21,5 @@
     "multiBridgeTest": 1,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 13,
     "allSupportedValues": ["rssi_threshold", "rx", "tx", "disable_tx", "disable_rx", "rx_tx"]
 }

certificate/tests/energy2400/signal_indicator_ble5_test/signal_indicator_ble5_test.py

@@ -28,6 +28,7 @@ import certificate.cert_config as cert_config
 NUM_OF_SCANNING_CYCLE = 5
 DEFAULT_SCAN_TIME = 30
 SCAN_DELAY_TIME = 3
+BLE5_MAX_DURATION_SEC = ag.BLE5_PARAM_PRIMARY_CHANNEL_SCAN_CYCLE // 1000 + 1
 
 
 def test_rssi_threshold(test):
@@ -284,7 +285,7 @@ def test_rx_tx(test):
         print(rec_sig_ind_pkts)  # TODO: logging print(debug)
 
     # Analyzing tester performance as receiver
-    utPrint(f"Analyzing DUT {dut.id_str} performance as a Transmitter\n", "BOLD")
+    utPrint(f"Analyzing DUT {tester.id_str} performance as a Transmitter\n", "BOLD")
     rec_sig_ind_pkts = cert_common.get_all_sig_ind_pkts(test=test, rx_brg=tester, tx_brg=dut)
     if cert_common.sig_ind_pkts_fail_analysis(tx_brg=dut, rx_brg=tester, cycles=NUM_OF_SCANNING_CYCLE, received_pkts=rec_sig_ind_pkts):
         test.rc = TEST_FAILED
@@ -323,8 +324,6 @@ def run(test):
         return cert_common.test_epilog(test, revert_brgs=True,
                                        modules=[dut.datapath],
                                        ble5=test.dut_is_bridge())
-    if test.dut_is_bridge():
-        wait_time_n_print(BLE5_MAX_DURATION_SEC)  # BLE5 configuration can take up to BLE5_MAX_DURATION_SEC
     # Configure TESTER to scan ble5 channel during all the test
     test = cert_config.brg_configure(test, fields=[BRG_RX_CHANNEL],
                                      values=[ag.RX_CHANNEL_10_500K],
@@ -367,7 +366,7 @@ def run(test):
         else:
             test.reset_result()
 
-    # Revert DUT and TESTER to defaults here and not in epilog
+    # Revert DUT to defaults here and not in epilog
     test = cert_config.config_brg_defaults(test, modules=[dut.datapath], ble5=test.dut_is_bridge(), wait=test.dut_is_combo())[0]
     if test.rc == TEST_FAILED:
         test.add_reason("Failed to revert brg0 datapath to defaults")

certificate/tests/energy2400/signal_indicator_ext_adv_test/signal_indicator_ext_adv_test.json

@@ -1,20 +1,20 @@
 {
     "name": "Signal Indicator Extended Advertising",
     "module": "Energizer 2.4GHz",
-    "purpose": "Verify Signal Indicator functionality when using bridge with extended advertising pattern",
+    "purpose": "verify Signal Indicator functionality when using bridge with extended advertising pattern",
     "documentation": "https://community.wiliot.com/customers/s/article/Bridge-to-Bridge-Signal-Indicator",
     "initialCondition": "Bridge configured to defaults",
-    "procedure": [
-        "Test prolog - Initialize test environment and configure bridges to defaults",
-        "ext_adv_rx37 - Configure DUT as Transmitter with extended advertising pattern and RX channel 37, and TESTER as Receiver and Analyze received signal indicator packets count, RX/TX antenna, output power, and RSSI values",
-        "ext_adv_rx10 - Configure DUT as Transmitter with extended advertising pattern and RX channel 10, and TESTER as Receiver and Analyze received signal indicator packets count, RX/TX antenna, output power, and RSSI values",
-        "Test epilog - Finalize test results and log outcomes"
-    ],
+    "procedure": ["Test prolog",
+    "rssi_threshold - check the if rssi value is between 0 to -25.",
+    "brg0_tx_brg1_rx - one brg is transmitter and the second is receiver, we expect to get the same values from the receiver, according to the tx params",
+    "brg0_none_brg1_rx - One rx BRG without any tx BRG. We don't expect to see any signal indicator packets.",
+    "brg0_rxtx_brg1_rxtx - Both BRG's will be configured to be transmitters and receivers, with different tx params for each one. we expect to see signal indicator packets from both BRG's, according to the tx params.",
+    "brg0_tx_brg1_none - One BRG will be configured as signal indicator tx, but no rx, so we don't expect to receive signal indicator packets.",
+    "Test epilog"],
     "expectedOutcome": "All phases passed successfully!",
     "mandatory": 0,
     "multiBridgeTest": 1,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "SupportedFromApiVersion": 13,
-    "allSupportedValues": ["ext_adv_rx37", "ext_adv_rx10"]
+    "allSupportedValues": ["rssi_threshold", "brg0_tx_brg1_rx", "brg0_none_brg1_rx", "brg0_rxtx_brg1_rxtx", "brg0_tx_brg1_none"]
 }