wiliot-certificate 4.5.0a2__py3-none-any.whl → 4.5.0a3__py3-none-any.whl

certificate/cert_common.py

@@ -606,8 +606,8 @@ def run_event_test_phase(test, phase, datapath_module, values, scan_time, event_
         scan_time_multiplier = (1 / 3)
         fields += [BRG_RSSI_MOVEMENT_THRESHOLD]
 
-    test = (cert_config.brg_configure_ble5(test, fields=fields, values=values, module=datapath_module)[0] if ble5_test
-            else cert_config.brg_configure(test, fields=fields, values=values, module=datapath_module)[0])
+    ble5 = ble5_test and test.dut_is_bridge()  # ble5 only for bridge dut (with combo we don't need to wait)
+    test = cert_config.brg_configure(test, fields=fields, values=values, module=datapath_module, ble5=ble5)[0]
     test.set_phase_rc(phase, test.rc)
     test.add_phase_reason(phase, test.reason)
     if test.rc == TEST_FAILED and test.exit_on_param_failure:

certificate/cert_config.py

@@ -313,14 +313,14 @@ def brg_configure_ble5(test, cfg_pkt=None, module=None, fields=None, values=None
     if wait is False:
         return test, DONE
     while not pkts_found:
-        if ((datetime.datetime.now() - start_time).seconds > ((ag.BLE5_PARAM_PRIMARY_CHANNEL_SCAN_CYCLE/1000)+1)):
+        if ((datetime.datetime.now() - start_time).seconds > BLE5_MAX_DURATION_SEC):
             if num_of_tries < 3:
                 num_of_tries += 1
                 start_time = datetime.datetime.now()
                 gw_downlink(test=test, raw_tx_data=cfg_pkt.dump(), max_duration=BLE5_MAX_DURATION_MS, max_retries=BLE5_MAX_RETRIES, target=target)
-                print(f"Brg configure - BLE5 mode : No pkts found after {(ag.BLE5_PARAM_PRIMARY_CHANNEL_SCAN_CYCLE/1000)+1} seconds, in try number {num_of_tries}")
+                print(f"Brg configure - BLE5 mode : No pkts found after {BLE5_MAX_DURATION_SEC} seconds, in try number {num_of_tries}")
             else:
-                test.add_reason(f"Brg configure - BLE5 mode : No pkts found after {BLE5_MAX_DURATION_MS} seconds, in 3 tries")
+                test.add_reason(f"Brg configure - BLE5 mode : No pkts found after {BLE5_MAX_DURATION_SEC} seconds, in 3 tries")
                 test.rc = TEST_FAILED
                 time.sleep(1)
                 mqttc.flush_pkts()

certificate/certificate_eth_test_list.txt

@@ -22,6 +22,7 @@ energy2400/output_power_test OUTPUT_POWER_2_4_MAX_MINUS_26 OUTPUT_POWER_2_4_MAX_
 energy2400/duty_cycle_test 1 25 50 75
 energy2400/signal_indicator_test rssi_threshold rx tx_eu_pattern disable_rx disable_tx rx_tx
 energy2400/signal_indicator_ble5_test rssi_threshold rx tx disable_rx disable_tx rx_tx
+energy2400/signal_indicator_ext_adv_test ext_adv_rx37 ext_adv_rx10
 
 # ------------- energy_sub1g -------------
 energy_sub1g/pattern_test SUB1G_ENERGY_PATTERN_NO_ENERGIZING SUB1G_ENERGY_PATTERN_SINGLE_TONE_915000 SUB1G_ENERGY_PATTERN_FCC_HOPPING SUB1G_ENERGY_PATTERN_SINGLE_TONE_917500 SUB1G_ENERGY_PATTERN_NZ_HOPPING
@@ -67,8 +68,8 @@ cloud_connectivity/uplink_test mgmt_pkt pixels_pkt sensor_pkt
 cloud_connectivity/downlink_test
 cloud_connectivity/uplink_ext_adv_test
 cloud_connectivity/reboot_test
-cloud_connectivity/stress_test 20 40 60 80 100 120 140 160 180 200 222 250 285 333
-cloud_connectivity/ext_adv_stress_test 20 40 60 80 100 120 140 160 180 200
+cloud_connectivity/stress_test
+cloud_connectivity/ext_adv_stress_test
 cloud_connectivity/channel_scan_behaviour_test
 cloud_connectivity/acl_test deny allow
 cloud_connectivity/acl_ext_adv_test deny allow

certificate/certificate_sanity_test_list.txt

@@ -22,6 +22,7 @@ energy2400/output_power_test OUTPUT_POWER_2_4_MAX_MINUS_14 OUTPUT_POWER_2_4_MAX_
 energy2400/duty_cycle_test 1 50 75
 energy2400/signal_indicator_test rx_tx
 energy2400/signal_indicator_ble5_test rx_tx
+energy2400/signal_indicator_ext_adv_test ext_adv_rx37
 
 # ------------- energy_sub1g -------------
 energy_sub1g/pattern_test SUB1G_ENERGY_PATTERN_NO_ENERGIZING SUB1G_ENERGY_PATTERN_FCC_HOPPING SUB1G_ENERGY_PATTERN_SINGLE_TONE_917500 SUB1G_ENERGY_PATTERN_NZ_HOPPING
@@ -59,7 +60,7 @@ cloud_connectivity/uplink_test mgmt_pkt pixels_pkt
 cloud_connectivity/downlink_test
 cloud_connectivity/uplink_ext_adv_test
 cloud_connectivity/reboot_test
-cloud_connectivity/stress_test 100 222
-cloud_connectivity/ext_adv_stress_test 20 100
+cloud_connectivity/stress_test
+cloud_connectivity/ext_adv_stress_test
 cloud_connectivity/acl_test deny
 cloud_connectivity/acl_ext_adv_test allow

certificate/certificate_test_list.txt

@@ -22,7 +22,7 @@ energy2400/output_power_test OUTPUT_POWER_2_4_MAX_MINUS_26 OUTPUT_POWER_2_4_MAX_
 energy2400/duty_cycle_test 1 25 50 75
 energy2400/signal_indicator_test rssi_threshold rx tx_eu_pattern disable_rx disable_tx rx_tx
 energy2400/signal_indicator_ble5_test rssi_threshold rx tx disable_rx disable_tx rx_tx
-#energy2400/signal_indicator_ext_adv_test rssi_threshold brg0_tx_brg1_rx brg0_rxtx_brg1_rxtx
+energy2400/signal_indicator_ext_adv_test ext_adv_rx37 ext_adv_rx10
 
 # ------------- energy_sub1g -------------
 energy_sub1g/pattern_test SUB1G_ENERGY_PATTERN_NO_ENERGIZING SUB1G_ENERGY_PATTERN_SINGLE_TONE_915000 SUB1G_ENERGY_PATTERN_FCC_HOPPING SUB1G_ENERGY_PATTERN_SINGLE_TONE_917500 SUB1G_ENERGY_PATTERN_NZ_HOPPING
@@ -67,8 +67,8 @@ cloud_connectivity/uplink_test mgmt_pkt pixels_pkt sensor_pkt geolocation
 cloud_connectivity/downlink_test
 cloud_connectivity/uplink_ext_adv_test
 cloud_connectivity/reboot_test
-cloud_connectivity/stress_test 20 40 60 80 100 120 140 160 180 200 222 250 285 333
-cloud_connectivity/ext_adv_stress_test 20 40 60 80 100 120 140 160 180 200
+cloud_connectivity/stress_test
+cloud_connectivity/ext_adv_stress_test
 cloud_connectivity/channel_scan_behaviour_test
 cloud_connectivity/acl_test deny allow
 cloud_connectivity/acl_ext_adv_test deny allow

certificate/tests/cloud_connectivity/downlink_test/downlink_test.py

@@ -121,10 +121,7 @@ def report_and_results(test, sniffed_pkts):
         test.reason = 'No packets collected.'
         return
 
-    if test.active_brg.board_type == ag.BOARD_TYPE_FANSTEL_WIFI_V0:
-        x_value = ('tx_max_retries', 'TX Max Retries')
-    else:
-        x_value = ('tx_max_duration', 'TX Max Duration')
+    x_value = ('tx_max_duration', 'TX Max Duration')
 
     # Create scatter with OLS trendline per channel
     fig = px.scatter(

certificate/tests/datapath/event_ble5_test/event_ble5_test.py

@@ -63,10 +63,11 @@ 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, test.active_brg.datapath)
+        test = EVENT_TEST_MAP[param.value](test, param.name, dut.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)
@@ -79,10 +80,11 @@ 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=[test.active_brg.datapath], ble5=True)[0]
-        print_update_wait(2 * BLE5_MAX_DURATION_SEC)
+        test = cert_config.config_brg_defaults(test, modules=[dut.datapath], ble5=test.dut_is_bridge())[0]
         if test.rc == TEST_FAILED:
             test.add_reason("Failed to restore brg to defaults")
+        if test.dut_is_bridge():
+            wait_time_n_print(BLE5_MAX_DURATION_SEC)
 
         if test.rc == TEST_FAILED:
             test.set_phase_rc(param.name, test.rc)
@@ -92,4 +94,4 @@ def run(test):
         else:
             test.reset_result()
 
-    return cert_common.test_epilog(test, revert_brgs=True, modules=[test.active_brg.datapath], ble5=True)
+    return cert_common.test_epilog(test, revert_brgs=True, modules=[dut.datapath], ble5=test.dut_is_bridge())

certificate/tests/datapath/event_test/event_test.py

@@ -54,10 +54,11 @@ 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, test.active_brg.datapath)
+        test = EVENT_TEST_MAP[param.value](test, param.name, dut.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)
@@ -70,7 +71,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=[test.active_brg.datapath])[0]
+        test = cert_config.config_brg_defaults(test, modules=[dut.datapath])[0]
         if test.rc == TEST_FAILED:
             test.add_reason("Failed to restore brg to defaults")
 
@@ -82,4 +83,4 @@ def run(test):
         else:
             test.reset_result()
 
-    return cert_common.test_epilog(test, revert_brgs=True, modules=[test.active_brg.datapath])
+    return cert_common.test_epilog(test, revert_brgs=True, modules=[dut.datapath])

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]
-    datapath_module = test.active_brg.datapath
+    dut = cert_config.get_brg_by_target(test, DUT)
 
     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_ble5(test, fields=fields, values=[param.value, ag.RX_CHANNEL_10_500K, ag.PKT_FILTER_TEMP_PKT],
-                                              module=datapath_module)[0]
+        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]
         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=[datapath_module], ble5=True)
+    return cert_common.test_epilog(test, revert_brgs=True, revert_gws=test.internal_brg, modules=[dut.datapath], ble5=test.dut_is_bridge())

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]
-    datapath_module = eval(f'ModuleDatapathV{test.active_brg.api_version}')
+    dut = cert_config.get_brg_by_target(test, DUT)
 
     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_ble5(test, fields=fields,
-                                              values=[param.value, RX_CHANNEL_21, PKT_FILTER_TEST_PACER_INTERVAL],
-                                              module=datapath_module)[0]
+        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.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=[datapath_module], ble5=True)
+    return cert_common.test_epilog(test, revert_brgs=True, revert_gws=test.internal_brg, modules=[dut.datapath], ble5=test.dut_is_bridge())

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]
-    datapath_module = eval(f'ModuleDatapathV{test.active_brg.api_version}')
+    dut = cert_config.get_brg_by_target(test, DUT)
 
     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_ble5(test, fields=fields,
-                                              values=[param.value, RX_CHANNEL_10_500K, PKT_FILTER_TEST_PACER_INTERVAL],
-                                              module=datapath_module)[0]
+        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.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=[datapath_module], ble5=True)
+    return cert_common.test_epilog(test, revert_brgs=True, revert_gws=test.internal_brg, modules=[dut.datapath], ble5=test.dut_is_bridge())

certificate/tests/datapath/pkt_filter_brg2gw_ext_adv_test/pkt_filter_brg2gw_ext_adv_test.py

@@ -12,15 +12,16 @@ PKT_FILTER_TEST_PACER_INTERVAL = 4
 def run(test):
 
     fields = [BRG_PKT_FILTER, BRG_RX_CHANNEL, BRG_PACER_INTERVAL, BRG_PATTERN]
-    datapath_module = eval(f'ModuleDatapathV{test.active_brg.api_version}')
+    dut = cert_config.get_brg_by_target(test, DUT)
 
     test = cert_common.test_prolog(test)
     if test.rc == TEST_FAILED:
         return cert_common.test_epilog(test)
 
-    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]
+    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]
     if test.rc == TEST_FAILED:
         return cert_common.test_epilog(test)
 
@@ -41,9 +42,10 @@ 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_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]
+            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]
             if test.rc == TEST_FAILED:
                 if test.exit_on_param_failure:
                     break  # break the whole for loop and keep the test as failed
@@ -80,4 +82,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=[datapath_module], ble5=True)
+    return cert_common.test_epilog(test, revert_brgs=True, modules=[dut.datapath], ble5=test.dut_is_bridge())

certificate/tests/energy2400/signal_indicator_ble5_test/signal_indicator_ble5_test.py

@@ -28,7 +28,6 @@ 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):
@@ -366,7 +365,7 @@ def run(test):
         else:
             test.reset_result()
 
-    # Revert DUT to defaults here and not in epilog
+    # Revert DUT and TESTER 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,19 @@
 {
     "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",
-    "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"],
+    "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"
+    ],
     "expectedOutcome": "All phases passed successfully!",
     "mandatory": 0,
     "multiBridgeTest": 1,
     "gwOnlyTest": 0,
     "dataSimOnlyTest": 0,
-    "allSupportedValues": ["rssi_threshold", "brg0_tx_brg1_rx", "brg0_none_brg1_rx", "brg0_rxtx_brg1_rxtx", "brg0_tx_brg1_none"]
+    "allSupportedValues": ["ext_adv_rx37", "ext_adv_rx10"]
 }