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

brg_certificate/tests/energy2400/signal_indicator_test/signal_indicator_test.py

@@ -29,66 +29,7 @@ DEFAULT_SCAN_TIME = 30
 SCAN_DELAY_TIME = 3
 
 
-# Test functions #
-def rssi_check(test, received_signal_ind_pkts):
-    threshold_rssi = [0, 80]
-    for p in received_signal_ind_pkts:
-        if not threshold_rssi[0] < p[RSSI] < threshold_rssi[1]:
-            test.rc = TEST_FAILED
-            test.add_reason("rssi value is wrong, out of 0 to 80 ")
-
-    return test
-
-
-def rx_tx_antenna_check(test, received_signal_ind_pkts, tx_brg_, rx_brg_):
-
-    # Allow to miss 1 packet
-    expected = range(int(NUM_OF_SCANNING_CYCLE * 0.5), NUM_OF_SCANNING_CYCLE + 1)
-
-    received = len(get_polar_signal_ind_pkt(received_signal_ind_pkts, rx_ant=0, tx_ant=0))
-    if received not in expected:
-        test.rc = TEST_FAILED
-        test.add_reason(f"rx_ant=0 tx_ant=0 expected={NUM_OF_SCANNING_CYCLE} received={received}")
-
-    if tx_brg_.board_type in cert_common.dual_polarization_ant_boards_get():
-        received = len(get_polar_signal_ind_pkt(received_signal_ind_pkts, rx_ant=0, tx_ant=1))
-        if received not in expected:
-            test.rc = TEST_FAILED
-            test.add_reason(f"rx_ant=0 tx_ant=1 expected={NUM_OF_SCANNING_CYCLE} received={received}")
-
-    if rx_brg_.board_type in cert_common.dual_polarization_ant_boards_get():
-        received = len(get_polar_signal_ind_pkt(received_signal_ind_pkts, rx_ant=1, tx_ant=0))
-        if received not in expected:
-            test.rc = TEST_FAILED
-            test.add_reason(f"rx_ant=1 tx_ant=0 expected={NUM_OF_SCANNING_CYCLE} received={received}")
-
-    if (rx_brg_.board_type in cert_common.dual_polarization_ant_boards_get() and
-            tx_brg_.board_type in cert_common.dual_polarization_ant_boards_get()):
-        received = len(get_polar_signal_ind_pkt(received_signal_ind_pkts, rx_ant=1, tx_ant=1))
-        if received not in expected:
-            test.rc = TEST_FAILED
-            test.add_reason(f"rx_ant=1 tx_ant=1 expected={NUM_OF_SCANNING_CYCLE} received={received}")
-    return test
-
-
-def get_polar_signal_ind_pkt(pkts, rx_ant, tx_ant):
-    return [p for p in pkts if p[SENSOR_PKT].pkt.rx_antenna == rx_ant and p[SENSOR_PKT].pkt.tx_antenna == tx_ant]
-
-
-def output_power_check(test, received_signal_ind_pkts, tx_brg_):
-
-    datapath_module = cert_common.get_module_by_name(tx_brg_.modules, "Datapath")
-    output_power_default = datapath_module().output_power
-
-    for p in received_signal_ind_pkts:
-        if p[SENSOR_PKT].pkt.output_power != output_power_default:
-            test.rc = TEST_FAILED
-            test.add_reason("output power of internal brg  is incorrect!\n"
-                            f"got:{p[SENSOR_PKT].pkt.output_power}, expected: {output_power_default}\n")
-    return test
-
-
-def test_rssi_threshold(test, energy2400_module, ext_sensors_module):
+def test_rssi_threshold(test):
     cycle, rep = 5, 4
     tx_brg_ = test.brg0
     rx_brg_ = test.brg1
@@ -97,14 +38,14 @@ def test_rssi_threshold(test, energy2400_module, ext_sensors_module):
     utPrint(f"TX BRG with RX- cycle = {cycle}, repetition = {rep}\n", "BLUE")
     # configuring receiver #
     utPrint(f"Configuring BRG {rx_brg_.id_str} as Signal Indicator Receiver with RSSI Threshold of {rssi_threshold}", "BOLD")
-    test = cert_config.brg1_configure(test=test, module=ext_sensors_module, fields=[BRG_SENSOR0, BRG_RSSI_THRESHOLD],
+    test = cert_config.brg1_configure(test=test, module=rx_brg_.sensors, fields=[BRG_SENSOR0, BRG_RSSI_THRESHOLD],
                                       values=[ag.EXTERNAL_SENSORS_SIGNAL_INDICATOR, rssi_threshold])[0]
     if test.rc == TEST_FAILED:
         test.add_reason(f"BRG {rx_brg_.id_str}: didn't receive signal indicator receiver configuration!")
         return test
     # configuring transmitter #
     utPrint(f"Configuring BRG {tx_brg_.id_str} as Signal Indicator Transmitter", "BOLD")
-    test = cert_config.brg_configure(test=test, module=energy2400_module, fields=[BRG_SIGNAL_INDICATOR_CYCLE, BRG_SIGNAL_INDICATOR_REP],
+    test = cert_config.brg_configure(test=test, module=tx_brg_.energy2400, fields=[BRG_SIGNAL_INDICATOR_CYCLE, BRG_SIGNAL_INDICATOR_REP],
                                      values=[cycle, rep])[0]
     if test.rc == TEST_FAILED:
         test.add_reason(f"BRG {tx_brg_.id_str}: didn't receive signal indicator transmitter configuration!")
@@ -124,7 +65,7 @@ def test_rssi_threshold(test, energy2400_module, ext_sensors_module):
     return test
 
 
-def test_brg0_rx_brg1_tx(test, energy2400_module, ext_sensors_module):
+def test_brg0_rx_brg1_tx(test):
 
     rx_brg_ = test.brg0
     tx_brg_ = test.brg1
@@ -133,14 +74,14 @@ def test_brg0_rx_brg1_tx(test, energy2400_module, ext_sensors_module):
     utPrint(f"TX BRG with RX- cycle = {cycle}, repetition = {rep}\n", "BLUE")
     # configuring receiver #
     utPrint(f"Configuring BRG {rx_brg_.id_str} as Signal Indicator Receiver", "BOLD")
-    test = cert_config.brg_configure(test=test, module=ext_sensors_module, fields=[BRG_SENSOR0],
+    test = cert_config.brg_configure(test=test, module=rx_brg_.sensors, fields=[BRG_SENSOR0],
                                      values=[ag.EXTERNAL_SENSORS_SIGNAL_INDICATOR])[0]
     if test.rc == TEST_FAILED:
         test.add_reason(f"BRG {rx_brg_.id_str}: didn't receive signal indicator receiver configuration!")
         return test
     # configuring transmitter #
     utPrint(f"Configuring BRG {tx_brg_.id_str} as Signal Indicator Transmitter", "BOLD")
-    test = cert_config.brg1_configure(test=test, module=energy2400_module,
+    test = cert_config.brg1_configure(test=test, module=tx_brg_.energy2400,
                                       fields=[BRG_SIGNAL_INDICATOR_CYCLE, BRG_SIGNAL_INDICATOR_REP],
                                       values=[cycle, rep])[0]
     if test.rc == TEST_FAILED:
@@ -161,21 +102,21 @@ def test_brg0_rx_brg1_tx(test, energy2400_module, ext_sensors_module):
         print(received_signal_ind_pkts)  # TODO: logging print(debug)
         print([[p[TIMESTAMP], p[SENSOR_PKT].pkt.rx_antenna] for p in received_signal_ind_pkts])
 
-    test = rx_tx_antenna_check(test, received_signal_ind_pkts, tx_brg_, rx_brg_)
-    test = output_power_check(test, received_signal_ind_pkts, tx_brg_)
-    test = rssi_check(test, received_signal_ind_pkts)
+    test = cert_common.rx_tx_antenna_check(test, received_signal_ind_pkts, tx_brg_, rx_brg_, NUM_OF_SCANNING_CYCLE)
+    test = cert_common.output_power_check(test, received_signal_ind_pkts, tx_brg_)
+    test = cert_common.rssi_check(test, received_signal_ind_pkts)
 
     return test
 
 
-def test_brg0_none_brg1_rx(test, energy2400_module, ext_sensors_module):
+def test_brg0_none_brg1_rx(test):
     cycle, rep = ag.BRG_DEFAULT_SIGNAL_INDICATOR_CYCLE, ag.BRG_DEFAULT_SIGNAL_INDICATOR_REP
     tx_brg_ = test.brg1
     rx_brg_ = test.brg1
     utPrint(f"RX BRG without TX- cycle = {cycle}, repetition = {rep}\n", "BLUE")
     # configuring receiver #
     utPrint(f"Configuring BRG {rx_brg_.id_str} as Signal Indicator Receiver", "BOLD")
-    test = cert_config.brg1_configure(test=test, module=ext_sensors_module, fields=[BRG_SENSOR0],
+    test = cert_config.brg1_configure(test=test, module=rx_brg_.sensors, fields=[BRG_SENSOR0],
                                       values=[ag.EXTERNAL_SENSORS_SIGNAL_INDICATOR])[0]
     if test.rc == TEST_FAILED:
         test.add_reason(f"BRG {rx_brg_.id_str}: didn't receive signal indicator receiver configuration!")
@@ -195,7 +136,7 @@ def test_brg0_none_brg1_rx(test, energy2400_module, ext_sensors_module):
     return test
 
 
-def test_brg0_rxtx_brg1_rxtx(test, energy2400_module, ext_sensors_module):
+def test_brg0_rxtx_brg1_rxtx(test):
     tx_cycle, tx_rep = 5, 4
     rx_cycle, rx_rep = 5, 4
     tx_brg_ = test.brg0
@@ -203,7 +144,7 @@ def test_brg0_rxtx_brg1_rxtx(test, energy2400_module, ext_sensors_module):
     utPrint("Both BRG's are transmitter and receivers, with different values\n", "BLUE")
     # configuring first brg (tx_brg_) as receiver
     utPrint(f"Configuring BRG {tx_brg_.id_str} as Signal Indicator Receiver", "BOLD")
-    test = cert_config.brg_configure(test=test, module=ext_sensors_module, fields=[BRG_SENSOR0],
+    test = cert_config.brg_configure(test=test, module=tx_brg_.sensors, fields=[BRG_SENSOR0],
                                      values=[ag.EXTERNAL_SENSORS_SIGNAL_INDICATOR])[0]
     if test.rc == TEST_FAILED and test.exit_on_param_failure:
         test.add_reason(f"BRG {tx_brg_.id_str}: didn't receive signal indicator receiver configuration!")
@@ -211,7 +152,7 @@ def test_brg0_rxtx_brg1_rxtx(test, energy2400_module, ext_sensors_module):
     utPrint(f"BRG {tx_brg_.id_str} successfully configured as Signal Indicator Receiver\n", "BOLD")
     # configuring first brg (tx_brg_) as transmitter
     utPrint(f"Configuring BRG {tx_brg_.id_str} as Signal Indicator Transmitter", "BOLD")
-    test = cert_config.brg_configure(test=test, module=energy2400_module, fields=[BRG_SIGNAL_INDICATOR_CYCLE, BRG_SIGNAL_INDICATOR_REP],
+    test = cert_config.brg_configure(test=test, module=tx_brg_.energy2400, fields=[BRG_SIGNAL_INDICATOR_CYCLE, BRG_SIGNAL_INDICATOR_REP],
                                      values=[tx_cycle, tx_rep])[0]
     if test.rc == TEST_FAILED and test.exit_on_param_failure:
         test.add_reason(f"BRG {tx_brg_.id_str}: didn't receive signal indicator transmitter configuration!")
@@ -220,7 +161,7 @@ def test_brg0_rxtx_brg1_rxtx(test, energy2400_module, ext_sensors_module):
 
     # configuring second brg (rx_brg_) as receiver
     utPrint(f"Configuring BRG {rx_brg_.id_str} as Signal Indicator Receiver", "BOLD")
-    test = cert_config.brg1_configure(test=test, module=ext_sensors_module, fields=[BRG_SENSOR0],
+    test = cert_config.brg1_configure(test=test, module=rx_brg_.sensors, fields=[BRG_SENSOR0],
                                       values=[ag.EXTERNAL_SENSORS_SIGNAL_INDICATOR])[0]
     if test.rc == TEST_FAILED and test.exit_on_param_failure:
         test.add_reason(f"BRG {rx_brg_.id_str}: didn't receive signal indicator receiver configuration!")
@@ -229,7 +170,7 @@ def test_brg0_rxtx_brg1_rxtx(test, energy2400_module, ext_sensors_module):
 
     # configuring second brg (rx_brg_) as transmitter (already configured as rx)
     utPrint(f"Configuring BRG {rx_brg_.id_str} as Signal Indicator Transmitter", "BOLD")
-    test = cert_config.brg1_configure(test=test, module=energy2400_module, fields=[BRG_SIGNAL_INDICATOR_CYCLE, BRG_SIGNAL_INDICATOR_REP],
+    test = cert_config.brg1_configure(test=test, module=rx_brg_.energy2400, fields=[BRG_SIGNAL_INDICATOR_CYCLE, BRG_SIGNAL_INDICATOR_REP],
                                       values=[rx_cycle, rx_rep])[0]
     if test.rc == TEST_FAILED and test.exit_on_param_failure:
         test.add_reason(f"BRG {rx_brg_.id_str}: didn't receive signal indicator transmitter configuration!")
@@ -264,7 +205,7 @@ def test_brg0_rxtx_brg1_rxtx(test, energy2400_module, ext_sensors_module):
     return test
 
 
-def test_brg0_tx_brg1_none(test, energy2400_module, ext_sensors_module):
+def test_brg0_tx_brg1_none(test):
     # Tx BRG without rx. just waiting for packets to be sent from the transmitter and verify
     # The receiver isn't receiving any signal indicator packets.
     cycle, rep = 4, 3
@@ -273,7 +214,7 @@ def test_brg0_tx_brg1_none(test, energy2400_module, ext_sensors_module):
     utPrint(f"TX BRG without RX - cycle = {cycle}, repetition = {rep}\n", "BLUE")
     # configuring transmitter #
     utPrint(f"Configuring BRG {tx_brg_.id_str} as Signal Indicator Transmitter", "BOLD")
-    test = cert_config.brg_configure(test=test, module=energy2400_module,
+    test = cert_config.brg_configure(test=test, module=tx_brg_.energy2400,
                                      fields=[BRG_SIGNAL_INDICATOR_CYCLE, BRG_SIGNAL_INDICATOR_REP], values=[cycle, rep])[0]
     if test.rc == TEST_FAILED:
         test.add_reason(f"BRG {tx_brg_.id_str}: didn't receive signal indicator transmitter configuration!")
@@ -287,7 +228,7 @@ def test_brg0_tx_brg1_none(test, energy2400_module, ext_sensors_module):
         test.rc = TEST_FAILED
         test.add_reason(f"brg0_tx_brg1_none phase failed - received signal indicator packet from BRG"
                         f"{rx_brg_.id_str}")
-    test = output_power_check(test, received_signal_ind_pkts, tx_brg_)
+    test = cert_common.output_power_check(test, received_signal_ind_pkts, tx_brg_)
 
     return test
 
@@ -301,28 +242,26 @@ def run(test):
     # Test prolog
     test = cert_common.test_prolog(test)
 
-    # Test modules evaluation #
-    energy2400_module = eval_pkt(f'ModuleEnergy2400V{test.active_brg.api_version}')
-    ext_sensors_module = eval_pkt(f'ModuleExtSensorsV{test.active_brg.api_version}')
-
     for param in test.params:
         phase_run_print(param.name)
-        test = SIGNAL_INDICATOR_TEST_MAP[param.value](test, energy2400_module, ext_sensors_module)
+        test = SIGNAL_INDICATOR_TEST_MAP[param.value](test)
         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 and test.exit_on_param_failure:
-            break
-        else:
-            test.reset_result()
+        if test.rc == TEST_FAILED:
+            if test.exit_on_param_failure:
+                break  # break the whole for loop and keep the test as failed
+            else:
+                test.reset_result()  # reset result and continue to next param
+                continue
 
         # Reset to defaults after every phase (don't fail the phase on that)
-        test = cert_config.config_brg_defaults(test, modules=[energy2400_module, ext_sensors_module])[0]
+        test = cert_config.config_brg_defaults(test, modules=[test.brg0.energy2400, test.brg0.sensors])[0]
         if test.rc == TEST_FAILED:
             test.add_reason("Failed to restore brg0 to defaults")
         else:
-            test = cert_config.config_brg1_defaults(test, modules=[energy2400_module, ext_sensors_module])[0]
+            test = cert_config.config_brg1_defaults(test, modules=[test.brg1.energy2400, test.brg1.sensors])[0]
             if test.rc == TEST_FAILED:
                 test.add_reason("Failed to restore brg0 to defaults")
         if test.rc == TEST_FAILED:
@@ -333,5 +272,5 @@ def run(test):
         else:
             test.reset_result()
 
-    return cert_common.test_epilog(test, revert_brgs=True, modules=[energy2400_module, ext_sensors_module],
-                                   brg1_modules=[energy2400_module, ext_sensors_module])
+    return cert_common.test_epilog(test, revert_brgs=True, modules=[test.brg0.energy2400, test.brg0.sensors],
+                                   brg1_modules=[test.brg1.energy2400, test.brg1.sensors])

brg_certificate/tests/energy_sub1g/duty_cycle_test/duty_cycle_test.py

@@ -8,7 +8,7 @@ import brg_certificate.cert_config as cert_config
 def run(test):
 
     fields = [BRG_DUTY_CYCLE]
-    sub1g_module = eval_pkt(f'ModuleEnergySub1GV{test.active_brg.api_version}')
+    sub1g_module = test.active_brg.energy_sub1g
 
     test = cert_common.test_prolog(test)
     if test.rc == TEST_FAILED:
@@ -20,9 +20,10 @@ def run(test):
         field_functionality_pass_fail_print(test, fields, value=param_name)
         test.set_phase_rc(param.name, test.rc)
         test.add_phase_reason(param.name, test.reason)
-        if test.rc == TEST_FAILED and test.exit_on_param_failure:
-            break
-        else:
-            test.reset_result()
-
+        if test.rc == TEST_FAILED:
+            if test.exit_on_param_failure:
+                break  # break the whole for loop and keep the test as failed
+            else:
+                test.reset_result()  # reset result and continue to next param
+                continue
     return cert_common.test_epilog(test, revert_brgs=True, modules=[sub1g_module])

brg_certificate/tests/energy_sub1g/pattern_test/pattern_test.py

@@ -8,7 +8,7 @@ import brg_certificate.cert_config as cert_config
 def run(test):
 
     fields = [BRG_PATTERN]
-    sub1g_module = eval_pkt(f'ModuleEnergySub1GV{test.active_brg.api_version}')
+    sub1g_module = test.active_brg.energy_sub1g
 
     test = cert_common.test_prolog(test)
     if test.rc == TEST_FAILED:
@@ -19,9 +19,11 @@ def run(test):
         field_functionality_pass_fail_print(test, fields, value=param.name)
         test.set_phase_rc(param.name, test.rc)
         test.add_phase_reason(param.name, test.reason)
-        if test.rc == TEST_FAILED and test.exit_on_param_failure:
-            break
-        else:
-            test.reset_result()
+        if test.rc == TEST_FAILED:
+            if test.exit_on_param_failure:
+                break  # break the whole for loop and keep the test as failed
+            else:
+                test.reset_result()  # reset result and continue to next param
+                continue
 
     return cert_common.test_epilog(test, revert_brgs=True, modules=[sub1g_module])

brg_certificate/tests/energy_sub1g/signal_indicator_functionality_test/signal_indicator_functionality_test.py

@@ -76,8 +76,8 @@ def terminate_test(test, phase=0, revert_rx_brg=False, revert_tx_brg=False, modu
 def run(test):
 
     # Test modules evaluation #
-    sub1g_module = eval_pkt(f'ModuleEnergySub1GV{test.active_brg.api_version}')
-    ext_sensors_module = eval_pkt(f'ModuleExtSensorsV{test.active_brg.api_version}')
+    sub1g_module = test.active_brg.energy_sub1g
+    ext_sensors_module = test.active_brg.sensors
 
     # Transmitter related defines #
     tx_brg_ = test.brg0

brg_certificate/tests/energy_sub1g/signal_indicator_test/signal_indicator_test.py

@@ -8,7 +8,7 @@ import brg_certificate.cert_config as cert_config
 def run(test):
 
     fields = [BRG_SIGNAL_INDICATOR_CYCLE, BRG_SIGNAL_INDICATOR_REP]
-    sub1g_module = eval_pkt(f'ModuleEnergySub1GV{test.active_brg.api_version}')
+    sub1g_module = test.active_brg.energy_sub1g
 
     test = cert_common.test_prolog(test)
     if test.rc == TEST_FAILED:
@@ -20,9 +20,10 @@ def run(test):
         generate_log_file(test, param_name)
         test.set_phase_rc(param.name, test.rc)
         test.add_phase_reason(param.name, test.reason)
-        if test.rc == TEST_FAILED and test.exit_on_param_failure:
-            break
-        else:
-            test.reset_result()
-
+        if test.rc == TEST_FAILED:
+            if test.exit_on_param_failure:
+                break  # break the whole for loop and keep the test as failed
+            else:
+                test.reset_result()  # reset result and continue to next param
+                continue
     return cert_common.test_epilog(test, revert_brgs=True, modules=[sub1g_module])

brg_certificate/tests/pwr_mgmt/pwr_mgmt_test/pwr_mgmt_test.py

@@ -63,7 +63,7 @@ def run(test):
         # Need to turn off just in case the ON was successful but didn't receive the ack packet
         test = cert_common.brg_pwr_mgmt_turn_off(test)
         cert_mqtt.dump_pkts(test, log=test.module_name)
-        return cert_common.test_epilog(test, revert_brgs=True, modules=[eval_pkt(f'ModulePwrMgmtV{test.active_brg.api_version}')])
+        return cert_common.test_epilog(test, revert_brgs=True, modules=[test.active_brg.pwr_mgmt])
 
     # On duration starts
     utPrint(f"On duration started - Waiting for {int(wltpkt.pkt.static_on_duration)} seconds!", "WARNING")
@@ -81,4 +81,4 @@ def run(test):
     test = cert_common.brg_pwr_mgmt_turn_off(test)
 
     cert_mqtt.dump_pkts(test, log=test.module_name)
-    return cert_common.test_epilog(test, revert_brgs=True, modules=[eval_pkt(f'ModulePwrMgmtV{test.active_brg.api_version}')])
+    return cert_common.test_epilog(test, revert_brgs=True, modules=[test.active_brg.pwr_mgmt])

brg_certificate/tests/sensors/ext_sensor_test/ext_sensor_test.py

@@ -262,8 +262,8 @@ EXT_SENSOR_TEST_MAP = {"tag_data_only": test_tag_data_only,
 
 
 def run(test):
-    datapath_module = eval_pkt(f'ModuleDatapathV{test.active_brg.api_version}')
-    ext_sensors_module = eval_pkt(f'ModuleExtSensorsV{test.active_brg.api_version}')
+    datapath_module = test.active_brg.datapath
+    ext_sensors_module = test.active_brg.sensors
     test = cert_common.test_prolog(test)
     # check for problems in prolog
     if test.rc == TEST_FAILED:
@@ -293,11 +293,12 @@ def run(test):
         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 and test.exit_on_param_failure:
-            field_functionality_pass_fail_print(test, 'phase', param.name)
-            break
-        else:
-            test.reset_result()
+        if test.rc == TEST_FAILED:
+            if test.exit_on_param_failure:
+                break  # break the whole for loop and keep the test as failed
+            else:
+                test.reset_result()  # reset result and continue to next param
+                continue
 
     # Kill the ble simulator
     if test.data == DATA_SIMULATION:

gw_certificate/api_if/gw_capabilities.py

@@ -1,6 +1,10 @@
 from dataclasses import dataclass
 from typing import Literal
 
+from gw_certificate.common.debug import debug_print
+from gw_certificate.interface.mqtt import Serialization
+from gw_certificate.ag.ut_defines import GW_CONF, GW_API_VERSION
+
 @dataclass
 class GWCapabilities:
     tagMetadataCouplingSupported: bool = False
@@ -15,4 +19,36 @@ class GWCapabilities:
     
     def set_capability(self, capability, value:bool):
         assert capability in GWCapabilities.get_capabilities(), f'{capability} is not a valid capability'
-        setattr(self, capability, value)
+        setattr(self, capability, value)
+
+class ConfigurationData():
+    """
+    Hold variables which values must be shared between different tests.
+    """
+    def __init__(self):
+        self.status_msg = None
+        self.api_version = None
+    
+    def status_msg_set(self, status_msg, ser: Serialization):
+        if not isinstance(status_msg, dict):
+            debug_print('Status message should be a dict!')
+            return
+
+        self.status_msg = status_msg
+        if ser == Serialization.PB:
+            self.api_version = status_msg.get(GW_API_VERSION)
+        else:
+            conf = status_msg.get(GW_CONF, {})
+            self.api_version = conf.get(GW_API_VERSION)
+            if isinstance(self.api_version, str):
+                self.api_version = int(self.api_version)
+
+    def status_msg_get(self):
+        return self.status_msg
+    
+    def is_acl_supported(self):
+        API_VERSION_SUPPORT_ACL = 205
+
+        if self.api_version != None and self.api_version >= API_VERSION_SUPPORT_ACL:
+            return True
+        return False

gw_certificate/common/serialization_formatter.py

@@ -0,0 +1,80 @@
+
+from enum import Enum
+from google.protobuf.json_format import MessageToDict, Parse, ParseError, ParseDict
+
+from gw_certificate.interface.mqtt import Serialization
+from gw_certificate.interface.if_defines import LOCATION
+from gw_certificate.common import wltPb_pb2
+from gw_certificate.ag.ut_defines import GW_CONF, ADDITIONAL, VERSION, BLE_VERSION, WIFI_VERSION, LAT, LNG
+from gw_certificate.common.debug import debug_print
+
+# helper defines
+ACL_MODE =                      "mode"
+ACL_BRIDGE_IDS =                "bridgeIds"
+ACL_DENY =                      "deny"
+ACL_ALLOW =                     "allow"
+ACL_DENY_VALUE =                 0
+ACL_ALLOW_VALUE =                1
+
+
+class Configurable(Enum):
+    ACL = "accessControlList"
+
+class SerializationFormatter():
+    def __init__(self, serialization:Serialization):
+        self.serialization = serialization
+    
+    def cfg_param_set(self, received_status_msg: dict, param: Configurable, value):
+        '''
+        Since configuration paramters change between partners, we must use a received_status_msg to keep every parameter as is.
+        In the future we may use a validation schema file or default.
+        '''
+
+        def gatewaystatus_to_downlink(gw_status_dict: dict, param_to_set: Configurable, value_to_set) -> wltPb_pb2.DownlinkMessage:
+            gw_status = ParseDict(gw_status_dict, wltPb_pb2.GatewayStatus())
+            gw_cfg = wltPb_pb2.GatewayConfig()
+
+            if gw_status.HasField(VERSION):
+                gw_cfg.version = gw_status.version
+            if gw_status.HasField('bleSwVersion'):
+                gw_cfg.bleSwVersion = gw_status.bleSwVersion
+            if gw_status.HasField('interfaceSwVersion'):
+                gw_cfg.interfaceSwVersion = gw_status.interfaceSwVersion
+            if gw_status.HasField(LOCATION):
+                gw_cfg.location.lat = gw_status.location.lat
+                gw_cfg.location.lng = gw_status.location.lng
+            
+            for key, val in gw_status.config.items():
+                if key != param_to_set:
+                    gw_cfg.config[key].CopyFrom(val)
+                else:
+                    pb_gcvalue = wltPb_pb2.GatewayConfigValue()
+                    if isinstance(value_to_set, int):
+                        pb_gcvalue.integerValue = value_to_set
+                    elif isinstance(value_to_set, float):
+                        pb_gcvalue.numberValue = value_to_set
+                    elif isinstance(value_to_set, str):
+                        pb_gcvalue.stringValue = value_to_set
+                    elif isinstance(value_to_set, bool):
+                        pb_gcvalue.boolValue = value_to_set
+                    elif isinstance(value_to_set, dict) and key == Configurable.ACL.value:
+                        pb_gcvalue.aclValue.mode_allow = ACL_ALLOW_VALUE if value_to_set.get(ACL_MODE) == ACL_ALLOW else ACL_DENY_VALUE
+                        ids_bytes = [bytes.fromhex(id) for id in value_to_set.get(ACL_BRIDGE_IDS)]
+                        pb_gcvalue.aclValue.ids.extend(ids_bytes)
+                    else:
+                        debug_print(f"Unsupported value type for key '{key}': {type(val)}, protobuf cfg may be invalid")
+
+                    gw_cfg.config[key].CopyFrom(pb_gcvalue)
+
+            return wltPb_pb2.DownlinkMessage(gatewayConfig=gw_cfg)
+            
+        cfg_msg = received_status_msg.copy()
+        if self.serialization == Serialization.PB:
+            # In protobuf, we must convert the GatewayStatus to a DownlinkMessage with oneof=GatewayConfig
+            cfg_msg = gatewaystatus_to_downlink(cfg_msg, param, value)
+            return cfg_msg
+        else:
+            # JSON
+            cfg_msg.setdefault(GW_CONF, {}).setdefault(ADDITIONAL, {})[param] = value
+            debug_print(cfg_msg)
+            return cfg_msg