wiliot-certificate 4.5.0a2__tar.gz → 4.5.0a3__tar.gz

{wiliot_certificate-4.5.0a2 → wiliot_certificate-4.5.0a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wiliot_certificate
-Version: 4.5.0a2
+Version: 4.5.0a3
 Summary: A library for certifying Wiliot-compliant boards
 Author-email: Wiliot <support@wiliot.com>
 License-Expression: MIT
@@ -30,7 +30,7 @@ Requires-Dist: reportlab>=4.3.1
 Requires-Dist: google-api-python-client>=2.162.0
 Dynamic: license-file
 
-# wiliot-certificate Version 4.5.0
+# wiliot-certificate
 
 <!-- Description -->
 wiliot-certificate is a Python library that provides tools for testing and certifying boards for compatibility with Wiliot’s ecosystem.
@@ -40,18 +40,16 @@ This python package includes the following tools:
  - Tester Upgrade (`wlt-cert-tester-upgrade`)
  - Registration Certificate (`wlt-cert-reg`)
 
-# Version: 
-wiliot-certificate versions 4.5.0 are compatible with firmware version >=4.5.0 (API VERSION: 13)
+# Versioning: 
+wiliot-certificate versions 4.5.x are compatible with firmware version >=4.5.0 (API VERSION: 13)
 
 ## Installing wiliot-certificate
-Install wiliot-certificate:
 ````commandline
 pip install wiliot-certificate
 ````
 
 ## Using wiliot-certificate
 ### Certification
-In terminal, run:
 ````commandline
 wlt-cert
 ````
@@ -63,7 +61,6 @@ Once set up it opens a terminal and tests your device.
 
 
 ### Certificate CLI
-In terminal, run:
 ````commandline
 wlt-cert-cli -h
 ````
@@ -71,7 +68,6 @@ CLI version of the certificate. Use -h for details on the different arguments.
 
 
 ### Tester Upgrade
-In terminal, run:
 ````commandline
 wlt-cert-tester-upgrade
 ````
@@ -79,7 +75,6 @@ Upgrades the firmware of the tester device to the version required for certifica
 
 
 ### Registration Certificate
-In terminal, run:
 ````commandline
 wlt-cert-reg
 ````

{wiliot_certificate-4.5.0a2 → wiliot_certificate-4.5.0a3}/README.md

@@ -1,4 +1,4 @@
-# wiliot-certificate Version 4.5.0
+# wiliot-certificate
 
 <!-- Description -->
 wiliot-certificate is a Python library that provides tools for testing and certifying boards for compatibility with Wiliot’s ecosystem.
@@ -8,18 +8,16 @@ This python package includes the following tools:
  - Tester Upgrade (`wlt-cert-tester-upgrade`)
  - Registration Certificate (`wlt-cert-reg`)
 
-# Version: 
-wiliot-certificate versions 4.5.0 are compatible with firmware version >=4.5.0 (API VERSION: 13)
+# Versioning: 
+wiliot-certificate versions 4.5.x are compatible with firmware version >=4.5.0 (API VERSION: 13)
 
 ## Installing wiliot-certificate
-Install wiliot-certificate:
 ````commandline
 pip install wiliot-certificate
 ````
 
 ## Using wiliot-certificate
 ### Certification
-In terminal, run:
 ````commandline
 wlt-cert
 ````
@@ -31,7 +29,6 @@ Once set up it opens a terminal and tests your device.
 
 
 ### Certificate CLI
-In terminal, run:
 ````commandline
 wlt-cert-cli -h
 ````
@@ -39,7 +36,6 @@ CLI version of the certificate. Use -h for details on the different arguments.
 
 
 ### Tester Upgrade
-In terminal, run:
 ````commandline
 wlt-cert-tester-upgrade
 ````
@@ -47,7 +43,6 @@ Upgrades the firmware of the tester device to the version required for certifica
 
 
 ### Registration Certificate
-In terminal, run:
 ````commandline
 wlt-cert-reg
 ````

{wiliot_certificate-4.5.0a2 → wiliot_certificate-4.5.0a3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wiliot_certificate"
-version = "4.5.0a2"
+version = "4.5.0a3"
 authors = [
   { name="Wiliot", email="support@wiliot.com" }
 ]

{wiliot_certificate-4.5.0a2 → wiliot_certificate-4.5.0a3}/src/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:

{wiliot_certificate-4.5.0a2 → wiliot_certificate-4.5.0a3}/src/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()

{wiliot_certificate-4.5.0a2 → wiliot_certificate-4.5.0a3}/src/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

{wiliot_certificate-4.5.0a2 → wiliot_certificate-4.5.0a3}/src/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

{wiliot_certificate-4.5.0a2 → wiliot_certificate-4.5.0a3}/src/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

{wiliot_certificate-4.5.0a2 → wiliot_certificate-4.5.0a3}/src/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(

{wiliot_certificate-4.5.0a2 → wiliot_certificate-4.5.0a3}/src/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())

{wiliot_certificate-4.5.0a2 → wiliot_certificate-4.5.0a3}/src/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])

{wiliot_certificate-4.5.0a2 → wiliot_certificate-4.5.0a3}/src/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())

{wiliot_certificate-4.5.0a2 → wiliot_certificate-4.5.0a3}/src/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())

{wiliot_certificate-4.5.0a2 → wiliot_certificate-4.5.0a3}/src/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())

{wiliot_certificate-4.5.0a2 → wiliot_certificate-4.5.0a3}/src/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())

{wiliot_certificate-4.5.0a2 → wiliot_certificate-4.5.0a3}/src/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")

wiliot_certificate-4.5.0a3/src/certificate/tests/energy2400/signal_indicator_ext_adv_test/signal_indicator_ext_adv_test.json

@@ -0,0 +1,19 @@
+{
+    "name": "Signal Indicator Extended Advertising",
+    "module": "Energizer 2.4GHz",
+    "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"
+    ],
+    "expectedOutcome": "All phases passed successfully!",
+    "mandatory": 0,
+    "multiBridgeTest": 1,
+    "gwOnlyTest": 0,
+    "dataSimOnlyTest": 0,
+    "allSupportedValues": ["ext_adv_rx37", "ext_adv_rx10"]
+}

wiliot_certificate-4.5.0a3/src/certificate/tests/energy2400/signal_indicator_ext_adv_test/signal_indicator_ext_adv_test.py

@@ -0,0 +1,171 @@
+from certificate.cert_prints import *
+from certificate.cert_defines import *
+from certificate.wlt_types import *
+import certificate.cert_mqtt as cert_mqtt
+import certificate.cert_common as cert_common
+import certificate.cert_config as cert_config
+
+# Test MACROS #
+NUM_OF_SCANNING_CYCLE = 5
+SCAN_DELAY_TIME = 3
+
+
+def test_ext_adv_rx37(test):
+
+    dut = cert_config.get_brg_by_target(test, DUT)
+    tester = cert_config.get_brg_by_target(test, TESTER)
+    cycle, rep = 8, 4
+
+    # Configuring DUT #
+    # configuring transmitter #
+    utPrint(f"Configuring DUT BRG {dut.id_str} as Signal Indicator Transmitter (cycle={cycle}, repetition={rep})", "BLUE")
+    test = cert_config.brg_configure(test=test, module=dut.energy2400,
+                                     fields=[BRG_SIGNAL_INDICATOR_CYCLE, BRG_SIGNAL_INDICATOR_REP],
+                                     values=[cycle, rep])[0]
+    if test.rc == TEST_FAILED:
+        test.add_reason(f"DUT BRG {dut.id_str}: didn't receive signal indicator transmitter configuration!")
+        return test
+    # configuring extended advertising and rx channel #
+    utPrint(f"Configuring DUT BRG {dut.id_str} with extended advertising and rx channel 37", "BLUE")
+    test = cert_config.brg_configure(test=test, module=dut.datapath,
+                                     fields=[BRG_RX_CHANNEL, BRG_PATTERN],
+                                     values=[ag.RX_CHANNEL_37, ag.DATAPATH_PATTERN_EXTENDED_ADV])[0]
+    if test.rc == TEST_FAILED:
+        test.add_reason(f"DUT BRG {dut.id_str}: didn't receive extended advertising and rx channel configuration!")
+        return test
+
+    # configuring TESTER #
+    utPrint(f"Configuring TESTER BRG {tester.id_str} as Signal Indicator Receiver", "BLUE")
+    test = cert_config.brg_configure(test=test, module=tester.sensors, fields=[BRG_SENSOR0],
+                                     values=[ag.EXTERNAL_SENSORS_SIGNAL_INDICATOR], target=TESTER)[0]
+    if test.rc == TEST_FAILED:
+        test.add_reason(f"TESTER BRG {tester.id_str}: didn't receive signal indicator receiver configuration!")
+        return test
+    utPrint(f"Configuring TESTER BRG {tester.id_str} with rx channel 37", "BLUE")
+    test = cert_config.brg_configure(test=test, module=tester.datapath, fields=[BRG_RX_CHANNEL],
+                                     values=[ag.RX_CHANNEL_37], target=TESTER)[0]
+    if test.rc == TEST_FAILED:
+        test.add_reason(f"TESTER BRG {tester.id_str}: didn't receive rx channel configuration!")
+        return test
+
+    # phase analysis #
+    cert_mqtt.mqtt_scan_n_create_log_file(test, (NUM_OF_SCANNING_CYCLE * cycle) + SCAN_DELAY_TIME,
+                                          f"tx_{cycle}_{rep}")
+    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
+        expected_signal_ind_pkts = cert_common.exp_sig_ind_pkts2(tester, dut, NUM_OF_SCANNING_CYCLE)
+        test.add_reason(f"tx phase failed - BRG {dut.id_str} received wrong number of "
+                        f"signal indicator packets\nreceived {len(rec_sig_ind_pkts)} packets, "
+                        f"expected {expected_signal_ind_pkts} packets")
+        print(rec_sig_ind_pkts)  # TODO: logging print(debug)
+        print([[p[TIMESTAMP], p[UNIFIED_SENSOR_PKT].pkt.signal_indicator_payload.rx_antenna] for p in rec_sig_ind_pkts])
+        return test
+
+    test = cert_common.rx_tx_antenna_check(test, rec_sig_ind_pkts, dut, tester, NUM_OF_SCANNING_CYCLE)
+    test = cert_common.output_power_check(test, rec_sig_ind_pkts, dut)
+    test = cert_common.rssi_check(test, rec_sig_ind_pkts)
+
+    return test
+
+
+def test_ext_adv_rx10(test):
+
+    dut = cert_config.get_brg_by_target(test, DUT)
+    tester = cert_config.get_brg_by_target(test, TESTER)
+    cycle, rep = 8, 4
+
+    # Configuring DUT #
+    # configuring transmitter #
+    utPrint(f"Configuring DUT BRG {dut.id_str} as Signal Indicator Transmitter (cycle={cycle}, repetition={rep})", "BLUE")
+    test = cert_config.brg_configure(test=test, module=dut.energy2400,
+                                     fields=[BRG_SIGNAL_INDICATOR_CYCLE, BRG_SIGNAL_INDICATOR_REP],
+                                     values=[cycle, rep])[0]
+    if test.rc == TEST_FAILED:
+        test.add_reason(f"DUT BRG {dut.id_str}: didn't receive signal indicator transmitter configuration!")
+        return test
+    # configuring extended advertising and rx channel #
+    utPrint(f"Configuring DUT BRG {dut.id_str} with extended advertising and rx channel 10", "BLUE")
+    test = cert_config.brg_configure(test=test, module=dut.datapath,
+                                     fields=[BRG_RX_CHANNEL, BRG_PATTERN],
+                                     values=[ag.RX_CHANNEL_10_500K, ag.DATAPATH_PATTERN_EXTENDED_ADV],
+                                     ble5=test.dut_is_bridge(), wait=test.dut_is_combo())[0]
+    if test.rc == TEST_FAILED:
+        test.add_reason(f"DUT BRG {dut.id_str}: didn't receive extended advertising and rx channel configuration!")
+        return test
+    if test.dut_is_bridge():
+        wait_time_n_print(BLE5_MAX_DURATION_SEC)  # BLE5 configuration can take up to BLE5_MAX_DURATION_SEC
+
+    # configuring TESTER #
+    utPrint(f"Configuring TESTER BRG {tester.id_str} as Signal Indicator Receiver", "BLUE")
+    test = cert_config.brg_configure(test=test, module=tester.sensors, fields=[BRG_SENSOR0],
+                                     values=[ag.EXTERNAL_SENSORS_SIGNAL_INDICATOR], target=TESTER)[0]
+    if test.rc == TEST_FAILED:
+        test.add_reason(f"TESTER BRG {tester.id_str}: didn't receive signal indicator receiver configuration!")
+        return test
+    utPrint(f"Configuring TESTER BRG {tester.id_str} with rx channel 10", "BLUE")
+    test = cert_config.brg_configure(test=test, module=tester.datapath, fields=[BRG_RX_CHANNEL],
+                                     values=[ag.RX_CHANNEL_10_500K], target=TESTER)[0]
+    if test.rc == TEST_FAILED:
+        test.add_reason(f"TESTER BRG {tester.id_str}: didn't receive rx channel configuration!")
+        return test
+
+    # phase analysis #
+    cert_mqtt.mqtt_scan_n_create_log_file(test, (NUM_OF_SCANNING_CYCLE * cycle) + SCAN_DELAY_TIME,
+                                          f"tx_{cycle}_{rep}")
+    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
+        expected_signal_ind_pkts = cert_common.exp_sig_ind_pkts2(tester, dut, NUM_OF_SCANNING_CYCLE)
+        test.add_reason(f"tx phase failed - BRG {dut.id_str} received wrong number of "
+                        f"signal indicator packets\nreceived {len(rec_sig_ind_pkts)} packets, "
+                        f"expected {expected_signal_ind_pkts} packets")
+        print(rec_sig_ind_pkts)  # TODO: logging print(debug)
+        print([[p[TIMESTAMP], p[UNIFIED_SENSOR_PKT].pkt.signal_indicator_payload.rx_antenna] for p in rec_sig_ind_pkts])
+        return test
+
+    test = cert_common.rx_tx_antenna_check(test, rec_sig_ind_pkts, dut, tester, NUM_OF_SCANNING_CYCLE)
+    test = cert_common.output_power_check(test, rec_sig_ind_pkts, dut)
+    test = cert_common.rssi_check(test, rec_sig_ind_pkts)
+
+    return test
+
+
+SIGNAL_INDICATOR_TEST_MAP = {"ext_adv_rx37": test_ext_adv_rx37, "ext_adv_rx10": test_ext_adv_rx10}
+
+
+def run(test):
+    # Test prolog
+    test = cert_common.test_prolog(test)
+
+    # Configure to rx channel and extended advertising pattern
+    dut = cert_config.get_brg_by_target(test, DUT)
+    tester = cert_config.get_brg_by_target(test, TESTER)
+
+    for param in test.params:
+        phase_run_print(param.name)
+        test = SIGNAL_INDICATOR_TEST_MAP[param.value](test)
+        cert_mqtt.generate_log_file(test, param.name)
+        field_functionality_pass_fail_print(test, param.name)
+        test.set_phase_rc(param.name, test.rc)
+        test.add_phase_reason(param.name, test.reason)
+
+        if test.rc == TEST_FAILED:
+            test.set_phase_rc(param.name, test.rc)
+            test.add_phase_reason(param.name, test.reason)
+            if test.exit_on_param_failure:
+                break
+        else:
+            test.reset_result()
+
+    # Revert DUT and TESTER to defaults here and not in epilog
+    test = cert_config.config_brg_defaults(test, modules=[dut.datapath, dut.energy2400],
+                                           ble5=test.dut_is_bridge(), wait=test.dut_is_combo())[0]
+    if test.rc == TEST_FAILED:
+        test.add_reason("Failed to revert dut to defaults")
+    else:
+        test = cert_config.config_brg_defaults(test, modules=[tester.datapath, tester.sensors], target=TESTER)[0]
+        if test.rc == TEST_FAILED:
+            test.add_reason("Failed to revert tester to defaults")
+
+    return cert_common.test_epilog(test, revert_brgs=False)