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

gw_certificate/interface/uart_if.py

@@ -12,7 +12,7 @@ import pkg_resources
 from gw_certificate.common.debug import debug_print
 from gw_certificate.interface.if_defines import *
 
-LATEST_VERSION = '4.4.52'
+LATEST_VERSION = '4.4.91'
 LATEST_VERSION_FILE = f'{LATEST_VERSION}_sd_bl_app.zip'
 LATEST_VERSION_PATH = pkg_resources.resource_filename(__name__, LATEST_VERSION_FILE)
 LATEST_VERSION_FILE_APP = f'{LATEST_VERSION}_app.zip'
@@ -43,7 +43,8 @@ class UARTInterface:
             if not update_status:
                 raise UARTError('Update Failed! Update FW manually using NRF Tools')
             if self.fw_version >= version.Version('3.17.0'):
-                self.write_ble_command(GATEWAY_APP)
+                if self.fw_version < version.Version('4.4.0'):
+                    self.write_ble_command(GATEWAY_APP)
                 self.flush()
         debug_print(f'Serial Connection {comport} Initialized')
 
@@ -64,9 +65,10 @@ class UARTInterface:
             return None
         return answer
 
-    def write_ble_command(self, cmd, read=False):
+    def write_ble_command(self, cmd, read=False, print_for_debug=True):
         # This function writes a command (cmd) to the ble using a serial connection (ble_ser) that are provided to it beforehand.. and returns the answer from the device as string
-        debug_print("Write to BLE: {}".format(cmd))
+        if print_for_debug:
+            debug_print("Write to BLE: {}".format(cmd))
         # Shows on terminal what command is about to be printed to the BLE device
         bytes_to_write = bytes(cmd.encode("utf-8")) + b'\r\n'
         self.serial.write(bytes_to_write)
@@ -76,17 +78,20 @@ class UARTInterface:
             # Pauses the program for execution for 0.01sec. This is done to allow the device to process the command and provide a response before reading the response.
             time.sleep(1)
             answer = self.read_line()
-            debug_print(answer)
+            if print_for_debug:
+                debug_print(answer)
         return answer
     
-    def flush(self):
+    def flush(self, request_power_cycle=False):
         self.serial.close()
+        if request_power_cycle:
+            input('Please power cycle (unplug and replug from your pc) the certificate kit. Press enter when plugged')
         time.sleep(2)
         self.serial.open()
         self.serial.flushInput()
         self.serial.flush()
         self.serial.reset_output_buffer()
-
+    
     def reset_gw(self, stop_advertising=True):
         self.flush()
         self.write_ble_command(RESET_GW)
@@ -104,16 +109,20 @@ class UARTInterface:
         if self.gw_app_rx is None:
             self.reset_gw()
 
-        if self.fw_version >= version.Version('3.17.0'):
+        if self.fw_version >= version.Version('4.4.0'):
+            # full_cfg isn't supported anymore. RX channels are configured by set_sniffer.
+            pass
+        elif self.fw_version >= version.Version('3.17.0'):
             # from 3.17.0, only full_cfg can be used to configure channels. sending it with:
             # Data coupling(DC) off, wifi(NW) and mqtt(MQ) on.
             rx_ch_to_fw_enums = {37: 2, 38: 3, 39: 4}
             cmd = f'!full_cfg DM {rx_ch_to_fw_enums[rx_channel]} DC 0 NW 1 MQ 1 CH {rx_channel}'
             # cmd = '!gateway_app'
+            self.write_ble_command(cmd)
         else:
             cmd = f'!gateway_app {rx_channel} 30 0 17'
+            self.write_ble_command(cmd)
 
-        self.write_ble_command(cmd)
         self.gw_app_rx = rx_channel
 
     def set_sniffer(self, rx_channel):
@@ -128,7 +137,11 @@ class UARTInterface:
         time.sleep(1)
 
     def cancel_sniffer(self):
-        self.write_ble_command(CANCEL_SNIFFER)
+        if self.fw_version >= version.Version('4.4.0'):
+            # Set_logger_mode must have 2 args, even when disabled.
+            self.write_ble_command(f'{CANCEL_SNIFFER} 37')
+        else:
+            self.write_ble_command(CANCEL_SNIFFER)
         self.flush()
 
     def get_version_mac(self):
@@ -197,8 +210,8 @@ class UARTInterface:
         return_code = dfu_full_process.returncode
         for line in dfu_full_process.stderr:
             if NRFUTIL_FW_TOO_LOW_ERROR in line:
-                debug_print(f"DFU failed due to firmware (bootloader/application) version being too low.")
-                debug_print(f"Probably since bootloader is already upgraded. Attempting to upgrade application only..")
+                debug_print(f"DFU failed because bootloader/application version is too high.")
+                debug_print(f"Attempting to upgrade application only..")
                 dfu_app_process = subprocess.Popen(f'{nrfutil_file} dfu serial --package "{LATEST_VERSION_PATH_APP}" -p {self.comport} -fc 0 -b 115200 -t 10',
                                     stderr=subprocess.PIPE, shell=True, text=True)
                 dfu_app_process.wait()

gw_certificate/tests/actions.py

@@ -131,7 +131,7 @@ class BridgeOTAStage(GenericActionsStage):
         self.error_summary = "Bridge wasn't upgraded."
         self.action = "Bridge Upgrade"
 
-        OTA_VERSIONS_TO_USE = ("4.4.52", "4.4.53")
+        OTA_VERSIONS_TO_USE = ("4.4.91", "4.4.92")
         if version.parse(OTA_VERSIONS_TO_USE[0]) != self.uart.fw_version:
             self.desired_version = version.parse(OTA_VERSIONS_TO_USE[0])
         else:
@@ -144,6 +144,28 @@ class BridgeOTAStage(GenericActionsStage):
         debug_print(f"BridgeOTAStage attempt: {str(self.uart.fw_version)} -> {str(self.desired_version)}")
         # Reset to remove any log/cert mode we had in the kit so it behaves as a bridge
         self.uart.reset_gw()
+    
+    def is_final_action_status(self, msg):
+        LAST_OTA_STEP = 7
+        if not isinstance(msg, dict):
+            return False
+
+        step = msg.get('step')
+        progress = msg.get('progress')
+        status = msg.get('statusCode')
+        if status == None:
+            # Both json/pb
+            status = msg.get('status')
+
+        if step == None:
+            # Old action status
+            if status != None:
+                return True
+        else:
+            # New progress action status
+            if (step == LAST_OTA_STEP and progress == 100) or (status != 0):
+                return True
+        return False
 
     def run(self):
         super().run()
@@ -156,15 +178,21 @@ class BridgeOTAStage(GenericActionsStage):
         self.mqttc.send_bridge_ota_action(self.uart.mac, str(self.desired_version), 200, False, self.gw_id, "aws", self.env)
         debug_print("Sent a BridgeOTA action to the gateway")
         debug_print("Waiting for an actionStatus message from the gateway... (timeout=10)")
+
         while datetime.datetime.now() < timeout and self.action_status is None:
             line = self.uart.read_line()
             if line != None and 'reset' in line:
-                self.uart.reset_gw(stop_advertising=False)
                 self.reboot_packet_ts = datetime.datetime.now()
                 debug_print("A reboot packet was received by the bridge")
-            self.action_status = self.mqttc.get_action_status_message()
+                self.uart.reset_gw(stop_advertising=False)
+
+            # Ignoring progress report until test supported
+            msg = self.mqttc.get_action_status_message()
+            if self.is_final_action_status(msg):
+                self.action_status = msg
             time.sleep(2)
         
+        debug_print(f'{self.action_status}')
         if self.action_status != None:
             debug_print("actionStatus was received from the gateway")
             self.action_status_ts = datetime.datetime.now()
@@ -181,8 +209,8 @@ class BridgeOTAStage(GenericActionsStage):
 
         cur_ver = self.uart.get_version()
         if cur_ver == None:
-            debug_print("ERROR: The certificate kit, acting as bridge in this stage, is not responding!")
-            self.uart.flush()
+            debug_print("ERROR: The certificate kit, acting as bridge in this stage, is not responding.")
+            self.uart.flush(request_power_cycle=True)
             cur_ver = self.uart.get_version()
             if cur_ver == None:
                 raise UARTError("Communication to the certificate kit halted! "

gw_certificate/tests/connection.py

@@ -35,6 +35,7 @@ class ConnectionStage(GenericStage):
         self.status_message = None
 
         while datetime.datetime.now() < timeout and self.status_message is None:
+            time.sleep(2)
             self.status_message = self.mqttc.get_status_message()
 
         if self.status_message is not None:
@@ -49,6 +50,7 @@ class ConnectionStage(GenericStage):
             for key, value in self.status_message.items():
                 if key in GWCapabilities.get_capabilities() and type(value) is bool:
                     self.gw_capabilities.set_capability(key, value)
+            self.cfg_data.status_msg_set(self.status_message, self.mqttc.get_serialization())
 
     def generate_stage_report(self):
         self.add_report_header()
@@ -73,7 +75,7 @@ class ConnectionStage(GenericStage):
 
             self.add_report_topic_validation('status')
         else:
-            self.error_summary = "No message recieved from GW in status topic after 3 mins."
+            self.error_summary = f"No message recieved from GW in status topic after {STATUS_MSG_TIMEOUT} mins."
             self.add_to_stage_report(self.error_summary)
 
         self.report_html = self.template_engine.render_template('stage.html', stage=self,

gw_certificate/tests/downlink.py

@@ -92,7 +92,7 @@ class GenericDownlinkStage(GenericStage):
             slope = channel_trendline.params[1]
             rsquared = channel_trendline.rsquared
             # Determine Channel Pass
-            channel_pass, channel_err_summary = PassCriteria.calc_for_stage_downlink(rsquared, slope, self.stage_name)
+            channel_pass, channel_err_summary = PassCriteria.calc_for_stage_downlink(rsquared, slope, self.stage_name, sum(channel_pkts['num_pkts_received']))
             if channel_pass < self.stage_pass:
                 self.stage_pass = channel_pass
                 self.error_summary = channel_err_summary
@@ -102,7 +102,7 @@ class GenericDownlinkStage(GenericStage):
             self.add_to_stage_report(f"- R Value: {rsquared} | Slope: {slope}")
         # Export all stage data
         self.sent_pkts.to_csv(self.sent_csv_path)
-        self.add_to_stage_report(f'Sent data saved - {self.sent_csv_path}')
+        self.add_to_stage_report(f'\nSent data saved - {self.sent_csv_path}')
         self.sniffed_pkts.to_csv(self.sniffed_csv_path)
         self.add_to_stage_report(f'Sniffed data saved - {self.sniffed_csv_path}')
         fig.write_html(self.graph_html_path)

gw_certificate/tests/generic.py

@@ -40,16 +40,16 @@ class PassCriteria():
             return 'Fail'
     
     @staticmethod
-    def calc_for_stage_downlink(rsquared, slope, stage_name:str):
+    def calc_for_stage_downlink(rsquared, slope, stage_name:str, pkts_received):
         error_msg = ''
         if 'Sanity' in stage_name:
-            if not math.isnan(rsquared) and rsquared != 0:
+            if pkts_received > 0:
                 return PERFECT_SCORE, error_msg
             else:
                 error_msg = 'No advertisements were received from the gateway.'
                 return MINIMUM_SCORE, error_msg
         else:
-            if rsquared > 0.8 and slope > 0:
+            if rsquared > 0.7 and slope > 0:
                 return PERFECT_SCORE, error_msg
             elif rsquared > 0.5 and slope > 0:
                 error_msg = "The correlation between 'txMaxDuration' and the board advertisements is suboptimal."
@@ -161,7 +161,7 @@ class GenericStage():
         self.result_indication = kwargs.get('result_indication', SCORE_BASED)
         self.stage_pass = MINIMUM_SCORE
         self.pass_min = kwargs.get('pass_min', PASS_MINIMUM)
-        self.inconclusive_min = INCONCLUSIVE_MINIMUM
+        self.inconclusive_min = kwargs.get('inconclusive_min', INCONCLUSIVE_MINIMUM)
         self.report = ''
         self.report_html = ''
         self.start_time = None
@@ -207,6 +207,7 @@ class GenericStage():
             # self.stage_pass = MINIMUM_SCORE
             # self.error_summary += "Invalid serialization-topic combination. "
             self.add_to_stage_report(f'Note: Received message on {invalid_topic} although serialization is {self.mqttc.get_serialization()}')
+            self.add_report_line_separator()
     
     def score_pass(self):
         if self.stage_pass >= self.pass_min:

gw_certificate/tests/registration.py

@@ -41,7 +41,7 @@ class Status(Enum):
     APPROVED = 'approved'
     ACTIVE = 'active'
 
-class SharedData():
+class RegistrationData():
     """
     Hold variables which values must be shared between different stages.
     gw_online_ts hold the time in which the gateway status became online
@@ -205,7 +205,7 @@ class OnlineStage(GenericRegistrationStage):
             self.add_to_stage_report("Token acquisition and MQTT connection were done succesfully.")
             self.add_to_stage_report("Gateway is online.")
             debug_print("Gateway connected to MQTT successfully, it is online")
-            self.shared_data.gw_online_ts = datetime.datetime.now()
+            self.reg_data.gw_online_ts = datetime.datetime.now()
 
         self.report_html = self.template_engine.render_template('stage.html', stage=self,
                                                                 stage_report=self.report.split('\n'))
@@ -259,7 +259,7 @@ class RefreshStage(GenericRegistrationStage):
     def run(self):
         super().run()
         debug_print(f"Waiting for the token to expire..")
-        timeout = self.shared_data.gw_online_ts + datetime.timedelta(minutes=TOKEN_EXPIRY_MINUTES)
+        timeout = self.reg_data.gw_online_ts + datetime.timedelta(minutes=TOKEN_EXPIRY_MINUTES)
         while datetime.datetime.now() < timeout:
             time.sleep(BUSY_WAIT_DELAY_SEC)
 
@@ -313,7 +313,7 @@ class RegistrationTest(GenericTest):
             raise Exception(f"An API security key must be set to the envrionment variable {self.env_variable} in order to run the RegistrationTest")
         self.edge = ExtendedEdgeClient(api_sec_key, REG_CERT_OWNER_ID, env=self.env)
 
-        self.shared_data = SharedData()
+        self.reg_data = RegistrationData()
 
         super().__init__(**self.__dict__, test_name=type(self).__name__)
         stages = STAGES

gw_certificate/tests/static/generated_packet_table.py

@@ -39,10 +39,6 @@ class GeneratedPacketTable:
         if columns is not None:
             return self.table[columns]
         return self.table
-
-    # def get_unified_data(self) -> pd.DataFrame:
-    #     t = self.table
-    #     return t.loc[((t['test'] == 'stress'))] 
     
     def get_stress_data(self) -> pd.DataFrame:
         t = self.table
@@ -56,6 +52,10 @@ class GeneratedPacketTable:
         t = self.table
         return t.loc[((t['test'] == 'mgmt'))] 
 
+    def get_acl_data(self) -> pd.DataFrame:
+        t = self.table
+        return t.loc[((t['test'] == 'acl'))] 
+
     def get_unified_data(self) -> pd.DataFrame:
         t = self.table
         return t.loc[((t['test'] == 'unified'))] 
@@ -74,15 +74,11 @@ class GeneratedPacketTable:
                     data = pkts[idx]['data_packet']
                     brg_id = self.brg_network.brg_list[idx].bridge_id
                     # log the sent packet with relevant info from run
-                    expected_pkt = brg.get_expected_mqtt_unified(full_data_pkt=data)
-                    for pkt in expected_pkt:
-                        pkt.update({'duplication': duplication, 'time_delay': time_delay})
                     packet_list.append({'test': TEST_UNIFIED,
                                         'duplication': duplication,
                                         'time_delay': time_delay,
                                         'bridge_idx': idx,
-                                        'expected_mqtt': expected_pkt
-                                        ,ADVA_PAYLOAD: data, 'bridge_id': brg_id,
+                                        ADVA_PAYLOAD: data, 'bridge_id': brg_id,
                                         'adva': data[:12], 'payload': data[16:], 'pkt_id': data[-8:]
                                         })        
 
@@ -96,12 +92,10 @@ class GeneratedPacketTable:
             debug_print(f'Bridge {target_idx}')
             data = pkts[target_idx]['data_packet']
             brg_id = brg.bridge_id
-            expected_pkt = brg.get_expected_mqtt_unified(full_data_pkt=data)
             packet_list.append({
                 'test': TEST_STRESS,
                 'duplication': 1,
                 'bridge_idx': target_idx,
-                'expected_mqtt': expected_pkt,
                 ADVA_PAYLOAD: data,
                 'bridge_id': brg_id,
                 'adva': data[:12],
@@ -111,18 +105,18 @@ class GeneratedPacketTable:
 
         def _sensor_data(df):
             hardcoded_data = [
-                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, "expected_mqtt": [{"timestamp": 17305216968476073494, "payload": "90FCA1016417913C42FD38AF3F23AC0201060303E1FF060000FA0EAB04", "duplication": 3, "time_delay": 20}, {"timestamp": 4278768225950047766, "payload": "C6FC0000EB3B613D08177B00003600AC233FAF38FD16E1FF05FA0EAB04", "duplication": 3, "time_delay": 20}], ADVA_PAYLOAD: "3B613D0817FB101690FCA1016417913C42FD38AF3F23AC0201060303E1FF060000FA0EAB04", "payload":"90FCA1016417913C42FD38AF3F23AC0201060303E1FF060000FA0EAB04" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B00003600AC233FAF38FD16E1FF05FA0EAB04", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "FA0EAB04"},
-                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, "expected_mqtt": [{"timestamp": 17305216968476073494, "payload": "90FCA10164157D358A0E39AF3F23AC0201060303E1FF0600007EE3A33F", "duplication": 3, "time_delay": 20}, {"timestamp": 4278768225950047766, "payload": "C6FC0000EB3B613D08177B00004300AC233FAF390E16E1FF057EE3A33F", "duplication": 3, "time_delay": 20}], ADVA_PAYLOAD: "3B613D0817FB101690FCA10164157D358A0E39AF3F23AC0201060303E1FF0600007EE3A33F", "payload":"90FCA10164157D358A0E39AF3F23AC0201060303E1FF0600007EE3A33F" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B00004300AC233FAF390E16E1FF057EE3A33F", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "7EE3A33F"},
-                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, "expected_mqtt": [{"timestamp": 17305216968476073494, "payload": "90FCA1085CCA5BF13F23AC4D425330310201060303E1FF0500E16ED8EA", "duplication": 3, "time_delay": 20}, {"timestamp": 4278768225950047766, "payload": "C6FC0000EB3B613D08177B00004700AC233FF15BCA16E1FF05E16ED8EA", "duplication": 3, "time_delay": 20}], ADVA_PAYLOAD: "3B613D0817FB111690FCA1085CCA5BF13F23AC4D425330310201060303E1FF0500E16ED8EA", "payload":"90FCA1085CCA5BF13F23AC4D425330310201060303E1FF0500E16ED8EA" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B00004700AC233FF15BCA16E1FF05E16ED8EA", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "E16ED8EA"},
-                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, "expected_mqtt": [{"timestamp": 17305216968476073494, "payload": "90FCA10164157D358A0E39AF3F23AC0201060303E1FF06000003E3A33F", "duplication": 3, "time_delay": 20}, {"timestamp": 4278768225950047766, "payload": "C6FC0000EB3B613D08177B00073E00AC233FAF390E16E1FF0503E3A33F", "duplication": 3, "time_delay": 20}], ADVA_PAYLOAD: "3B613D0817FB101690FCA10164157D358A0E39AF3F23AC0201060303E1FF06000003E3A33F", "payload":"90FCA10164157D358A0E39AF3F23AC0201060303E1FF06000003E3A33F" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B00073E00AC233FAF390E16E1FF0503E3A33F", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "03E3A33F"},
-                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, "expected_mqtt": [{"timestamp": 17305216968476073494, "payload": "90FCA10858CA5BF13F23AC4D425330310201060303E1FF0500996ED8EE", "duplication": 3, "time_delay": 20}, {"timestamp": 4278768225950047766, "payload": "C6FC0000EB3B613D08177B00043F00AC233FF15BCA16E1FF05996ED8EE", "duplication": 3, "time_delay": 20}], ADVA_PAYLOAD: "3B613D0817FB111690FCA10858CA5BF13F23AC4D425330310201060303E1FF0500996ED8EE", "payload":"90FCA10858CA5BF13F23AC4D425330310201060303E1FF0500996ED8EE" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B00043F00AC233FF15BCA16E1FF05996ED8EE", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "996ED8EE"},
-                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, "expected_mqtt": [{"timestamp": 17305216968476073494, "payload": "90FCA10864FD38AF3F23AC53310201060303E1FF0800000000157A359C", "duplication": 3, "time_delay": 20}, {"timestamp": 4278768225950047766, "payload": "C6FC0000EB3B613D08177B000E3600AC233FAF38FD16E1FF05157A359C", "duplication": 3, "time_delay": 20}], ADVA_PAYLOAD: "3B613D0817FB0E1690FCA10864FD38AF3F23AC53310201060303E1FF0800000000157A359C", "payload":"90FCA10864FD38AF3F23AC53310201060303E1FF0800000000157A359C" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B000E3600AC233FAF38FD16E1FF05157A359C", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "157A359C"},
-                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, "expected_mqtt": [{"timestamp": 17305216968476073494, "payload": "90FC0200002CC60917A02CB02367771BE9EA20F9666ED8A06F6612745B", "duplication": 3, "time_delay": 20}, {"timestamp": 4278768225950047766, "payload": "C6FC0000EB3B613D08177BF1EBC500000000000000000000006612745B", "duplication": 3, "time_delay": 20}], ADVA_PAYLOAD: "3B613D0817FB1E1690FC0200002CC60917A02CB02367771BE9EA20F9666ED8A06F6612745B", "payload":"90FC0200002CC60917A02CB02367771BE9EA20F9666ED8A06F6612745B" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177BF1EBC500000000000000000000006612745B", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "6612745B"},
-                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, "expected_mqtt": [{"timestamp": 17305216968476073494, "payload": "90FC02000007EFE229109B044DB995A506179C99094720AE8BF9F78C1A", "duplication": 3, "time_delay": 20}, {"timestamp": 4278768225950047766, "payload": "C6FC0000EB3B613D08177B6CEC9A0000000000000000000000F9F78C1A", "duplication": 3, "time_delay": 20}], ADVA_PAYLOAD: "3B613D0817FB1E1690FC02000007EFE229109B044DB995A506179C99094720AE8BF9F78C1A", "payload":"90FC02000007EFE229109B044DB995A506179C99094720AE8BF9F78C1A" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B6CEC9A0000000000000000000000F9F78C1A", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "F9F78C1A"},
-                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, "expected_mqtt": [{"timestamp": 17305216968476073494, "payload": "90FC0200002CA1E008E364D0DCF65631718BCD659DE3323A69A674F7B9", "duplication": 3, "time_delay": 20}, {"timestamp": 4278768225950047766, "payload": "C6FC0000EB3B613D08177B1051900000000000000000000000A674F7B9", "duplication": 3, "time_delay": 20}], ADVA_PAYLOAD: "3B613D0817FB1E1690FC0200002CA1E008E364D0DCF65631718BCD659DE3323A69A674F7B9", "payload":"90FC0200002CA1E008E364D0DCF65631718BCD659DE3323A69A674F7B9" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B1051900000000000000000000000A674F7B9", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "A674F7B9"},
-                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, "expected_mqtt": [{"timestamp": 17305216968476073494, "payload": "90FC02000049ADD722F535679C37983927655C974A4980B080045DA6C2", "duplication": 3, "time_delay": 20}, {"timestamp": 4278768225950047766, "payload": "C6FC0000EB3B613D08177B5280B20000000000000000000000045DA6C2", "duplication": 3, "time_delay": 20}], ADVA_PAYLOAD: "3B613D0817FB1E1690FC02000049ADD722F535679C37983927655C974A4980B080045DA6C2", "payload":"90FC02000049ADD722F535679C37983927655C974A4980B080045DA6C2" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B5280B20000000000000000000000045DA6C2", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "045DA6C2"},
-                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, "expected_mqtt": [{"timestamp": 17305216968476073494, "payload": "90FC0200004C8AD49C6D96923BFB70DF06554F5E8F438F1DF57E063773", "duplication": 3, "time_delay": 20}, {"timestamp": 4278768225950047766, "payload": "C6FC0000EB3B613D08177BB4085900000000000000000000007E063773", "duplication": 3, "time_delay": 20}], ADVA_PAYLOAD: "3B613D0817FB1E1690FC0200004C8AD49C6D96923BFB70DF06554F5E8F438F1DF57E063773", "payload":"90FC0200004C8AD49C6D96923BFB70DF06554F5E8F438F1DF57E063773" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177BB4085900000000000000000000007E063773", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "7E063773"},
-                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, "expected_mqtt": [{"timestamp": 17305216968476073494, "payload": "90FC02000064A5B54285BB6BCDB457ABBED8EE26B4EB43B27A8C26781C", "duplication": 3, "time_delay": 20}, {"timestamp": 4278768225950047766, "payload": "C6FC0000EB3B613D08177B27363800000000000000000000008C26781C", "duplication": 3, "time_delay": 20}], ADVA_PAYLOAD: "3B613D0817FB1E1690FC02000064A5B54285BB6BCDB457ABBED8EE26B4EB43B27A8C26781C", "payload":"90FC02000064A5B54285BB6BCDB457ABBED8EE26B4EB43B27A8C26781C" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B27363800000000000000000000008C26781C", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "8C26781C"},
+                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "3B613D0817FB101690FCA1016417913C42FD38AF3F23AC0201060303E1FF060000FA0EAB04", "payload":"90FCA1016417913C42FD38AF3F23AC0201060303E1FF060000FA0EAB04" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B00003600AC233FAF38FD16E1FF05FA0EAB04", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "FA0EAB04"},
+                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "3B613D0817FB101690FCA10164157D358A0E39AF3F23AC0201060303E1FF0600007EE3A33F", "payload":"90FCA10164157D358A0E39AF3F23AC0201060303E1FF0600007EE3A33F" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B00004300AC233FAF390E16E1FF057EE3A33F", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "7EE3A33F"},
+                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "3B613D0817FB111690FCA1085CCA5BF13F23AC4D425330310201060303E1FF0500E16ED8EA", "payload":"90FCA1085CCA5BF13F23AC4D425330310201060303E1FF0500E16ED8EA" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B00004700AC233FF15BCA16E1FF05E16ED8EA", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "E16ED8EA"},
+                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "3B613D0817FB101690FCA10164157D358A0E39AF3F23AC0201060303E1FF06000003E3A33F", "payload":"90FCA10164157D358A0E39AF3F23AC0201060303E1FF06000003E3A33F" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B00073E00AC233FAF390E16E1FF0503E3A33F", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "03E3A33F"},
+                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "3B613D0817FB111690FCA10858CA5BF13F23AC4D425330310201060303E1FF0500996ED8EE", "payload":"90FCA10858CA5BF13F23AC4D425330310201060303E1FF0500996ED8EE" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B00043F00AC233FF15BCA16E1FF05996ED8EE", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "996ED8EE"},
+                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "3B613D0817FB0E1690FCA10864FD38AF3F23AC53310201060303E1FF0800000000157A359C", "payload":"90FCA10864FD38AF3F23AC53310201060303E1FF0800000000157A359C" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B000E3600AC233FAF38FD16E1FF05157A359C", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "157A359C"},
+                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "3B613D0817FB1E1690FC0200002CC60917A02CB02367771BE9EA20F9666ED8A06F6612745B", "payload":"90FC0200002CC60917A02CB02367771BE9EA20F9666ED8A06F6612745B" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177BF1EBC500000000000000000000006612745B", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "6612745B"},
+                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "3B613D0817FB1E1690FC02000007EFE229109B044DB995A506179C99094720AE8BF9F78C1A", "payload":"90FC02000007EFE229109B044DB995A506179C99094720AE8BF9F78C1A" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B6CEC9A0000000000000000000000F9F78C1A", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "F9F78C1A"},
+                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "3B613D0817FB1E1690FC0200002CA1E008E364D0DCF65631718BCD659DE3323A69A674F7B9", "payload":"90FC0200002CA1E008E364D0DCF65631718BCD659DE3323A69A674F7B9" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B1051900000000000000000000000A674F7B9", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "A674F7B9"},
+                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "3B613D0817FB1E1690FC02000049ADD722F535679C37983927655C974A4980B080045DA6C2", "payload":"90FC02000049ADD722F535679C37983927655C974A4980B080045DA6C2" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B5280B20000000000000000000000045DA6C2", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "045DA6C2"},
+                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "3B613D0817FB1E1690FC0200004C8AD49C6D96923BFB70DF06554F5E8F438F1DF57E063773", "payload":"90FC0200004C8AD49C6D96923BFB70DF06554F5E8F438F1DF57E063773" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177BB4085900000000000000000000007E063773", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "7E063773"},
+                {"test": "sensor", "duplication": "5", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "3B613D0817FB1E1690FC02000064A5B54285BB6BCDB457ABBED8EE26B4EB43B27A8C26781C", "payload":"90FC02000064A5B54285BB6BCDB457ABBED8EE26B4EB43B27A8C26781C" ,"si": "3B613D0817FB1E16C6FC0000EB3B613D08177B27363800000000000000000000008C26781C", "bridge_id": "3B613D08177B", "adva": "3B613D0817FB", "pkt_id": "8C26781C"},
             ]
         
             hardcoded_df = pd.DataFrame(hardcoded_data)
@@ -131,8 +125,31 @@ class GeneratedPacketTable:
         def _mgmt_data(df):
             hardcoded_data = [
                 # First pkt is HB, second is CFG_INFO of MODULE_IF
-                {"test": "mgmt", "duplication": "10", "time_delay": "20", "bridge_idx": 2, "expected_mqtt": [{"timestamp": 17305216968476073494, "payload": "C6FC0000EE020AD2A365FEC65912095E9101FF1104EB0958D400110100", "duplication": 10, "time_delay": 20}], ADVA_PAYLOAD: "A365FEC659D21E16C6FC0000EE020AD2A365FEC65912095E9101FF1104EB0958D400110100", "payload": "C6FC0000EE020AD2A365FEC65912095E9101FF1104EB0958D400110100", "si": "", "bridge_id": "A365FEC65912", "adva": "A365FEC659D2", "pkt_id": "00110100"},
-                {"test": "mgmt", "duplication": "10", "time_delay": "20", "bridge_idx": 2, "expected_mqtt": [{"timestamp": 17305216968476073494, "payload": "C6FC0000EE110BD3A365FEC6591203040121E8F2FDB000000000000000", "duplication": 10, "time_delay": 20}], ADVA_PAYLOAD: "A365FEC659D21E16C6FC0000EE110BD3A365FEC6591203040121E8F2FDB000000000000000", "payload": "C6FC0000EE110BD3A365FEC6591203040121E8F2FDB000000000000000", "si": "", "bridge_id": "A365FEC65912", "adva": "A365FEC659D2", "pkt_id": "00000000"},
+                {"test": "mgmt", "duplication": "10", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "A365FEC659D21E16C6FC0000EE020AD2A365FEC65912095E9101FF1104EB0958D400110100", "payload": "C6FC0000EE020AD2A365FEC65912095E9101FF1104EB0958D400110100", "si": "", "bridge_id": "A365FEC65912", "adva": "A365FEC659D2", "pkt_id": "00110100"},
+                {"test": "mgmt", "duplication": "10", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "A365FEC659D21E16C6FC0000EE110BD3A365FEC6591203040121E8F2FDB000000000000000", "payload": "C6FC0000EE110BD3A365FEC6591203040121E8F2FDB000000000000000", "si": "", "bridge_id": "A365FEC65912", "adva": "A365FEC659D2", "pkt_id": "00000000"},
+            ]
+        
+            hardcoded_df = pd.DataFrame(hardcoded_data)
+            return pd.concat([df, hardcoded_df], ignore_index=True)
+
+        def _acl_data(df):
+            hardcoded_data = [
+                {"test": "acl", "duplication": "10", "time_delay": "20", "bridge_idx": 1, ADVA_PAYLOAD: "1659CAFE65E31E16C6FC00003F020AD2A365FECA5916095E9101FF1104EB0958D400110100", "payload": "C6FC00003F020AD2A365FECA5916095E9101FF1104EB0958D400110100", "si": "", "bridge_id": "A365FECA5916", "adva": "1659CAFE65E3", "pkt_id": "00110100"},
+                {"test": "acl", "duplication": "10", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "1A59C6FE65E31E16C6FC00003F020AD2A365FEC6591A095E9101FF1104EB0958D400110100", "payload": "C6FC00003F020AD2A365FEC6591A095E9101FF1104EB0958D400110100", "si": "", "bridge_id": "A365FEC6591A", "adva": "1A59C6FE65E3", "pkt_id": "00110100"},
+                {"test": "acl", "duplication": "10", "time_delay": "20", "bridge_idx": 1, ADVA_PAYLOAD: "1659CAFE65E31E16C6FC00003F020AD3A365FECA5916095E9101FF1104EB0958D400110101", "payload": "C6FC00003F020AD3A365FECA5916095E9101FF1104EB0958D400110101", "si": "", "bridge_id": "A365FECA5916", "adva": "1659CAFE65E3", "pkt_id": "00110101"},
+                {"test": "acl", "duplication": "10", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "1A59C6FE65E31E16C6FC00003F020AD3A365FEC6591A095E9101FF1104EB0958D400110101", "payload": "C6FC00003F020AD3A365FEC6591A095E9101FF1104EB0958D400110101", "si": "", "bridge_id": "A365FEC6591A", "adva": "1A59C6FE65E3", "pkt_id": "00110101"},
+                {"test": "acl", "duplication": "10", "time_delay": "20", "bridge_idx": 1, ADVA_PAYLOAD: "1659CAFE65E31E16C6FC00003F020AD4A365FECA5916095E9101FF1104EB0958D400110102", "payload": "C6FC00003F020AD4A365FECA5916095E9101FF1104EB0958D400110102", "si": "", "bridge_id": "A365FECA5916", "adva": "1659CAFE65E3", "pkt_id": "00110102"},
+                {"test": "acl", "duplication": "10", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "1A59C6FE65E31E16C6FC00003F020AD4A365FEC6591A095E9101FF1104EB0958D400110102", "payload": "C6FC00003F020AD4A365FEC6591A095E9101FF1104EB0958D400110102", "si": "", "bridge_id": "A365FEC6591A", "adva": "1A59C6FE65E3", "pkt_id": "00110102"},
+                {"test": "acl", "duplication": "10", "time_delay": "20", "bridge_idx": 1, ADVA_PAYLOAD: "1659CAFE65E31E16C6FC00003F020AD5A365FECA5916095E9101FF1104EB0958D400110103", "payload": "C6FC00003F020AD5A365FECA5916095E9101FF1104EB0958D400110103", "si": "", "bridge_id": "A365FECA5916", "adva": "1659CAFE65E3", "pkt_id": "00110103"},
+                {"test": "acl", "duplication": "10", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "1A59C6FE65E31E16C6FC00003F020AD5A365FEC6591A095E9101FF1104EB0958D400110103", "payload": "C6FC00003F020AD5A365FEC6591A095E9101FF1104EB0958D400110103", "si": "", "bridge_id": "A365FEC6591A", "adva": "1A59C6FE65E3", "pkt_id": "00110103"},
+                {"test": "acl", "duplication": "10", "time_delay": "20", "bridge_idx": 1, ADVA_PAYLOAD: "1659CAFE65E31E16C6FC00003F020AD6A365FECA5916095E9101FF1104EB0958D400110104", "payload": "C6FC00003F020AD6A365FECA5916095E9101FF1104EB0958D400110104", "si": "", "bridge_id": "A365FECA5916", "adva": "1659CAFE65E3", "pkt_id": "00110104"},
+                {"test": "acl", "duplication": "10", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "1A59C6FE65E31E16C6FC00003F020AD6A365FEC6591A095E9101FF1104EB0958D400110104", "payload": "C6FC00003F020AD6A365FEC6591A095E9101FF1104EB0958D400110104", "si": "", "bridge_id": "A365FEC6591A", "adva": "1A59C6FE65E3", "pkt_id": "00110104"},
+                {"test": "acl", "duplication": "10", "time_delay": "20", "bridge_idx": 1, ADVA_PAYLOAD: "1659CAFE65E31E16C6FC00003F020AD7A365FECA5916095E9101FF1104EB0958D400110105", "payload": "C6FC00003F020AD7A365FECA5916095E9101FF1104EB0958D400110105", "si": "", "bridge_id": "A365FECA5916", "adva": "1659CAFE65E3", "pkt_id": "00110105"},
+                {"test": "acl", "duplication": "10", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "1A59C6FE65E31E16C6FC00003F020AD7A365FEC6591A095E9101FF1104EB0958D400110105", "payload": "C6FC00003F020AD7A365FEC6591A095E9101FF1104EB0958D400110105", "si": "", "bridge_id": "A365FEC6591A", "adva": "1A59C6FE65E3", "pkt_id": "00110105"},
+                {"test": "acl", "duplication": "10", "time_delay": "20", "bridge_idx": 1, ADVA_PAYLOAD: "1659CAFE65E31E16C6FC00003F020AD8A365FECA5916095E9101FF1104EB0958D400110106", "payload": "C6FC00003F020AD8A365FECA5916095E9101FF1104EB0958D400110106", "si": "", "bridge_id": "A365FECA5916", "adva": "1659CAFE65E3", "pkt_id": "00110106"},
+                {"test": "acl", "duplication": "10", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "1A59C6FE65E31E16C6FC00003F020AD8A365FEC6591A095E9101FF1104EB0958D400110106", "payload": "C6FC00003F020AD8A365FEC6591A095E9101FF1104EB0958D400110106", "si": "", "bridge_id": "A365FEC6591A", "adva": "1A59C6FE65E3", "pkt_id": "00110106"},
+                {"test": "acl", "duplication": "10", "time_delay": "20", "bridge_idx": 1, ADVA_PAYLOAD: "1659CAFE65E31E16C6FC00003F020AD9A365FECA5916095E9101FF1104EB0958D400110107", "payload": "C6FC00003F020AD9A365FECA5916095E9101FF1104EB0958D400110107", "si": "", "bridge_id": "A365FECA5916", "adva": "1659CAFE65E3", "pkt_id": "00110107"},
+                {"test": "acl", "duplication": "10", "time_delay": "20", "bridge_idx": 2, ADVA_PAYLOAD: "1A59C6FE65E31E16C6FC00003F020AD9A365FEC6591A095E9101FF1104EB0958D400110107", "payload": "C6FC00003F020AD9A365FEC6591A095E9101FF1104EB0958D400110107", "si": "", "bridge_id": "A365FEC6591A", "adva": "1A59C6FE65E3", "pkt_id": "00110107"},
             ]
         
             hardcoded_df = pd.DataFrame(hardcoded_data)
@@ -141,6 +158,7 @@ class GeneratedPacketTable:
         df = pd.DataFrame(packet_list)
         df = _sensor_data(df)
         df = _mgmt_data(df)
+        df = _acl_data(df)
         df.to_csv(PACKET_TABLE_CSV_PATH)
     
 class UnifiedRunData:
@@ -159,6 +177,10 @@ class MgmtRunData:
     def __init__(self) -> None:
         self.data = GeneratedPacketTable().get_mgmt_data()
 
+class ACLRunData:
+    def __init__(self) -> None:
+        self.data = GeneratedPacketTable().get_acl_data()
+
 class PacketTableHelper():
     def __init__(self):
         self.table = GeneratedPacketTable().get_df()